From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 May 2016 08:26:09 +0000 (+0100)
Subject: src/parser/package.lisp: Do better at finding Gray streams on CMUCL.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/sod/commitdiff_plain/de869fc8c8f988f5551802bf1887a1e9b8f4d6cf

src/parser/package.lisp: Do better at finding Gray streams on CMUCL.

Take the opportunity to reorganize the conditional machinery.  Avoid the
trap waiting because CMUCL's Gray streams are in its `extensions'
package, along with things whose names which conflict with our
utilities.
---

diff --git a/src/parser/package.lisp b/src/parser/package.lisp
index 811440c..623c297 100644
--- a/src/parser/package.lisp
+++ b/src/parser/package.lisp
@@ -29,10 +29,13 @@ (cl:defpackage #:sod-parser
 
 	;; Try to find Gray streams support from somewhere.  ECL tucks them
 	;; somewhere unhelpful.
-	#+sbcl #:sb-gray
-	#+cmu #:extensions
-	#+ecl #.(if (find-package '#:gray) '#:gray '#:si)
-	#+clisp #:gray
-	#-(or sbcl cmu ecl clisp) ...))
+	#.(or (car '(#+sbcl #:sb-gray
+		     #+cmu #:extensions
+		     #+ecl #.(if (find-package '#:gray) '#:gray '#:si)
+		     #+clisp #:gray))
+	      (error "Unsupported Lisp (can't find Gray streams).")))
+
+  ;; CMUCL's `extensions' package has lots of cruft.  Use our cruft instead.
+  #+cmu (:shadowing-import-from #:sod-utilities #:symbolicate #:once-only))
 
 ;;;----- That's all, folks --------------------------------------------------