[Maxima-commits] CVS: maxima/src init-cl.lisp,1.157,1.158

[Andreas E. <ar...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24837

Modified Files:
	init-cl.lisp 
Log Message:
changed deprecated eval-when situations to standard ones


Index: init-cl.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/init-cl.lisp,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- init-cl.lisp	14 Feb 2010 21:06:41 -0000	1.157
+++ init-cl.lisp	6 Mar 2010 17:06:00 -0000	1.158
@@ -34,17 +34,17 @@
 (defvar *maxima-demodir*)
 (defvar *maxima-objdir*)		;; Where to store object (fasl) files.
 
-(eval-when (load compile eval)
-(defmacro def-lisp-shadow (root-name)
-  "Create a maxima variable $root_name that is an alias for the lisp name *root-name*.
+(eval-when (:load-toplevel :compile-toplevel :execute)
+  (defmacro def-lisp-shadow (root-name)
+    "Create a maxima variable $root_name that is an alias for the lisp name *root-name*.
 When one changes, the other does too."
-  (let ((maxima-name (intern (concatenate 'string "$"
-					  (substitute #\_ #\- (string root-name)))))
-	(lisp-name (intern (concatenate 'string "*" (string root-name) "*"))))
-  `(progn
-    (defmvar ,maxima-name)
-    (putprop ',maxima-name 'shadow-string-assignment 'assign)
-    (putprop ',maxima-name ',lisp-name 'lisp-shadow)))))
+    (let ((maxima-name (intern (concatenate 'string "$"
+					    (substitute #\_ #\- (string root-name)))))
+	  (lisp-name (intern (concatenate 'string "*" (string root-name) "*"))))
+      `(progn
+	 (defmvar ,maxima-name)
+	 (putprop ',maxima-name 'shadow-string-assignment 'assign)
+	 (putprop ',maxima-name ',lisp-name 'lisp-shadow)))))
 
 (def-lisp-shadow maxima-tempdir)
 (def-lisp-shadow maxima-userdir)
@@ -781,15 +781,14 @@
   (declare (ignore dummy))
   $help)
 
-(eval-when
-	#+gcl (load eval)
-	#-gcl (:load-toplevel :execute)
+(eval-when (:load-toplevel :execute)
     (let ((context '$global))
       (declare (special context))
-      (mapc #'(lambda (x) (kind x '$constant) (setf (get x 'sysconst) t))
-            '($%pi $%i $%e $%phi %i $%gamma ;numeric constants
+      (dolist (x '($%pi $%i $%e $%phi %i $%gamma  ;numeric constants
                    $inf $minf $und $ind $infinity ;pseudo-constants
-                   t nil)))) ;logical constants (Maxima names: true, false)
+                   t nil))                        ;logical constants (Maxima names: true, false)
+	(kind x '$constant)
+	(setf (get x 'sysconst) t))))
 
 ;;; Now that all of maxima has been loaded, define the various lists
 ;;; and hashtables of builtin symbols and values.