|
From: Vadim V. Z. <vv...@us...> - 2001-11-19 04:45:55
|
Update of /cvsroot/maxima/maxima-pre59/src
In directory usw-pr-cvs1:/tmp/cvs-serv13057
Modified Files:
ChangeLog acall.lisp compile-clisp.lisp maxima-package.lisp
plot.lisp
Log Message:
dfstruct polygon moved out of eval-when for clisp
Index: ChangeLog
===================================================================
RCS file: /cvsroot/maxima/maxima-pre59/src/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ChangeLog 2001/04/20 22:39:48 1.8
--- ChangeLog 2001/11/19 04:45:52 1.9
***************
*** 1,2 ****
--- 1,6 ----
+ 2001-11-19 Vadim V. Zhytnikov <vv...@ma...>
+
+ * patches to fix problems with new clisp releases.
+
2001-04-20 Bill Schelter <wf...@so...>
Index: acall.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima-pre59/src/acall.lisp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** acall.lisp 2000/05/08 06:09:42 1.1.1.1
--- acall.lisp 2001/11/19 04:45:52 1.2
***************
*** 44,48 ****
#+cl
((and (symbolp f)(or (macro-function f)
! (special-form-p f)))
(eval (cons f (copy-rest-arg l))))
(T
--- 44,48 ----
#+cl
((and (symbolp f)(or (macro-function f)
! (special-operator-p f)))
(eval (cons f (copy-rest-arg l))))
(T
Index: compile-clisp.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima-pre59/src/compile-clisp.lisp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** compile-clisp.lisp 2001/04/27 17:05:59 1.8
--- compile-clisp.lisp 2001/11/19 04:45:52 1.9
***************
*** 1,2 ****
--- 1,6 ----
+
+ (if (find-package "EXT")
+ (use-package "EXT"))
+
(push :main-files-loaded *features*)
(load "sysdef.lisp")
***************
*** 5,15 ****
(defun compile-maxima ()
! (make::make :maxima :compile t))
(defun save-maxima ()
(make::make :maxima )
! (lisp:gc)
! (lisp:saveinitmem "maxima-clisp.mem"
! :init-function #'user::run)
)
--- 9,20 ----
(defun compile-maxima ()
! (make::make :maxima :compile t)
! )
(defun save-maxima ()
(make::make :maxima )
! (gc)
! (saveinitmem "maxima-clisp.mem"
! :init-function #'user::run)
)
Index: maxima-package.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima-pre59/src/maxima-package.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** maxima-package.lisp 2001/04/27 13:36:48 1.6
--- maxima-package.lisp 2001/11/19 04:45:52 1.7
***************
*** 9,14 ****
(or (find-package "MAXIMA")
(make-package "MAXIMA"
! :nicknames '("CL-MACSYMA" "CL-MAXIMA" "MACSYMA" )
! :use '( "LISP" )))
(shadowing-import '(sloop::loop-return sloop::local-finish sloop::loop-finish sloop::sloop) "MAXIMA")
--- 9,14 ----
(or (find-package "MAXIMA")
(make-package "MAXIMA"
! :nicknames '("CL-MACSYMA" "CL-MAXIMA" "MACSYMA")
! :use `("LISP" #+clisp ,@(if (find-package "EXT") '("EXT"))) ))
(shadowing-import '(sloop::loop-return sloop::local-finish sloop::loop-finish sloop::sloop) "MAXIMA")
Index: plot.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima-pre59/src/plot.lisp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** plot.lisp 2001/06/06 09:13:09 1.12
--- plot.lisp 2001/11/19 04:45:52 1.13
***************
*** 100,103 ****
--- 100,112 ----
(defbinop $/ / long-float)
+
+ #+clisp
+ (defstruct (polygon (:type list)
+ (:constructor make-polygon (pts edges))
+ )
+ (dummy '($polygon simp))
+ pts edges)
+
+
(eval-when (compile eval)
***************
*** 121,124 ****
--- 130,134 ----
`(print-pt1 ,f $pstream ))
+ #-clisp
(defstruct (polygon (:type list)
(:constructor make-polygon (pts edges))
|