[slime-cvs] CVS slime

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv12629

Modified Files:
	ChangeLog swank-ecl.lisp 
Log Message:
* swank-ecl.lisp (function-name): Use clos:generic-function-name
for generic functions.
(arglist): Check fro symbol before calling special-operator-p and
macro-function.
Patch by Andy Hefner.


--- /project/slime/cvsroot/slime/ChangeLog	2009/11/06 17:59:22	1.1914
+++ /project/slime/cvsroot/slime/ChangeLog	2009/11/13 19:39:16	1.1915
@@ -1,3 +1,11 @@
+2009-11-13  Stas Boukarev  <stassats at gmail.com>
+
+	* swank-ecl.lisp (function-name): Use clos:generic-function-name
+	for generic functions.
+	(arglist): Check fro symbol before calling special-operator-p and
+	macro-function.
+	Patch by Andy Hefner.
+
 2009-11-06  Stas Boukarev  <stassats at gmail.com>
 
 	* swank-ecl.lisp (grovel-docstring-for-arglist): ECL's arglists
--- /project/slime/cvsroot/slime/swank-ecl.lisp	2009/11/06 17:59:22	1.47
+++ /project/slime/cvsroot/slime/swank-ecl.lisp	2009/11/13 19:39:16	1.48
@@ -206,9 +206,9 @@
           :not-available ))))
 
 (defimplementation arglist (name)
-  (cond ((special-operator-p name)
+  (cond ((and (symbolp name) (special-operator-p name))
          (grovel-docstring-for-arglist name 'function))
-        ((macro-function name)
+        ((and (symbolp name) (macro-function name))
          (grovel-docstring-for-arglist name 'function))
         ((or (functionp name) (fboundp name))
          (multiple-value-bind (name fndef)
@@ -228,7 +228,9 @@
         (t :not-available)))
 
 (defimplementation function-name (f)
-  (si:compiled-function-name f))
+  (typecase f
+    (generic-function (clos:generic-function-name f))
+    (function (si:compiled-function-name f))))
 
 (defimplementation macroexpand-all (form)
   ;;; FIXME! This is not the same as a recursive macroexpansion!