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

[Mark Evenson]

Author: mevenson
Date: Mon Aug  2 02:07:45 2010
New Revision: 12849

Log:
Narrow LISP-ERROR to STORAGE-CONDITION.

Now JRUN-EXCEPTION-PROTECTED behaves like INTERACTIVE-EVAL which
should be correct.

Include textual message about reason for STORAGE-CONDITION



Modified:
   trunk/abcl/src/org/armedbear/lisp/Java.java
   trunk/abcl/src/org/armedbear/lisp/Lisp.java

Modified: trunk/abcl/src/org/armedbear/lisp/Java.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Java.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Java.java	Mon Aug  2 02:07:45 2010
@@ -1201,7 +1201,7 @@
                 return LispThread.currentThread().execute(closure);
             }
             catch (OutOfMemoryError oom) {
-                return error(new StorageCondition("Out of memory."));
+                return error(new StorageCondition("Out of memory " + oom.getMessage()));
             }
             catch (StackOverflowError oos) {
                 return error(new StorageCondition("Stack overflow."));

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Mon Aug  2 02:07:45 2010
@@ -277,7 +277,7 @@
           }
         catch (OutOfMemoryError e)
           {
-            return error(new LispError("Out of memory."));
+            return error(new StorageCondition("Out of memory " + e.getMessage()));
           }
         catch (StackOverflowError e)
           {