[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv19730

Modified Files:
	swank-lispworks.lisp swank-loader.lisp ChangeLog 
Log Message:
Drop remaining dependencies on nregex.

* swank-lispworks.lisp (unmangle-unfun): Use sys::setf-symbol-p
instead of regexp matching.

* swank-loader.lisp (*sysdep-files*): Don't include nregex.



--- /project/slime/cvsroot/slime/swank-lispworks.lisp	2007/08/23 19:03:37	1.92
+++ /project/slime/cvsroot/slime/swank-lispworks.lisp	2007/11/24 08:18:59	1.93
@@ -542,22 +542,10 @@
 (defun unmangle-unfun (symbol)
   "Converts symbols like 'SETF::|\"CL-USER\" \"GET\"| to
 function names like \(SETF GET)."
-  (or (and (eq (symbol-package symbol)
-               (load-time-value (find-package :setf)))
-           (let ((slime-nregex::*regex-groupings* 0)
-                 (slime-nregex::*regex-groups* (make-array 10))
-                 (symbol-name (symbol-name symbol)))
-             (and (funcall (load-time-value
-                             (compile nil (slime-nregex:regex-compile "^\"(.+)\" \"(.+)\"$")))
-                           symbol-name)
-                  (list 'setf
-                        (intern (apply #'subseq symbol-name
-                                       (aref slime-nregex::*regex-groups* 2))
-                                (find-package
-                                 (apply #'subseq symbol-name
-                                        (aref slime-nregex::*regex-groups* 1))))))))
-      symbol))
-
+  (cond ((sys::setf-symbol-p symbol)
+         (sys::setf-pair-from-underlying-name symbol))
+        (t symbol)))
+                    
 (defun signal-undefined-functions (htab &optional filename)
   (maphash (lambda (unfun dspecs)
 	     (dolist (dspec dspecs)
--- /project/slime/cvsroot/slime/swank-loader.lisp	2007/10/22 09:34:04	1.74
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2007/11/24 08:18:59	1.75
@@ -33,7 +33,7 @@
 
 (defparameter *sysdep-files*
   (append
-   '("nregex")
+   '()
    #+cmu '("swank-source-path-parser" "swank-source-file-cache" "swank-cmucl")
    #+scl '("swank-source-path-parser" "swank-source-file-cache" "swank-scl")
    #+sbcl '("swank-source-path-parser" "swank-source-file-cache"
--- /project/slime/cvsroot/slime/ChangeLog	2007/11/24 08:14:50	1.1248
+++ /project/slime/cvsroot/slime/ChangeLog	2007/11/24 08:18:59	1.1249
@@ -1,3 +1,12 @@
+2007-11-24  Helmut Eller  <helmut at localhost>
+
+	Drop remaining dependencies on nregex.
+
+	* swank-lispworks.lisp (unmangle-unfun): Use sys::setf-symbol-p
+	instead of regexp matching.
+
+	* swank-loader.lisp (*sysdep-files*): Don't include nregex.
+
 2007-11-24  Helmut Eller  <heller at common-lisp.net>
 
 	Mirror *modules* in Emacs.