[mcclim-cvs] CVS mcclim/Drei

[thenriksen]

Update of /project/mcclim/cvsroot/mcclim/Drei
In directory cl-net:/tmp/cvs-serv30788/Drei

Modified Files:
	lisp-syntax-swank.lisp 
Log Message:
Bring Drei up to date with CVS Swank.


--- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp	2008/06/07 13:31:14	1.13
+++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax-swank.lisp	2008/12/08 17:48:53	1.14
@@ -63,12 +63,13 @@
          (buffer-file-name (filepath (buffer view)))
          (swank::*buffer-package* package)
          (swank::*buffer-readtable* *readtable*))
-    (let  ((result (swank::compile-string-for-emacs
-                    string view-name (offset buffer-mark) (princ-to-string buffer-file-name)
-                    nil))
-           (notes (loop for note in (swank::compiler-notes-for-emacs)
-                     collect (make-compiler-note note))))
-      (values result notes))))
+    (let*  ((result (swank::compile-string-for-emacs
+                     string view-name (offset buffer-mark) (princ-to-string buffer-file-name)
+                     nil))
+            (notes (loop for note in (swank::compilation-result-notes result)
+                         collect (make-compiler-note note))))
+      (values (list (swank::compilation-result-successp result)
+                    (swank::compilation-result-duration result)) notes))))
 
 (defmethod compile-file-for-drei ((image swank-local-image) filepath package &optional load-p)
   (declare (ignore image))
@@ -76,9 +77,10 @@
          (swank::*buffer-readtable* *readtable*)
          (*compile-verbose* nil)
          (result (swank::compile-file-for-emacs filepath load-p))
-         (notes (loop for note in (swank::compiler-notes-for-emacs)
-                   collect (make-compiler-note note))))
-    (values result notes)))
+         (notes (loop for note in (swank::compilation-result-notes result)
+                      collect (make-compiler-note note))))
+    (values (list (swank::compilation-result-successp result)
+                  (swank::compilation-result-duration result)) notes)))
 
 (defmethod find-definitions-for-drei ((image swank-local-image) symbol)
   (declare (ignore image))
@@ -108,4 +110,4 @@
 
 (defmethod fuzzy-completions ((image swank-local-image) symbol-name default-package &optional limit)
   (declare (ignore image))
-  (swank::fuzzy-completions symbol-name (package-name default-package) limit))
+  (swank::fuzzy-completions symbol-name (package-name default-package) :limit limit))