[slime-cvs] CVS slime

[CVS User tnorderhaug]

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

Modified Files:
	swank-loader.lisp swank-rpc.lisp swank.lisp 
Log Message:
New swank-rpc package
Use swank-rpc in swank package.

--- /project/slime/cvsroot/slime/swank-loader.lisp	2010/01/18 23:20:34	1.97
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2010/01/19 19:41:00	1.98
@@ -182,7 +182,7 @@
                            :defaults src-dir))
           names))
 
-(defvar *swank-files* `(swank-backend ,@*sysdep-files* swank-match swank swank-rpc))
+(defvar *swank-files* `(swank-backend ,@*sysdep-files* swank-match swank-rpc swank))
 
 (defvar *contribs* '(swank-c-p-c swank-arglists swank-fuzzy
                      swank-fancy-inspector
--- /project/slime/cvsroot/slime/swank-rpc.lisp	2010/01/18 23:20:34	1.1
+++ /project/slime/cvsroot/slime/swank-rpc.lisp	2010/01/19 19:41:01	1.2
@@ -8,7 +8,39 @@
 ;;; are disclaimed.
 ;;;
 
-(in-package :swank)
+(defpackage :swank-rpc
+  (:export 
+    ; export everything for compatibility, need to be trimmed down!
+    #:decode-message
+    #:read-packet
+    #:read-chunk
+    #:*swank-io-package*
+    #:read-form
+    #:encode-message
+    #:prin1-to-string-for-emacs
+    #:destructure-case
+    #:swank-protocol-error
+    #:swank-protocol-error.condition
+    #:swank-protocol-error.backtrace
+    #:make-swank-protocol-error
+    #:*log-events*
+    #:*log-output*
+    #:init-log-output
+    #:real-input-stream
+    #:real-output-stream
+    #:*event-history*
+    #:*event-history-index*
+    #:*enable-event-history*
+    #:log-event
+    #:event-history-to-list
+    #:clear-event-history
+    #:dump-event-history
+    #:dump-event
+    #:escape-non-ascii
+    #:ascii-string-p
+    #:ascii-char-p))
+
+(in-package :swank-rpc)
 
 ;;;;; Input
 
@@ -135,8 +167,9 @@
              (princ (swank-protocol-error.condition condition) stream))))
 
 (defun make-swank-protocol-error (condition)
-  (make-condition 'swank-protocol-error :condition condition 
-                  :backtrace (safe-backtrace)))
+  (make-condition 'swank-protocol-error :condition condition
+                  ; should be eliminated from here and covered in swank module:
+                  :backtrace (funcall (intern "SAFE-BACKTRACE" "SWANK"))))
 
 ;;;;; Logging
 
--- /project/slime/cvsroot/slime/swank.lisp	2010/01/13 13:45:49	1.683
+++ /project/slime/cvsroot/slime/swank.lisp	2010/01/19 19:41:01	1.684
@@ -13,7 +13,7 @@
 ;;; available to us here via the `SWANK-BACKEND' package.
 
 (defpackage :swank
-  (:use :cl :swank-backend :swank-match)
+  (:use :cl :swank-backend :swank-match :swank-rpc)
   (:export #:startup-multiprocessing
            #:start-server 
            #:create-server