[Maxima-commits] CVS: maxima/src cl-info.lisp,1.21,1.22 maxima-package.lisp,1.25,1.26 nregex.lisp,1.6,1.7

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

Update of /cvsroot/maxima/maxima/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1353/src

Modified Files:
	cl-info.lisp maxima-package.lisp nregex.lisp 
Log Message:
Rename the NREGEX package to MAXIMA-NREGEX to prevent collisions with
the incompatible version of NREGEX in slime.

nregex.lisp:
o Rename NREGEX package to MAXIMA-NREGEX.  (Could we get rid of this
  package declaration?)

maxima-package.lisp:
o Add a defpackage for MAXIMA-NREGEX, copied from nregex.lisp.
o Adjust the CL-INFO package to :use MAXIMA-NREGEX.

cl-info.lisp:
o Remove NREGEX package qualifiers from this file, because CL-INFO now
  :use's MAXIMA-NREGEX.


Index: cl-info.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/cl-info.lisp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cl-info.lisp	31 Mar 2005 23:06:31 -0000	1.21
+++ cl-info.lisp	10 Jun 2005 12:04:25 -0000	1.22
@@ -48,17 +48,17 @@
 			(code-char 10)))
        (precomp-nil-string1
 	(compile nil
-		 (nregex:regex-compile 
+		 (regex-compile 
 		  string1
 		  :case-sensitive nil)))
        (precomp-t-string2
 	(compile nil
-		 (nregex:regex-compile 
+		 (regex-compile 
 		  string2
 		  :case-sensitive t)))
        (precomp-t-string3
 	(compile nil
-		 (nregex:regex-compile 
+		 (regex-compile 
 		  string3
 		  :case-sensitive t))))
   (defun compile-regex (pat &key (case-sensitive t))
@@ -83,7 +83,7 @@
 	     (compiler:*compile-verbose* nil)
 	     )
 	 (compile nil
-		  (nregex:regex-compile 
+		  (regex-compile 
 		   pat 
 		   :case-sensitive case-sensitive))))))
   )
@@ -99,9 +99,9 @@
     (setf pat (compile-regex pat :case-sensitive (not *case-fold-search*))))
   (if (funcall pat string :start start :end end)
       (progn
-	(setf *match-data* (make-array nregex:*regex-groupings*))
-	(dotimes (k nregex:*regex-groupings*)
-	  (setf (aref *match-data* k) (aref nregex:*regex-groups* k)))
+	(setf *match-data* (make-array *regex-groupings*))
+	(dotimes (k *regex-groupings*)
+	  (setf (aref *match-data* k) (aref *regex-groups* k)))
 	(match-start 0))
       -1))
 

Index: maxima-package.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/maxima-package.lisp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- maxima-package.lisp	18 Nov 2004 15:20:30 -0000	1.25
+++ maxima-package.lisp	10 Jun 2005 12:04:25 -0000	1.26
@@ -1,7 +1,16 @@
 (in-package "COMMON-LISP-USER")
 
-(defpackage "CL-INFO"
+(defpackage "MAXIMA-NREGEX"
   (:use "COMMON-LISP")
+  (:export
+   ;; Vars
+   "*REGEX-DEBUG*" "*REGEX-GROUPS*" "*REGEX-GROUPINGS*"
+   ;; Functions
+   "REGEX-COMPILE"
+   ))
+
+(defpackage "CL-INFO"
+  (:use "COMMON-LISP" "MAXIMA-NREGEX")
   (:export "INFO" "*INFO-PATHS*"))
 
 (defpackage "COMMAND-LINE"

Index: nregex.lisp
===================================================================
RCS file: /cvsroot/maxima/maxima/src/nregex.lisp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nregex.lisp	25 Nov 2004 02:36:04 -0000	1.6
+++ nregex.lisp	10 Jun 2005 12:04:25 -0000	1.7
@@ -25,7 +25,7 @@
 
 (eval-when #-gcl(:compile-toplevel :load-toplevel :execute) 
 	   #+gcl(load compile eval)
-	   (defpackage "NREGEX"
+	   (defpackage "MAXIMA-NREGEX"
 	     (:use "COMMON-LISP")
 	     (:export
 	      ;; Vars
@@ -35,7 +35,7 @@
 	      ))
 	   )
 
-(in-package "NREGEX")
+(in-package "MAXIMA-NREGEX")
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar *regex-debug* nil)	    ; Set to nil for no debugging code