[armedbear-cvs] r12558 - trunk/abcl/src/org/armedbear/lisp

[Alessio Stalla]

Author: astalla
Date: Wed Mar 17 15:14:27 2010
New Revision: 12558

Log:
Exposed in/out streams and reader/writers of Stream.


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

Modified: trunk/abcl/src/org/armedbear/lisp/Stream.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Stream.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Stream.java	Wed Mar 17 15:14:27 2010
@@ -122,22 +122,22 @@
     }
 
     public Stream(Symbol structureClass, InputStream stream) {
-        super(structureClass);
+        this(structureClass);
         initAsBinaryInputStream(stream);
     }
 
     public Stream(Symbol structureClass, Reader r) {
-        super(structureClass);
+        this(structureClass);
         initAsCharacterInputStream(r);
     }
 
     public Stream(Symbol structureClass, OutputStream stream) {
-        super(structureClass);
+        this(structureClass);
         initAsBinaryOutputStream(stream);
     }
 
     public Stream(Symbol structureClass, Writer w) {
-        super(structureClass);
+        this(structureClass);
         initAsCharacterOutputStream(w);
     }
 
@@ -149,7 +149,7 @@
     // Input stream constructors.
     public Stream(Symbol structureClass, InputStream inputStream,
                   LispObject elementType, LispObject format) {
-        super(structureClass);
+        this(structureClass);
         this.elementType = elementType;
         setExternalFormat(format);
 
@@ -178,7 +178,7 @@
 
     // Output stream constructors.
     public Stream(Symbol structureClass, OutputStream outputStream, LispObject elementType, LispObject format) {
-        super(structureClass);
+        this(structureClass);
         this.elementType = elementType;
         setExternalFormat(format);
         if (elementType == Symbol.CHARACTER || elementType == Symbol.BASE_CHAR) {
@@ -2557,4 +2557,21 @@
             return second;
         }
     };
+
+    public InputStream getInputStream() {
+	return in;
+    }
+
+    public OutputStream getOutputStream() {
+	return out;
+    }
+
+    public Writer getWriter() {
+	return writer;
+    }
+
+    public PushbackReader getReader() {
+	return reader;
+    }
+
 }