Changeset 4116

Timestamp:

09/28/03 20:17:06 (19 years ago)

Author:

piso

Message:

LispStream? class hierarchy refactoring.

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Lisp.java (modified) (7 diffs)
• Primitives.java (modified) (15 diffs)
• TwoWayStream.java (modified) (4 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Lisp.java,v 1.155 2003-09-28 14:14:04 piso Exp $
+ * $Id: Lisp.java,v 1.156 2003-09-28 20:13:26 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -763 +763 @@
     }
 
-    public static final CharacterInputStream checkInputStream(LispObject obj)
+    public static final CharacterInputStream checkCharacterInputStream(LispObject obj)
         throws ConditionThrowable
     {
@@ -770 +770 @@
         if (obj instanceof CharacterInputStream)
             return (CharacterInputStream) obj;
-        if (obj instanceof TwoWayStream)
-            return ((TwoWayStream)obj).getInputStream();
-        throw new ConditionThrowable(new TypeError(obj, "input stream"));
-    }
-
-    public static final CharacterOutputStream checkOutputStream(LispObject obj)
+        if (obj instanceof TwoWayStream) {
+            LispInputStream in = ((TwoWayStream)obj).getInputStream();
+            if (in instanceof CharacterInputStream)
+                return (CharacterInputStream) in;
+        }
+        throw new ConditionThrowable(new TypeError(obj, "character input stream"));
+    }
+
+    public static final CharacterOutputStream checkCharacterOutputStream(LispObject obj)
         throws ConditionThrowable
     {
@@ -782 +785 @@
         if (obj instanceof CharacterOutputStream)
             return (CharacterOutputStream) obj;
-        if (obj instanceof TwoWayStream)
-            return ((TwoWayStream)obj).getOutputStream();
+        if (obj instanceof TwoWayStream) {
+            LispOutputStream out = ((TwoWayStream)obj).getOutputStream();
+            if (out instanceof CharacterOutputStream)
+                return (CharacterOutputStream) out;
+        }
         throw new ConditionThrowable(new TypeError(obj, "output stream"));
     }
@@ -791 +797 @@
     {
         if (obj == T)
-            return checkInputStream(_TERMINAL_IO_.symbolValue());
+            return checkCharacterInputStream(_TERMINAL_IO_.symbolValue());
         if (obj == NIL)
-            return checkInputStream(_STANDARD_INPUT_.symbolValue());
+            return checkCharacterInputStream(_STANDARD_INPUT_.symbolValue());
         if (obj instanceof CharacterInputStream)
             return (CharacterInputStream) obj;
-        if (obj instanceof TwoWayStream)
-            return ((TwoWayStream)obj).getInputStream();
+        if (obj instanceof TwoWayStream) {
+            LispInputStream in = ((TwoWayStream)obj).getInputStream();
+            if (in instanceof CharacterInputStream)
+                return (CharacterInputStream) in;
+        }
         throw new ConditionThrowable(new TypeError(obj, "character input stream"));
     }
@@ -805 +814 @@
     {
         if (obj == T)
-            return checkOutputStream(_TERMINAL_IO_.symbolValue());
+            return checkCharacterOutputStream(_TERMINAL_IO_.symbolValue());
         if (obj == NIL)
-            return checkOutputStream(_STANDARD_OUTPUT_.symbolValue());
+            return checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue());
         if (obj instanceof CharacterOutputStream)
             return (CharacterOutputStream) obj;
-        if (obj instanceof TwoWayStream)
-            return ((TwoWayStream)obj).getOutputStream();
+        if (obj instanceof TwoWayStream) {
+            LispOutputStream out = ((TwoWayStream)obj).getOutputStream();
+            if (out instanceof CharacterOutputStream)
+                return (CharacterOutputStream) out;
+        }
         throw new ConditionThrowable(new TypeError(obj, "character output stream"));
     }
@@ -1044 +1056 @@
     public static final CharacterOutputStream getStandardOutput() throws ConditionThrowable
     {
-        return checkOutputStream(_STANDARD_OUTPUT_.symbolValueNoThrow());
+        return checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValueNoThrow());
     }
 

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.450 2003-09-28 16:25:31 piso Exp $
+ * $Id: Primitives.java,v 1.451 2003-09-28 20:14:12 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -619 +619 @@
             final CharacterOutputStream out;
             if (args.length == 1)
-                out = checkOutputStream(_STANDARD_OUTPUT_.symbolValue());
+                out = checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue());
             else
                 out = outSynonymOf(args[1]);
@@ -647 +647 @@
         {
             CharacterOutputStream out =
-                checkOutputStream(_STANDARD_OUTPUT_.symbolValue());
+                checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue());
             out.prin1(arg);
             return arg;
@@ -676 +676 @@
         {
             CharacterOutputStream out =
-                checkOutputStream(_STANDARD_OUTPUT_.symbolValue());
+                checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue());
             out.terpri();
             out.prin1(arg);
@@ -702 +702 @@
             final CharacterOutputStream out;
             if (args.length == 0)
-                out = checkOutputStream(_STANDARD_OUTPUT_.symbolValue());
+                out = checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue());
             else
                 out = outSynonymOf(args[0]);
@@ -718 +718 @@
             CharacterOutputStream out;
             if (args.length == 0)
-                out = checkOutputStream(_STANDARD_OUTPUT_.symbolValue());
+                out = checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue());
             else
                 out = outSynonymOf(args[0]);
