Changeset 15707

Timestamp:

06/06/23 06:39:04 (6 months ago)

Author:

Mark Evenson

Message:

Gray Streams now work much better

Implemented Java-side proxy in GrayStream?.java for a GRAY-STREAM
object which forwards various methods of Stream.java into the correct
CLOS code. Signal Lisp-side errors for any unimplemented
interfaces.

gray-streams: implement Stream._writeChars()

gray-streams: getCharPos() --> STREAM-LINE-COLUMN

Mark GrayStreams?.getOffset() as unimplemented.

gray-streams: fix _readChar() to use character value

gray-streams: fix _unreadChar() to return character value

gray-streams: implement _charReady() stub _byteReady()

gray-streams: wire getElementType() --> STREAM-ELEMENT-TYPE

gray-streams: rename from CLOS Proxy to Gray Stream

gray-streams: move the Gray Stream Java proxies to their own package

gray-streams: tweak compilation order for gray-streams-java

gray-streams: restore Lisp.getStandardOutput() check

gray-stream: restore checkCharacterOutputStream() in CaseFrobStream?

gray-streams: fix CaseFrobStream?()

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• BroadcastStream.java (modified) (1 diff)
• CLOSProxyStream.java (deleted)
• CaseFrobStream.java (modified) (1 diff)
• ConcatenatedStream.java (modified) (1 diff)
• GrayStream.java (added)
• Lisp.java (modified) (6 diffs)
• Stream.java (modified) (2 diffs)
• TwoWayStream.java (modified) (1 diff)
• autoloads.lisp (modified) (1 diff)
• compile-system.lisp (modified) (2 diffs)
• gray-streams-java.lisp (added)
• gray-streams.lisp (modified) (1 diff)

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

@@ -242 +242 @@
                 if (s instanceof Stream) {
                     if (s.isOutputStream()
-                        || (s instanceof CLOSProxyStream)) {
+                        || (s instanceof GrayStream)) {
                         streams[i] = s;
                         continue;

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

@@ -44 +44 @@
     {
         super(Symbol.CASE_FROB_STREAM);
-        Debug.assertTrue(target.isCharacterOutputStream());
         this.target = target;
     }

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

@@ -257 +257 @@
                 if (s instanceof Stream) {
                     if (s.isInputStream()
-                        || (s instanceof CLOSProxyStream)) {
+                        || (s instanceof GrayStream)) {
                             streams = new Cons(s, streams);
                             continue;

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

@@ -90 +90 @@
   public static final Package PACKAGE_SEQUENCE =
     Packages.createPackage("SEQUENCE", 128); // EH 10-10-2010: Actual number 62
-
+  public static final Package PACKAGE_GRAY_STREAMS_JAVA =
+    Packages.createPackage("GRAY-STREAMS/JAVA");
 
   @DocString(name="nil")
@@ -138 +139 @@
     PACKAGE_PRECOMPILER.usePackage(PACKAGE_SYS);
     PACKAGE_SEQUENCE.usePackage(PACKAGE_CL);
+    PACKAGE_GRAY_STREAMS_JAVA.usePackage(PACKAGE_CL);
   }
 
@@ -1760 +1762 @@
     }
     if (obj.typep(Symbol.STREAM).equal(T)) {
-      Stream result = new CLOSProxyStream(obj);
+      Stream result = GrayStream.findOrCreate(obj);
       return result;
     }
@@ -1805 +1807 @@
           if (obj instanceof Stream)
             return (Stream) obj;
+          if (obj instanceof StandardObject)
+            return checkStream(obj);
           if (obj == T)
             return checkCharacterOutputStream(Symbol.TERMINAL_IO.symbolValue());
@@ -1818 +1822 @@
     if (obj instanceof Stream)
       return (Stream) obj;
+    if (obj instanceof StandardObject)
+      return checkStream(obj);
     if (obj == T)
       return checkCharacterInputStream(Symbol.TERMINAL_IO.symbolValue());
@@ -2376 +2382 @@
     value = SynonymStream.OUT_SYNONYM_OF.execute(value);
     Stream result = checkStream(value);
-    if (!(result instanceof CLOSProxyStream)) {
-      return checkCharacterOutputStream(result);
-    }
-    return result;
+    return checkCharacterOutputStream(result);
   }
 

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

@@ -441 +441 @@
 
     // Character input.
-    public final int getLineNumber() {
+    public int getLineNumber() {
         return lineNumber;
     }
@@ -1699 +1699 @@
     }
 
+    /**
+     Emit a newline unless at character position zero
+     
+     Return T if newline was emitted, NIL otherwise
+    */
     public LispObject freshLine() {
         if (charPos == 0)

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

@@ -231 +231 @@
             final Stream out = checkStream(second);
             if (!in.isInputStream()
-                && !(in instanceof CLOSProxyStream)) {
+                && !(in instanceof GrayStream)) {
                  return type_error(in, list(Symbol.SATISFIES,
                                             Symbol.INPUT_STREAM_P));
             }
             if (!out.isOutputStream()
-                && !(out instanceof CLOSProxyStream)) {
+                && !(out instanceof GrayStream)) {
                 return type_error(out, list(Symbol.SATISFIES,
                                                   Symbol.OUTPUT_STREAM_P));

trunk/abcl/src/org/armedbear/lisp/autoloads.lisp

@@ -43 +43 @@
 
 
-
-
 (in-package "SYSTEM")
-
 
 ;; This one must be last, or at least past print-object and clos:

trunk/abcl/src/org/armedbear/lisp/compile-system.lisp

@@ -319 +319 @@
       (load (do-compile "destructuring-bind.lisp"))
       (load (do-compile "featurep.lisp"))
+      (load (do-compile "gray-streams.lisp"))
+      (load (do-compile "gray-streams-java.lisp"))
 
       ;; But not for these.
@@ -376 +378 @@
                            "get-pid.lisp"
                            "gentemp.lisp"
-                           "gray-streams.lisp"
                            "gui.lisp"
                            "inline.lisp"

trunk/abcl/src/org/armedbear/lisp/gray-streams.lisp

@@ -151 +151 @@
    "STREAM-WRITE-SEQUENCE"
    "STREAM-FILE-POSITION"
+   "STREAM-ELEMENT-TYPE"
    "FUNDAMENTAL-BINARY-INPUT-STREAM"
    "FUNDAMENTAL-BINARY-OUTPUT-STREAM"))