Changeset 15702

Timestamp:

06/06/23 06:38:00 (6 months ago)

Author:

Mark Evenson

Message:

Fix SYS:OUT-SYNONYM-OF for Gray streams

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Stream.java (modified) (1 diff)
• SynonymStream.java (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/Stream.java

@@ -2247 +2247 @@
 
     // ### out-synonym-of stream-designator => stream
-    private static final Primitive OUT_SYNONYM_OF =
-    new Primitive("out-synonym-of", PACKAGE_SYS, true, "stream-designator") {
-        @Override
+    public static final Primitive OUT_SYNONYM_OF
+        = new pf_out_synonym_of();
+    private static final class pf_out_synonym_of extends Primitive  {
+        pf_out_synonym_of() {
+            super("out-synonym-of", PACKAGE_SYS, true, "stream-designator");
+        }
         public LispObject execute (LispObject arg) {
+            if (arg instanceof SynonymStream) {
+                Symbol symbol
+                    = (Symbol) SynonymStream.SYNONYM_STREAM_SYMBOL.execute(arg);
+                return symbol.symbolValue();
+            }
             if (arg instanceof Stream)
                 return arg;

trunk/abcl/src/org/armedbear/lisp/SynonymStream.java

@@ -224 +224 @@
 
     // ### make-synonym-stream symbol => synonym-stream
-    private static final Primitive MAKE_SYNONYM_STREAM =
-        new Primitive("make-synonym-stream", "symbol")
-    {
-        @Override
+    private static final Primitive MAKE_SYNONYM_STREAM
+        = new pf_make_synonym_string();
+    private static final class pf_make_synonym_string extends Primitive {
+        pf_make_synonym_string() {
+            super("make-synonym-stream", PACKAGE_CL, true, "symbol");
+        }
         public LispObject execute(LispObject arg)
         {
@@ -235 +237 @@
 
     // ### synonym-stream-symbol synonym-stream => symbol
-    private static final Primitive SYNONYM_STREAM_STREAMS =
-        new Primitive("synonym-stream-symbol", "synonym-stream")
-    {
-        @Override
+    public static final Primitive SYNONYM_STREAM_SYMBOL
+        = new pf_synonym_stream_symbol();
+    private static final class pf_synonym_stream_symbol extends Primitive {
+        pf_synonym_stream_symbol() {
+            super("synonym-stream-symbol", PACKAGE_CL, true, "synonym-stream");
+        }
+
         public LispObject execute(LispObject arg)
         {