[armedbear-cvs] r12155 - in branches/0.16.x/abcl: . src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Sun Sep 20 04:31:01 2009
New Revision: 12155

Log:
Backported changes for Fix #63: GO forms to non-existent TAGBODY labels would exit ABCL



Modified:
   branches/0.16.x/abcl/CHANGES
   branches/0.16.x/abcl/src/org/armedbear/lisp/Lisp.java

Modified: branches/0.16.x/abcl/CHANGES
==============================================================================
--- branches/0.16.x/abcl/CHANGES	(original)
+++ branches/0.16.x/abcl/CHANGES	Sun Sep 20 04:31:01 2009
@@ -6,8 +6,10 @@
 
   * More careful checking for null args in LispStackFrame
   * Honor appearance of &allow-other-keys in CLOS MAKE-INSTANCE
+  * Fix #63: GO forms to non-existent TAGBODY labels would exit ABCL
 
 Version 0.16.0
+svn://common-lisp.net/project/armedbear/svn/tags/0.16.0/abcl
 (06 Sep, 2009)
 
   Summary of changes:

Modified: branches/0.16.x/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- branches/0.16.x/abcl/src/org/armedbear/lisp/Lisp.java	(original)
+++ branches/0.16.x/abcl/src/org/armedbear/lisp/Lisp.java	Sun Sep 20 04:31:01 2009
@@ -122,7 +122,7 @@
       }
     catch (Throwable t)
       {
-        t.printStackTrace();
+        Debug.trace(t);
       }
   }
 
@@ -276,7 +276,7 @@
           }
         catch (Go go)
           {
-            throw go;
+            return error(go.getCondition());
           }
         catch (Throw t)
           {
@@ -1041,6 +1041,7 @@
       }
     catch (Throwable t)
       {
+        Debug.trace(t);
         return null;
       }
   }
@@ -2559,7 +2560,7 @@
       }
     catch (ClassNotFoundException e)
       {
-        e.printStackTrace();
+        Debug.trace(e);
       }
   }