[movitz-cvs] CVS update: movitz/compiler.lisp

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz
In directory common-lisp.net:/tmp/cvs-serv15459

Modified Files:
	compiler.lisp 
Log Message:
Made a slight mistake in the new thunking stuff. This all needs to be
cleaned up.

Date: Fri Jul 23 09:42:39 2004
Author: ffjeld

Index: movitz/compiler.lisp
diff -u movitz/compiler.lisp:1.83 movitz/compiler.lisp:1.84
--- movitz/compiler.lisp:1.83	Fri Jul 23 08:31:19 2004
+++ movitz/compiler.lisp	Fri Jul 23 09:42:38 2004
@@ -8,7 +8,7 @@
 ;;;; Created at:    Wed Oct 25 12:30:49 2000
 ;;;; Distribution:  See the accompanying file COPYING.
 ;;;;                
-;;;; $Id: compiler.lisp,v 1.83 2004/07/23 15:31:19 ffjeld Exp $
+;;;; $Id: compiler.lisp,v 1.84 2004/07/23 16:42:38 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -388,7 +388,6 @@
 		   (cond
 		    (thunk
 		     (assert (some #'bindingp thunk-args))
-		     ;; (warn "got a thunk for ~S" thunk-args)
 		     (push (cons thunk thunk-args) (type-analysis-thunks analysis)))
 		    ((typep binding 'function-argument)
 		     (setf (type-analysis-encoded-type analysis)
@@ -498,7 +497,10 @@
 		     (apply #'encoded-type-decode (type-analysis-encoded-type analysis))
 		     (type-analysis-binding-types analysis))
 		   (setf (binding-store-type binding)
-		     (type-analysis-encoded-type analysis))
+		     (cond
+		      ((not (null (type-analysis-thunks analysis)))
+		       (multiple-value-list (type-specifier-encode t)))
+		      (t (type-analysis-encoded-type analysis))))
 		   #+ignore
 		   (when (apply #'encoded-type-singleton (type-analysis-encoded-type analysis))
 		     (warn "Singleton: ~A" binding))