Changeset 4189

Timestamp:

10/04/03 10:48:10 (20 years ago)

Author:

piso

Message:

Work in progress.

File:

• trunk/j/src/org/armedbear/lisp/Interpreter.java (modified) (6 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Interpreter.java,v 1.39 2003-09-25 18:22:11 piso Exp $
+ * $Id: Interpreter.java,v 1.40 2003-10-04 10:48:10 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -46 +46 @@
 
     private final boolean jlisp;
+    private final InputStream inputStream;
+    private final OutputStream outputStream;
 
     public static synchronized Interpreter getInstance()
@@ -72 +74 @@
     {
         jlisp = false;
+        inputStream = null;
+        outputStream = null;
     }
 
@@ -77 +81 @@
                         String initialDirectory)
     {
+        jlisp = true;
+        this.inputStream = inputStream;
+        this.outputStream = outputStream;
         resetIO(new CharacterInputStream(inputStream),
                 new CharacterOutputStream(outputStream));
-        jlisp = true;
     }
 
@@ -117 +123 @@
             initialize(jlisp);
             Symbol TOP_LEVEL_LOOP = intern("TOP-LEVEL-LOOP", PACKAGE_TPL);
-            LispObject replFun = TOP_LEVEL_LOOP.getSymbolFunction();
-            if (replFun instanceof Function) {
-                replFun.execute();
+            LispObject tplFun = TOP_LEVEL_LOOP.getSymbolFunction();
+            if (tplFun instanceof Function) {
+                funcall0(tplFun, thread);
                 return;
             }
@@ -503 +509 @@
     public void kill()
     {
-        done = true;
+        if (jlisp) {
+            try {
+                inputStream.close();
+            }
+            catch (IOException e) {
+                Debug.trace(e);
+            }
+            try {
+                outputStream.close();
+            }
+            catch (IOException e) {
+                Debug.trace(e);
+            }
+        } else
+            System.exit(0);
     }