[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime-parse.el 
Log Message:
	* slime-parse.el (slime-check-enclosing-form-specs): Use
	`slime-test-expect' rather than `slime-check'.
	([test] enclosing-form-specs.1): Add two more cases.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/02/27 18:07:14	1.181
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/02/27 21:35:35	1.182
@@ -1,5 +1,11 @@
 2009-02-27  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	* slime-parse.el (slime-check-enclosing-form-specs): Use
+	`slime-test-expect' rather than `slime-check'.
+	([test] enclosing-form-specs.1): Add two more cases.
+
+2009-02-27  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	* bridge.el: Replace old-style backquoting.
 
 	* slime-presentations.el
--- /project/slime/cvsroot/slime/contrib/slime-parse.el	2009/02/27 17:37:14	1.18
+++ /project/slime/cvsroot/slime/contrib/slime-parse.el	2009/02/27 21:35:35	1.19
@@ -338,11 +338,10 @@
 ;;;; Test cases
 
 (defun slime-check-enclosing-form-specs (wished-form-specs)
-  (multiple-value-bind (specs) 
-      (slime-enclosing-form-specs)
-    (slime-check 
-        ("Check enclosing form specs in `%s' (%d)" (buffer-string) (point))
-      (equal specs wished-form-specs))))
+  (slime-test-expect 
+   (format "Enclosing form specs correct in `%s' (at %d)" (buffer-string) (point))
+   wished-form-specs
+   (first (slime-enclosing-form-specs))))
 
 (def-slime-test enclosing-form-specs.1
     (buffer-sexpr wished-form-specs)
@@ -355,6 +354,8 @@
       ("(cerror foo *HERE*"           (("cerror" "foo")))
       ("(cerror foo bar *HERE*"       (("cerror" "foo" "bar")))
       ("(make-instance foo *HERE*"    (("make-instance" "foo")))
+      ("(apply 'foo *HERE*"           (("apply" "'foo")))
+      ("(apply #'foo *HERE*"          (("apply" "#'foo")))
       ("(declare *HERE*"              (("declare")))
       ("(declare (optimize *HERE*"    ((:declaration ("optimize")) ("declare")))
       ("(declare (string *HERE*"      ((:declaration ("string")) ("declare")))
@@ -362,15 +363,14 @@
       ("(declare ((vector bit *HERE*" ((:type-specifier ("vector" "bit")))))
   (slime-check-top-level)
   (with-temp-buffer
-    (let ((tmpbuf (current-buffer)))
-      (lisp-mode)
-      (insert buffer-sexpr)
-      (search-backward "*HERE*")
-      (delete-region (match-beginning 0) (match-end 0))
-      (slime-check-enclosing-form-specs wished-form-specs)
-      (insert ")") (backward-char)
-      (slime-check-enclosing-form-specs wished-form-specs)      
-      )))
+    (lisp-mode)
+    (insert buffer-sexpr)
+    (search-backward "*HERE*")
+    (delete-region (match-beginning 0) (match-end 0))
+    (slime-check-enclosing-form-specs wished-form-specs)
+    (insert ")") (backward-char)
+    (slime-check-enclosing-form-specs wished-form-specs)      
+    ))