2003/10/31 09:50:08

[org.ibex.core.git] / src / org / xwt / Trap.java

diff --git a/src/org/xwt/Trap.java b/src/org/xwt/Trap.java
index df51b53..2895d9f 100644 (file)
--- a/src/org/xwt/Trap.java
+++ b/src/org/xwt/Trap.java
@@ -96,29 +96,31 @@ public class Trap {
 
     private Trap() { }
 
-    public Object perform() throws JS.Exn {
+    public Object perform() {
         try {
             if (f.getNumFormalArgs() > 0) return cascade();
-            return f.call(new TrapArgs(this));
+            JS.Thread.current().setTailCall(f, new TrapArgs(this));
+            return null;
         } catch (Exception e) {
             Log.log(this, "Exception thrown from within trap: " + e);
             return null;
         }
     }
     
-    public void perform(Object val) throws JS.Exn {
+    public void perform(Object val) {
         try {
             if (f.getNumFormalArgs() == 0) cascade(val);
             TrapArgs ta = new TrapArgs(this, val);
-            Object ret = f.call(ta);
-            if (ret != Boolean.FALSE && !ta.cascadeHappened) cascade(val);
+            JS.Thread.current().setTailCall(f, ta);
+            // FIXME: re-add autocascades
+            //if (ret != Boolean.FALSE && !ta.cascadeHappened) cascade(val);
         } catch (Exception e) {
             Log.log(this, "Exception thrown from within trap: " + e);
         }
     }
     
     public Object cascade() {
-        if (next != null) return next.perform();
+        if (next != null) { next.perform(); return null; }
         return trapee.get(name, true);
     }