[nongnu] elpa/slime 96de8b0baa 16/44: abcl: conditionalize use of Gray Streams

[ELPA Syncer]

branch: elpa/slime
commit 96de8b0baae985ff7589dd11c83db066d50bc566
Author: Mark Evenson <evenson.not.org@gmail.com>
Commit: Mark Evenson <evenson.not.org@gmail.com>

    abcl: conditionalize use of Gray Streams
    
    WARNING: Since ABCL's Gray stream implementation has long been
    unusable as the basis of communication with SWANK, this doesn't
    currently work with any released version of the Bear.  One needs the
    changes from <https://github.com/armedbear/abcl/pull/586> for this to
    work.
---
 swank-loader.lisp |  2 +-
 swank.asd         |  2 +-
 swank/abcl.lisp   | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/swank-loader.lisp b/swank-loader.lisp
index 4d20ab1d81..556d70408c 100644
--- a/swank-loader.lisp
+++ b/swank-loader.lisp
@@ -46,7 +46,7 @@
   #+lispworks '((swank lispworks) (swank gray))
   #+allegro '((swank allegro) (swank gray))
   #+clisp '(xref metering (swank clisp) (swank gray))
-  #+armedbear '((swank abcl))
+  #+armedbear '((swank abcl) (swank gray))
   #+cormanlisp '((swank corman) (swank gray))
   #+ecl '((swank ecl) (swank gray))
   #+clasp '(metering (swank clasp) (swank gray))
diff --git a/swank.asd b/swank.asd
index f3859b4bcb..b28fbf29c0 100644
--- a/swank.asd
+++ b/swank.asd
@@ -42,7 +42,7 @@
                              (:file "clasp" :if-feature :clasp)
                              (:file "mkcl" :if-feature :mkcl)
                              (:file "mezzano" :if-feature :mezzano)
-                             (:file "gray" :if-feature (:not :armedbear))
+                             (:file "gray")
                              (:file "match")
                              (:file "rpc")))
                (:file "swank")))
diff --git a/swank/abcl.lisp b/swank/abcl.lisp
index 229c2b2cc8..4b684b473c 100644
--- a/swank/abcl.lisp
+++ b/swank/abcl.lisp
@@ -49,10 +49,13 @@
 (defimplementation gray-package-name ()
   "GRAY-STREAMS")
 
-;; FIXME: switch to shared Gray stream implementation when the
-;; architecture for booting streams allows us to replace the Java-side
-;; implementation of a Slime{Input,Output}Stream.java classes are
-;; subsumed <http://abcl.org/trac/ticket/373>.
+;;;; abcl-1.9.2 revamped Gray Streams, so it uses the default
+;;;; implementation of MAKE-{INPUT,OUTPUT}-STREAM.
+
+;;;; Previous ABCL versions use the specialized Java implementations,
+;;;; which won't work with all SLIME contribs, notably the
+;;;; <file:../contrib/slime-repl.lisp> one
+#-#.(swank/backend:with-symbol 'java/element-type 'gray-streams/java)
 (progn
   (defimplementation make-output-stream (write-string)
     (ext:make-slime-output-stream write-string))