[armedbear-cvs] r14406 - trunk/abcl/src/org/armedbear/lisp

[mevenson at common-lisp.net]

Author: mevenson
Date: Fri Mar  1 05:42:21 2013
New Revision: 14406

Log:
The LispThread stack no longer grows inconsistently from errors thrown in implementation Java code.

Fixes #304.

Modified:
   trunk/abcl/src/org/armedbear/lisp/LispThread.java

Modified: trunk/abcl/src/org/armedbear/lisp/LispThread.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/LispThread.java	Fri Mar  1 03:26:24 2013	(r14405)
+++ trunk/abcl/src/org/armedbear/lisp/LispThread.java	Fri Mar  1 05:42:21 2013	(r14406)
@@ -607,6 +607,10 @@
 
     public final void popStackFrame()
     {
+        // Pop off intervening JavaFrames until we get back to a LispFrame
+        while (stack != null && stack instanceof JavaStackFrame) { 
+            stack = stack.getNext();
+        }
         if (stack != null)
             stack = stack.getNext();
     }