Changeset 13144

Timestamp:

01/13/11 23:19:22 (11 years ago)

Author:

ehuelsmann

Message:

Stabilize the new way of terminating ABCL.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Interpreter.java (modified) (1 diff)
• Lisp.java (modified) (1 diff)
• Main.java (modified) (1 diff)

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

@@ -407 +407 @@
                 reportError(c, thread);
             }
+            catch (ProcessingTerminated e) {
+                throw e;
+            }
+            catch (IntegrityError e) {
+                return;
+            }
             catch (Throwable t) {
                 getStandardInput().clearInput();

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

@@ -287 +287 @@
           }
         catch (ControlTransfer c)
+          {
+            throw c;
+          }
+        catch (ProcessingTerminated c)
+          {
+            throw c;
+          }
+        catch (IntegrityError c)
           {
             throw c;

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

@@ -43 +43 @@
 
             public void run() {
-                Interpreter interpreter = Interpreter.createDefaultInstance(args);
-                if (interpreter != null) {
-                    try {
-                        interpreter.run();
-                    } catch (ProcessingTerminated e) {
-                        System.exit(e.getStatus());
-                    }
-
+               try {
+                    Interpreter interpreter = Interpreter.createDefaultInstance(args);
+                    if (interpreter != null)
+                            interpreter.run();
+                } catch (ProcessingTerminated e) {
+                    System.exit(e.getStatus());
                 }
             }