[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	swank-arglists.lisp slime-autodoc.el ChangeLog 
Log Message:

	* swank-backend (declaration-arglist): Normalize declaration
	specifiers to contain `variables' rather than `vars'.

	* swank-arglists.lisp (arglist-dispatch ['declare]): Normalize
	`vars' to `variables'.
	(arglist-for-type-declaration): Ditto.

	* slime-autodoc (autodoc.1 [test]): Reorganize test, add comments,
	add cases to test declarations.


--- /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2010/01/03 15:34:54	1.54
+++ /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2010/01/06 14:13:48	1.55
@@ -1016,7 +1016,7 @@
              (make-arglist
               :required-args (list (make-arglist
                                     :required-args (list typespec-arglist)
-                                    :rest '#:vars)))))
+                                    :rest '#:variables)))))
           (('declare (decl-identifier . decl-args))
            (decoded-arglist-for-declaration decl-identifier decl-args))
           (_ (make-arglist :rest '#:declaration-specifiers))))))
@@ -1045,7 +1045,7 @@
          (make-arglist
           :required-args (list (make-arglist
                                 :required-args (list typespec-arglist)
-                                :rest '#:vars)))))
+                                :rest '#:variables)))))
       (_ :not-available))))
 
 (defun decoded-arglist-for-declaration (decl-identifier decl-args)
--- /project/slime/cvsroot/slime/contrib/slime-autodoc.el	2010/01/03 20:50:42	1.31
+++ /project/slime/cvsroot/slime/contrib/slime-autodoc.el	2010/01/06 14:13:48	1.32
@@ -247,46 +247,61 @@
 (def-slime-test autodoc.1
     (buffer-sexpr wished-arglist &optional skip-trailing-test-p)
     ""
-    '(("(swank::emacs-connected*HERE*"    "(emacs-connected)")
-      ("(swank::emacs-connected *HERE*"    "(emacs-connected)")
+    '(
+      ;; Test basics
+      ("(swank::emacs-connected*HERE*"    "(emacs-connected)")
+      ("(swank::emacs-connected *HERE*"   "(emacs-connected)")
       ("(swank::create-socket*HERE*"      "(create-socket host port)")
       ("(swank::create-socket *HERE*"     "(create-socket ===> host <=== port)")
       ("(swank::create-socket foo *HERE*" "(create-socket host ===> port <===)")
+
+      ;; Test if cursor is on non-existing required parameter
       ("(swank::create-socket foo bar *HERE*" "(create-socket host port)")
 
+      ;; Test cursor in front of opening parenthesis
+      ("(swank::with-struct *HERE*(foo. x y) *struct* body1)"
+       "(with-struct (conc-name &rest names) obj &body body)"
+       t)
+
+      ;; Test variable content display
+      ("(progn swank::default-server-port*HERE*" "DEFAULT-SERVER-PORT => 4005")
+
+      ;; Test with syntactic sugar
       ("#'(lambda () (swank::create-socket*HERE*" "(create-socket host port)")
       ("`(lambda () ,(swank::create-socket*HERE*" "(create-socket host port)")
+      ("(remove-if #'(lambda () (swank::create-socket*HERE*"    "(create-socket host port)")
+      ("`(remove-if #'(lambda () ,@(swank::create-socket*HERE*" "(create-socket host port)")
 
-      ("(remove-if #'(lambda () (swank::create-socket*HERE*"
-       "(create-socket host port)")
-      ("`(remove-if #'(lambda () ,@(swank::create-socket*HERE*"
-       "(create-socket host port)")
-
+      ;; Test &optional
       ("(swank::symbol-status foo *HERE*" 
        "(symbol-status symbol &optional ===> (package (symbol-package symbol)) <===)")
 
+      ;; Test context-sensitive autodoc
       ("(defmethod swank::arglist-dispatch (*HERE*"
        "(defmethod arglist-dispatch (===> operator <=== arguments) &body body)")
       ("(apply 'swank::eval-for-emacs*HERE*"
        "(apply 'eval-for-emacs &optional form buffer-package id &rest args)")
-
       ("(apply #'swank::eval-for-emacs*HERE*"
        "(apply #'eval-for-emacs &optional form buffer-package id &rest args)")
-
       ("(apply 'swank::eval-for-emacs foo *HERE*"
        "(apply 'eval-for-emacs &optional form ===> buffer-package <=== id &rest args)")
-
       ("(apply #'swank::eval-for-emacs foo *HERE*"
        "(apply #'eval-for-emacs &optional form ===> buffer-package <=== id &rest args)")
-
+      
+      ;; Test &KEY and nested arglists
       ("(swank::with-retry-restart (:msg *HERE*"
        "(with-retry-restart (&key ===> (msg \"Retry.\") <===) &body body)")
       ("(swank::start-server \"/tmp/foo\" :coding-system *HERE*"
        "(start-server port-file &key (style swank:*communication-style*) (dont-close swank:*dont-close*) ===> (coding-system swank::*coding-system*) <===)")
-
-      ("(swank::with-struct *HERE*(foo. x y) *struct* body1)"
-       "(with-struct (conc-name &rest names) obj &body body)"
-       t))
+      
+      ;; Test declarations and type specifiers
+      ("(declare (string *HERE*" 
+       "(declare (string &rest ===> variables <===))")
+      ("(declare ((string *HERE*"
+       "(declare ((string &optional ===> size <===) &rest variables))")
+      ("(declare (type (string *HERE*"
+       "(declare (type (string &optional ===> size <===) &rest variables))")
+      )
   (slime-check-top-level)
   (with-temp-buffer
     (setq slime-buffer-package "COMMON-LISP-USER")
--- /project/slime/cvsroot/slime/contrib/ChangeLog	2010/01/05 19:53:17	1.333
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2010/01/06 14:13:48	1.334
@@ -1,3 +1,12 @@
+2010-01-06  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* swank-arglists.lisp (arglist-dispatch ['declare]): Normalize
+	`vars' to `variables'.
+	(arglist-for-type-declaration): Ditto.
+
+	* slime-autodoc (autodoc.1 [test]): Reorganize test, add comments,
+	add cases to test declarations.
+
 2010-01-05  Stas Boukarev  <stassats at gmail.com>
 
 	* slime-asdf.el (slime-save-system): New function for saving