From 5cce2b7d909b7b4905a58d96e609eb5b4ac8351c Mon Sep 17 00:00:00 2001
From: Stelian Ionescu <sionescu@common-lisp.net>
Date: Tue, 9 Dec 2008 01:11:03 +0100
Subject: [PATCH] Better mangling of Gray stream symbols.

---
 base/pkgdcl.lisp | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/base/pkgdcl.lisp b/base/pkgdcl.lisp
index 030c6bd..1cbcd26 100644
--- a/base/pkgdcl.lisp
+++ b/base/pkgdcl.lisp
@@ -83,24 +83,22 @@
 
   (defparameter *gray-stream-package*
     #+allegro :excl
-    #+cmu :ext
-    #+scl :ext
-    #+clisp :gray
-    #+ecl :gray
+    #+(or cmu scl) :ext
+    #+(or clisp ecl) :gray
     #+(or ccl openmcl) :ccl
     #+lispworks :stream
     #+sbcl :sb-gray
-    #-(or allegro cmu clisp ecl ccl openmcl lispworks sbcl scl)
+    #-(or allegro cmu scl clisp ecl ccl openmcl lispworks sbcl)
     (error "Your CL implementation isn't supported.")))
 
-(import (mapcar #'(lambda (s) (find-symbol (string s) *gray-stream-package*))
-                *gray-stream-symbols*)
-        :iolib.base)
-
-(export (mapcar (lambda (s) (intern (string s) :iolib.base))
-                (list* '#:trivial-gray-stream-mixin
-                       '#:stream-read-sequence
-                       '#:stream-write-sequence
-                       '#:stream-file-position
-                       *gray-stream-symbols*))
-        :iolib.base)
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (import (mapcar #'(lambda (s) (intern (string s) *gray-stream-package*))
+                  *gray-stream-symbols*)
+          :iolib.base)
+  (export (mapcar (lambda (s) (intern (string s) :iolib.base))
+                  (list* '#:trivial-gray-stream-mixin
+                         '#:stream-read-sequence
+                         '#:stream-write-sequence
+                         '#:stream-file-position
+                         *gray-stream-symbols*))
+          :iolib.base))
-- 
2.11.4.GIT