[Maxima-commits] CVS: maxima/src cl-info.lisp,1.10,1.11 init-cl.lisp,1.18,1.19 macdes.lisp,1.10,1.11 maxima-package.lisp,1.9,1.10

[Raymond T. <rt...@us...>]

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31246/src

Modified Files:
	cl-info.lisp init-cl.lisp macdes.lisp maxima-package.lisp 
Log Message:
Rename the package "SI" to "CL-INFO" to prevent collisions with
Allegro's "SI" package.  


Index: cl-info.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/cl-info.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cl-info.lisp	17 Oct 2002 21:32:43 -0000	1.10
+++ cl-info.lisp	20 Feb 2003 00:48:55 -0000	1.11
@@ -18,7 +18,7 @@
 ;;
 
 
-(in-package "SI")
+(in-package "CL-INFO")
 
 (defvar *match-data*)
 (defvar *case-fold-search* nil)

Index: init-cl.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/init-cl.lisp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- init-cl.lisp	28 Oct 2002 02:50:41 -0000	1.18
+++ init-cl.lisp	20 Feb 2003 00:48:55 -0000	1.19
@@ -142,9 +142,8 @@
 	      (maxima-data-path "doc" "###.{mac}")))
   (setq $chemin
 	(maxima-data-path "sym" ""))
-  (setq si::*info-paths* (list (concatenate 'string
-					    *maxima-infodir* "/"))))
-  )
+  (setq cl-info::*info-paths* (list (concatenate 'string
+					    *maxima-infodir* "/")))))
 
 ;#+gcl (setq si::*top-level-hook* 'user::run)
 (defun user::run ()
@@ -162,12 +161,12 @@
       
     (catch 'to-lisp
       (set-pathnames)
-      #+(or cmu clisp)
+      #+(or cmu clisp allegro)
       (progn
 	(loop 
 	  (with-simple-restart (macsyma-quit "Macsyma top-level")
 			       (macsyma-top-level input-string batch-flag))))
-      #-(or cmu clisp)
+      #-(or cmu clisp allegro)
       (catch 'macsyma-quit
 	(macsyma-top-level input-string batch-flag)))))
 
@@ -190,6 +189,10 @@
 #+cmu
 (defun bye ()
   (ext:quit))
+
+#+allegro
+(defun bye ()
+  (excl:exit))
 
 (defun $maxima_server (port)
   (load "/home/amundson/devel/maxima/archive/src/server.lisp")

Index: macdes.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/macdes.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- macdes.lisp	3 Jul 2002 02:01:19 -0000	1.10
+++ macdes.lisp	20 Feb 2003 00:48:55 -0000	1.11
@@ -111,22 +111,20 @@
 				     form l)
 			      ))
 		      (T (merror "BAD ARG")))))))
-(defvar *info-paths* nil)
-
-
 
-(defun $describe(x &aux (*info-paths* *info-paths*) have)
+(defun $describe (x)
   (setq x ($sconcat x))
-  (if (and (find-package "SI")
-           (fboundp (intern "INFO" "SI")))
-      (return-from $describe (funcall (intern "INFO" "SI") x
-         '("maxima.info") #-gcl *info-paths*)))
+  (if (and (find-package "CL-INFO")
+           (fboundp (intern "INFO" "CL-INFO")))
+      (return-from $describe (funcall (intern "INFO" "CL-INFO") x
+				      '("maxima.info") #-gcl *info-paths*)))
+  
 
-  "The documentation is now in INFO format and can be printed using
+      "The documentation is now in INFO format and can be printed using
 tex, or viewed using info or gnu emacs or using a web browser:
 http://www.ma.utexas.edu/maxima/
    Some versions of maxima built have a builtin info retrieval mechanism."
-  )
+      )
 
 (defun $apropos ( s ) 
   (cons '(mlist) (apropos-list s "MAXIMA"))) 

Index: maxima-package.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/maxima-package.lisp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- maxima-package.lisp	12 Dec 2001 14:41:41 -0000	1.9
+++ maxima-package.lisp	20 Feb 2003 00:48:55 -0000	1.10
@@ -1,7 +1,23 @@
 ;; SI is used for the regex info implementation. This line should be removed
 ;; when the info regex implementation no longer requires SI in all lisps.
 ;; jfa 12/12/2001
-(or (find-package "SI") (make-package "SI" :use '(COMMON-LISP)))
+;;(or (find-package "SI") (make-package "SI" :use '(COMMON-LISP)))
+
+
+;; Create the package CL-INFO that holds the info regex routines. For
+;; GCL, we import the necessary symbols we need from SYSTEM, since GCL
+;; comes with an info reader.
+#-gcl
+(defpackage "CL-INFO"
+  (:use :common-lisp)
+  (:export "INFO" "*INFO-PATHS*"))
+
+#+gcl
+(defpackage "CL-INFO"
+  (:use "LISP" "SYSTEM")
+  (:import-from "SYSTEM" "INFO" "*INFO-PATHS*")
+  (:export "INFO" "*INFO-PATHS"))
+
 (or (find-package "SLOOP") (make-package "SLOOP" :use '(LISP)))
 
 
@@ -109,8 +125,8 @@
 (setf (symbol-function 'maxima::newline) (symbol-function 'si::newline))
 
 ;; *info-paths* from cl-info.lisp
-#+(or clisp cmu)
-(import '( si::*info-paths* ) "MAXIMA" )
+#-gcl
+(import '( cl-info::*info-paths* ) "MAXIMA" )
 
 ;; detect which version of clisp REGEXP we have
 #+clisp
@@ -149,5 +165,8 @@
 (shadow 'lisp::float 'maxima)
 #+lispm
 (shadow 'lisp::loop 'maxima)
+
+#+allegro
+(shadow '// 'maxima)
 (provide "MAXIMA")