@@ -1129 +1129 @@
             String s = _format(_args);
             if (destination == T) {
-                checkOutputStream(_STANDARD_OUTPUT_.symbolValue()).writeString(s);
+                checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue()).writeString(s);
                 return NIL;
             }
@@ -1139 +1139 @@
             }
             if (destination instanceof TwoWayStream) {
-                ((TwoWayStream)destination).getOutputStream().writeString(s);
-                return NIL;
+                LispOutputStream out = ((TwoWayStream)destination).getOutputStream();
+                if (out instanceof CharacterOutputStream) {
+                    ((CharacterOutputStream)out).writeString(s);
+                    return NIL;
+                }
+                throw new ConditionThrowable(new TypeError(destination, "character output stream"));
             }
             // Destination can also be a string with a fill pointer.
@@ -3301 +3305 @@
             final CharacterOutputStream out;
             if (args.length == 1)
-                out = checkOutputStream(_STANDARD_OUTPUT_.symbolValue());
+                out = checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue());
             else
                 out = outSynonymOf(args[1]);
@@ -3366 +3370 @@
         final CharacterOutputStream out;
         if (args.length == 0)
-            out = checkOutputStream(_STANDARD_OUTPUT_.symbolValue());
+            out = checkCharacterOutputStream(_STANDARD_OUTPUT_.symbolValue());
         else
             out = outSynonymOf(args[0]);
@@ -3382 +3386 @@
             final CharacterInputStream in;
             if (args.length == 0)
-                in = checkInputStream(_STANDARD_INPUT_.symbolValue());
+                in = checkCharacterInputStream(_STANDARD_INPUT_.symbolValue());
             else
                 in = inSynonymOf(args[0]);
@@ -3516 +3520 @@
             if (length > 4)
                 throw new ConditionThrowable(new WrongNumberOfArgumentsException(this));
-            CharacterInputStream stream;
+            CharacterInputStream stream = null;
             if (length == 0)
                 stream = getStandardInput();
             else if (args[0] instanceof CharacterInputStream)
                 stream = (CharacterInputStream) args[0];
-            else if (args[0] instanceof TwoWayStream)
-                stream = ((TwoWayStream)args[0]).getInputStream();
-            else
-                throw new ConditionThrowable(new TypeError(args[0], "input stream"));
+            else if (args[0] instanceof TwoWayStream) {
+                LispInputStream in = ((TwoWayStream)args[0]).getInputStream();
+                if (in instanceof CharacterInputStream)
+                    stream = (CharacterInputStream) in;
+            }
+            if (stream == null)
+                throw new ConditionThrowable(new TypeError(args[0], "character input stream"));
             boolean eofError = length > 1 ? (args[1] != NIL) : true;
             LispObject eofValue = length > 2 ? args[2] : NIL;
@@ -3725 +3732 @@
                 throw new ConditionThrowable(new WrongNumberOfArgumentsException(this));
             CharacterInputStream stream =
-                length > 0 ? checkInputStream(args[0]) : getStandardInput();
+                length > 0 ? checkCharacterInputStream(args[0]) : getStandardInput();
             boolean eofError = length > 1 ? (args[1] != NIL) : true;
             LispObject eofValue = length > 2 ? args[2] : NIL;
@@ -3742 +3749 @@
                 throw new ConditionThrowable(new WrongNumberOfArgumentsException(this));
             CharacterInputStream stream =
-                length > 0 ? checkInputStream(args[0]) : getStandardInput();
+                length > 0 ? checkCharacterInputStream(args[0]) : getStandardInput();
             boolean eofError = length > 1 ? (args[1] != NIL) : true;
             LispObject eofValue = length > 2 ? args[2] : NIL;
@@ -3759 +3766 @@
                 throw new ConditionThrowable(new WrongNumberOfArgumentsException(this));
             CharacterInputStream stream =
-                length > 1 ? checkInputStream(args[1]) : getStandardInput();
+                length > 1 ? checkCharacterInputStream(args[1]) : getStandardInput();
             return stream.unreadChar(checkCharacter(args[0]));
         }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2003 Peter Graves
- * $Id: TwoWayStream.java,v 1.5 2003-09-19 12:32:14 piso Exp $
+ * $Id: TwoWayStream.java,v 1.6 2003-09-28 20:17:06 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -24 +24 @@
 public final class TwoWayStream extends LispStream
 {
-    private final CharacterInputStream in;
-    private final CharacterOutputStream out;
+    private final LispInputStream in;
+    private final LispOutputStream out;
 
-    public TwoWayStream(CharacterInputStream in, CharacterOutputStream out)
+    public TwoWayStream(LispInputStream in, LispOutputStream out)
     {
         this.in = in;
@@ -33 +33 @@
     }
 
-    public CharacterInputStream getInputStream()
+    public LispInputStream getInputStream()
     {
         return in;
     }
 
-    public CharacterOutputStream getOutputStream()
+    public LispOutputStream getOutputStream()
     {
         return out;
@@ -69 +69 @@
             throws ConditionThrowable
         {
-            if (!(first instanceof CharacterInputStream))
+            if (!(first instanceof LispInputStream))
                 throw new ConditionThrowable(new TypeError(first, "input stream"));
-            if (!(second instanceof CharacterOutputStream))
+            if (!(second instanceof LispOutputStream))
                 throw new ConditionThrowable(new TypeError(second, "output stream"));
-            return new TwoWayStream((CharacterInputStream) first,
-                (CharacterOutputStream) second);
+            return new TwoWayStream((LispInputStream) first,
+                                    (LispOutputStream) second);
         }
     };