[movitz-cvs] CVS update: movitz/losp/muerte/io-port.lisp

[Frode Vatvedt Fjeld]

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

Modified Files:
	io-port.lisp 
Log Message:
Pass the &environment on to constantp and eval in the (setf io-port) compiler-macro.

Date: Wed Apr 14 12:45:52 2004
Author: ffjeld

Index: movitz/losp/muerte/io-port.lisp
diff -u movitz/losp/muerte/io-port.lisp:1.10 movitz/losp/muerte/io-port.lisp:1.11
--- movitz/losp/muerte/io-port.lisp:1.10	Wed Apr 14 12:38:47 2004
+++ movitz/losp/muerte/io-port.lisp	Wed Apr 14 12:45:52 2004
@@ -10,7 +10,7 @@
 ;;;; Author:        Frode Vatvedt Fjeld <frodef at acm.org>
 ;;;; Created at:    Wed Mar 21 22:14:08 2001
 ;;;;                
-;;;; $Id: io-port.lisp,v 1.10 2004/04/14 16:38:47 ffjeld Exp $
+;;;; $Id: io-port.lisp,v 1.11 2004/04/14 16:45:52 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -66,14 +66,14 @@
     (:character
      (io-port port :character))))
 
-(define-compiler-macro (setf io-port) (&whole form value port type)
+(define-compiler-macro (setf io-port) (&whole form value port type &environment env)
   (let ((value-var (gensym "(setf io-port)-value-"))
 	(port-var (gensym "(setf io-port)-port-")))
     (cond
-     ((and (movitz:movitz-constantp type)
-	   (movitz:movitz-constantp port))
-      (let ((the-port (movitz:movitz-eval port))
-	    (the-type (movitz:movitz-eval type)))
+     ((and (movitz:movitz-constantp type env)
+	   (movitz:movitz-constantp port env))
+      (let ((the-port (movitz:movitz-eval port env))
+	    (the-type (movitz:movitz-eval type env)))
 	(etypecase the-port
 	  ((unsigned-byte 8)		; short form of outb can be used
 	   (ecase the-type
@@ -151,8 +151,8 @@
 			 `((:movl :edi :edx)))
 		     (:compile-form (:result-mode :eax) ,value-var)
 		     (:cld))))))))))
-     ((movitz:movitz-constantp type)
-      (ecase (movitz:movitz-eval type)
+     ((movitz:movitz-constantp type env)
+      (ecase (movitz:movitz-eval type env)
 	(:unsigned-byte8
 	 `(let ((,value-var ,value)
 		(,port-var ,port))