Changeset 4049

Timestamp:

09/25/03 14:33:57 (20 years ago)

Author:

piso

Message:

resetIO()

Location:

trunk/j/src/org/armedbear/lisp

Files:

• Interpreter.java (modified) (2 diffs)
• Lisp.java (modified) (2 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Interpreter.java,v 1.36 2003-09-20 17:02:04 piso Exp $
+ * $Id: Interpreter.java,v 1.37 2003-09-25 14:33:57 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -71 +71 @@
     private Interpreter()
     {
-        CharacterInputStream in = new CharacterInputStream(System.in);
-        _STANDARD_INPUT_.setSymbolValue(in);
-        CharacterOutputStream out = new CharacterOutputStream(System.out);
-        _STANDARD_OUTPUT_.setSymbolValue(out);
-        _ERROR_OUTPUT_.setSymbolValue(out);
-        _TRACE_OUTPUT_.setSymbolValue(out);
         jlisp = false;
     }
 
     private Interpreter(InputStream inputStream, OutputStream outputStream,
-        String initialDirectory)
-    {
-        CharacterInputStream in = new CharacterInputStream(inputStream);
-        _STANDARD_INPUT_.setSymbolValue(in);
-        CharacterOutputStream out = new CharacterOutputStream(outputStream);
-        _STANDARD_OUTPUT_.setSymbolValue(out);
-        _ERROR_OUTPUT_.setSymbolValue(out);
-        _TRACE_OUTPUT_.setSymbolValue(out);
-        _DEFAULT_PATHNAME_DEFAULTS_.setSymbolValue(
-            new LispString(initialDirectory));
+                        String initialDirectory)
+    {
+        resetIO(new CharacterInputStream(inputStream),
+                new CharacterOutputStream(outputStream));
         jlisp = true;
     }

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Lisp.java,v 1.148 2003-09-23 15:44:03 piso Exp $
+ * $Id: Lisp.java,v 1.149 2003-09-25 14:33:32 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -948 +948 @@
     }
 
+    private static CharacterInputStream stdin =
+        new CharacterInputStream(System.in);
+
+    private static CharacterOutputStream stdout =
+        new CharacterOutputStream(System.out);
+
+    public static final Symbol _STANDARD_INPUT_ =
+        exportSpecial("*STANDARD-INPUT*", PACKAGE_CL, stdin);
+
+    public static final Symbol _STANDARD_OUTPUT_ =
+        exportSpecial("*STANDARD-OUTPUT*", PACKAGE_CL, stdout);
+
+    public static final Symbol _ERROR_OUTPUT_ =
+        exportSpecial("*ERROR-OUTPUT*", PACKAGE_CL, stdout);
+
+    public static final Symbol _TRACE_OUTPUT_ =
+        exportSpecial("*TRACE-OUTPUT*", PACKAGE_CL, stdout);
+
     public static final Symbol _TERMINAL_IO_ =
         exportSpecial("*TERMINAL-IO*", PACKAGE_CL,
-                      new TwoWayStream(new CharacterInputStream(System.in),
-                                       new CharacterOutputStream(System.out)));
+                      new TwoWayStream(stdin, stdout));
 
     public static final Symbol _QUERY_IO_ =
         exportSpecial("*QUERY-IO*", PACKAGE_CL,
-                      new TwoWayStream(new CharacterInputStream(System.in),
-                                       new CharacterOutputStream(System.out)));
+                      new TwoWayStream(stdin, stdout));
 
     public static final Symbol _DEBUG_IO_ =
         exportSpecial("*DEBUG-IO*", PACKAGE_CL,
-                      new TwoWayStream(new CharacterInputStream(System.in),
-                                       new CharacterOutputStream(System.out)));
-
-    public static final Symbol _STANDARD_INPUT_ =
-        exportSpecial("*STANDARD-INPUT*", PACKAGE_CL,
-                      new CharacterInputStream(System.in));
-
-    public static final Symbol _STANDARD_OUTPUT_ =
-        exportSpecial("*STANDARD-OUTPUT*", PACKAGE_CL,
-                      new CharacterOutputStream(System.out));
-
-    public static final Symbol _ERROR_OUTPUT_ =
-        exportSpecial("*ERROR-OUTPUT*", PACKAGE_CL,
-                      new CharacterOutputStream(System.out));
-
-    public static final Symbol _TRACE_OUTPUT_ =
-        exportSpecial("*TRACE-OUTPUT*", PACKAGE_CL,
-                      new CharacterOutputStream(System.out));
+                      new TwoWayStream(stdin, stdout));
+
+    public void resetIO(CharacterInputStream in, CharacterOutputStream out)
+    {
+        stdin = in;
+        stdout = out;
+        _STANDARD_INPUT_.setSymbolValue(stdin);
+        _STANDARD_OUTPUT_.setSymbolValue(stdout);
+        _ERROR_OUTPUT_.setSymbolValue(stdout);
+        _TRACE_OUTPUT_.setSymbolValue(stdout);
+        _TERMINAL_IO_.setSymbolValue(new TwoWayStream(stdin, stdout));
+        _QUERY_IO_.setSymbolValue(new TwoWayStream(stdin, stdout));
+        _DEBUG_IO_.setSymbolValue(new TwoWayStream(stdin, stdout));
+    }
 
     public static final TwoWayStream getTerminalIO()