Changeset 13090

Timestamp:

12/10/10 15:58:09 (12 years ago)

Author:

vvoutilainen

Message:

Make --batch exit, use Lisp.exit() in places where applicable so
that the streams are flushed, hence allowing --eval output
to be flushed.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Extensions.java (modified) (1 diff)
• Interpreter.java (modified) (6 diffs)
• Primitives.java (modified) (1 diff)
• java/swing/REPLConsole.java (modified) (1 diff)

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

@@ -228 +228 @@
     public LispObject execute()
     {
+      ((Stream)Symbol.STANDARD_OUTPUT.getSymbolValue())._finishOutput();
+      ((Stream)Symbol.ERROR_OUTPUT.getSymbolValue())._finishOutput();
       exit(0);
       return LispThread.currentThread().nothing();

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

@@ -245 +245 @@
                     } else {
                         System.err.println("No argument supplied to --eval");
-                        System.exit(1);
+                        exit(1);
                     }
                 } else if (arg.equals("--load") ||
@@ -253 +253 @@
                     } else {
                         System.err.println("No argument supplied to --load");
-                        System.exit(1);
+                        exit(1);
                     }
                 } else {
@@ -293 +293 @@
                             sb.append(separator);
                             System.err.print(sb.toString());
-                            System.exit(2);
+                            exit(2);
                         }
                         ++i;
@@ -299 +299 @@
                         // Shouldn't happen.
                         System.err.println("No argument supplied to --eval");
-                        System.exit(1);
+                        exit(1);
                     }
                 } else if (arg.equals("--load") ||
@@ -314 +314 @@
                         // Shouldn't happen.
                         System.err.println("No argument supplied to --load");
-                        System.exit(1);
+                        exit(1);
                     }
                 }
             }
+        }
+        if (_BATCH_MODE_.getSymbolValue() == T) {
+            exit(0);
         }
     }
@@ -438 +441 @@
                 Debug.trace(e);
             }
-        } else
+        } else {
+            ((Stream)Symbol.STANDARD_OUTPUT.getSymbolValue())._finishOutput();
+            ((Stream)Symbol.ERROR_OUTPUT.getSymbolValue())._finishOutput();
             System.exit(status);
+        }
     }
 

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

@@ -1597 +1597 @@
 
             //###FIXME: Bail out, but do it nicer...
-            System.exit(1);
+            exit(1);
             return NIL;
         }

trunk/abcl/src/org/armedbear/lisp/java/swing/REPLConsole.java

@@ -303 +303 @@
     } catch (Throwable e) {
       e.printStackTrace();
-      System.exit(1);
+      exit(1);
     }
     final REPLConsole d = new REPLConsole(repl);