[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog slime.el swank.lisp 
Log Message:
* swank.lisp (sleep-for): New function
* slime.el ([test] break): Use SWANK::SLEEP-FOR to help CCL pass
this test.
([test] arglist): Update arglist of
swank::compile-string-for-emacs.
([rest] find-definition.2): Allow some whitespace before the actual
position.  Otherwise, CCL would fail on this test.

--- /project/slime/cvsroot/slime/ChangeLog	2008/12/31 11:25:46	1.1615
+++ /project/slime/cvsroot/slime/ChangeLog	2009/01/01 14:48:04	1.1616
@@ -1,3 +1,13 @@
+2009-01-01  Helmut Eller  <heller at common-lisp.net>
+
+	* swank.lisp (sleep-for): New function
+	* slime.el ([test] break): Use SWANK::SLEEP-FOR to help CCL pass
+	this test.
+	([test] arglist): Update arglist of
+	swank::compile-string-for-emacs.
+	([rest] find-definition.2): Allow some whitespace before the actual
+	position.  Otherwise, CCL would fail on this test.
+
 2008-12-31  Helmut Eller  <heller at common-lisp.net>
 
 	* swank.lisp (maybe-redirect-global-io): Don't consider
--- /project/slime/cvsroot/slime/slime.el	2008/12/31 11:25:19	1.1086
+++ /project/slime/cvsroot/slime/slime.el	2009/01/01 14:48:04	1.1087
@@ -7436,7 +7436,7 @@
            (= orig-pos (point)))))
     (slime-check-top-level))
 
-(def-slime-test (find-definition.2 ("ccl" "allegro" "lispworks"))
+(def-slime-test (find-definition.2 ("allegro" "lispworks"))
     (buffer-content buffer-package snippet)
     "Check that we're able to find definitions even when
 confronted with nasty #.-fu."
@@ -7448,7 +7448,7 @@
        #.(prog1 nil (makunbound '*foobar*))
        "
        "SWANK"
-       "(defun .foo. "
+       "[ \t]*(defun .foo. "
        ))
   (let ((slime-buffer-package buffer-package))
     (with-temp-buffer
@@ -7498,7 +7498,7 @@
       ("swank::create-socket" "(swank::create-socket host port)")
       ("swank::emacs-connected" "(swank::emacs-connected )")
       ("swank::compile-string-for-emacs"
-       "(swank::compile-string-for-emacs string buffer position directory debug)")
+       "(swank::compile-string-for-emacs string buffer position directory policy)")
       ("swank::connection.socket-io"
        "(swank::connection.socket-io \\(struct\\(ure\\)?\\|object\\|instance\\|x\\))")
       ("cl:lisp-implementation-type" "(cl:lisp-implementation-type )")
@@ -7809,7 +7809,9 @@
   (slime-check-top-level)
   (slime-eval-async 
    `(cl:eval (cl:read-from-string 
-              ,(prin1-to-string `(dotimes (i ,times) ,exp (sleep 0.2))))))
+              ,(prin1-to-string `(dotimes (i ,times) 
+                                   ,exp 
+                                   (swank::sleep-for 0.2))))))
   (dotimes (i times)
     (slime-wait-condition "Debugger visible" 
                           (lambda () 
--- /project/slime/cvsroot/slime/swank.lisp	2008/12/31 11:25:39	1.620
+++ /project/slime/cvsroot/slime/swank.lisp	2009/01/01 14:48:04	1.621
@@ -2204,6 +2204,20 @@
     (send-to-emacs `(:background-message 
                      ,(apply #'format nil format-string args)))))
 
+;; This is only used by the test suite.
+(defun sleep-for (seconds)
+  "Sleep at least SECONDS seconds.
+This is just like sleep but guarantees to sleep
+at least SECONDS."
+  (let* ((start (get-internal-real-time))
+         (end (+ start
+                 (* seconds internal-time-units-per-second))))
+    (loop
+     (let ((now (get-internal-real-time)))
+       (cond ((< end now) (return))
+             (t (sleep (/ (- end now)
+                          internal-time-units-per-second))))))))
+
 
 ;;;; Debugger