CMUCL problems with yesterdays sources
- Subject: CMUCL problems with yesterdays sources
- From: Raymond Toy
- Date: 20 Apr 2001 17:42:56 -0400
>>>>> "Raymond" == Raymond Toy <toy@rtp.ericsson.se> writes:
>>>>> "Bill" == Bill Schelter <wfs@mail.ma.utexas.edu> writes:
Bill> The changes are in the cvs and also the daily snapshot has been
Bill> updated.
Raymond> I'll check these out soon.
Ok. Couple of problems.
o Need to comment out the default errset:
--- maxima-clean/maxima-5.5/src/generr.lisp Fri Apr 20 13:59:22 2001
+++ maxima-devel/maxima-5.5/src/generr.lisp Fri Apr 20 17:31:38 2001
@@ -38,7 +38,7 @@
`(handler-case (list ,(car l))
(error (e) (when errset (error e)))))
-#-(or excl clisp lucid)
+#-(or excl clisp lucid cmu)
(defmacro errset (&rest l) `(list ,(car l)))
o The restart loop for cmu isn't quite right. I think this works
better.
--- maxima-clean/maxima-5.5/src/init_max1.lisp Wed Apr 18 13:12:31 2001
+++ maxima-devel/maxima-5.5/src/init_max1.lisp Fri Apr 20 15:53:53 2001
@@ -100,9 +100,11 @@
(catch 'to-lisp
(set-pathnames)
#+cmu
- (with-simple-restart (macsyma-quit "Macsyma top-level")
- (init-maxima)
- (macsyma-top-level))
+ (init-maxima)
+ #+cmu
+ (loop
+ (with-simple-restart (macsyma-quit "Macsyma top-level")
+ (macsyma-top-level)))
#-cmu
(catch 'macsyma-quit
(macsyma-top-level))))
o The MFUNCTION1 change doesn't work. This does. I have no idea why.
--- maxima-clean/maxima-5.5/src/mstuff.lisp Fri Apr 20 15:02:50 2001
+++ maxima-devel/maxima-5.5/src/mstuff.lisp Fri Apr 20 17:29:40 2001
@@ -34,7 +34,7 @@
;; leave a conditional here.
(DEFUN MFUNCTION1 (FUN)
#+cmu
- `(LAMBDA (X Y) (MEVALP `((,',FUN) ((MQUOTE) ,X) ((MQUOTE) ,Y))))
+ (LAMBDA (X Y) (MEVALP `((,FUN) ((MQUOTE) ,X) ((MQUOTE) ,Y))))
#-cmu
(function (LAMBDA (X Y) (MEVALP `((,FUN) ((MQUOTE) ,X) ((MQUOTE) ,Y)))))
)
o Need this patch so that FALSE is returned instead of 0.
--- maxima-clean/maxima-5.5/src/ar.lisp Mon May 8 02:09:41 2000
+++ maxima-devel/maxima-5.5/src/ar.lisp Fri Apr 20 17:40:22 2001
@@ -60,7 +60,7 @@
($FIXNUM . FIXNUM)))))
(COND ((NOT LTYPE)
(COND ((EQ TYPE '$ANY)
- #+cl (make-array diml)
+ #+cl (make-array diml :initial-element nil)
#-cl
(MAKE-MGENARRAY #+cl :type #-cl type '$ANY
#+cl :CONTENT #-cl CONTENT (APPLY '*ARRAY NIL T DIML)))
o Need this so that CMUCL can continue after a break.
--- maxima-clean/maxima-5.5/src/macsys.lisp Tue Apr 17 23:16:09 2001
+++ maxima-devel/maxima-5.5/src/macsys.lisp Fri Apr 20 17:41:22 2001
@@ -292,7 +292,7 @@
(in-package "MAXIMA")
(sloop
do
- (catch #+kcl si::*quit-tag* #-kcl nil
+ (catch #+kcl si::*quit-tag* #+cmu 'continue #-(or kcl cmu) nil
(catch 'macsyma-quit
(continue)(bye)))))))
With these changes, maxima runs the tests correctly again, and
restarts work.
Ray