2003/11/13 07:46:41

[org.ibex.core.git] / src / org / xwt / js / JSFunction.java

diff --git a/src/org/xwt/js/JSFunction.java b/src/org/xwt/js/JSFunction.java
index 1d068e9..66b2e72 100644 (file)
--- a/src/org/xwt/js/JSFunction.java
+++ b/src/org/xwt/js/JSFunction.java
@@ -2,6 +2,7 @@
 package org.xwt.js;
 
 import org.xwt.util.*;
+import java.util.*;
 import java.io.*;
 
 /** A JavaScript function, compiled into bytecode */
@@ -9,7 +10,7 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
 
     /** Note: code gets run in an <i>unpauseable</i> context. */
     public Object call(JSArray args) {
-        Context cx = new JSContext(this, false);
+        JSContext cx = new JSContext(this, false);
         cx.invoke(args);
         return cx.stack.pop();
     }
@@ -89,7 +90,7 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
 
     /** returns false if the thread has been paused */
     static Object eval(final JSContext cx) throws JS.Exn {
-        final initialPauseCount = cx.pausecount;
+        final int initialPauseCount = cx.pausecount;
         OUTER: for(;; cx.pc++) {
         try {
             if (cx.f == null || cx.pc >= cx.f.size) return cx.stack.pop();
@@ -193,22 +194,22 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
                         cx.pc = ((TryMarker)o).finallyLoc - 1;
                         continue OUTER;
                     } else if (o instanceof CallMarker) {
-                        if (cx.scope instanceof JSTrapScope) {
-                            JSTrapScope ts = (JSTrapScope)cx.scope;
+                        if (cx.scope instanceof JSTrap.JSTrapScope) {
+                            JSTrap.JSTrapScope ts = (JSTrap.JSTrapScope)cx.scope;
                             if (!ts.cascadeHappened) {
                                 ts.cascadeHappened = true;
                                 JSTrap t = ts.t.next;
                                 while (t != null && t.f.numFormalArgs == 0) t = t.next;
                                 if (t == null) {
-                                    ts.trappee.put(key, val);
-                                    if (cx.pausecount > initialPauseCount) return;   // we were paused
+                                    ((JS)ts.t.trapee).put(t.name, ts.val);
+                                    if (cx.pausecount > initialPauseCount) return null;   // we were paused
                                 } else {
                                     cx.stack.push(o);
                                     JSArray args = new JSArray();
                                     args.addElement(ts.val);
-                                    cx.stack.push(ta);
+                                    cx.stack.push(args);
                                     cx.f = t.f;
-                                    cx.scope = new JSTrap.JSTrapScope(cx.f.parentJSScope, ts.val);
+                                    cx.scope = new JSTrap.JSTrapScope(cx.f.parentJSScope, t, ts.val);
                                     cx.pc = -1;
                                     break;
                                 }
@@ -235,28 +236,28 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
                 if (key == null)
                     throw je("tried to assign \"" + (val==null?"(null)":val.toString()) + "\" to the null key");
                 JSTrap t = null;
-                if (o instanceof JSTrap.JSTrappable) {
-                    t = ((JSTrap.JSTrappable)o).getTrap(v);
+                if (target instanceof JSTrap.JSTrappable) {
+                    t = ((JSTrap.JSTrappable)target).getTrap(val);
                     while (t != null && t.f.numFormalArgs == 0) t = t.next;
-                } else if (o instanceof JSTrap.JSTrapScope && key.equals("cascade")) {
-                    JSTrap.JSTrapScope ts = (JSTrap.JSTrapScope)o;
+                } else if (target instanceof JSTrap.JSTrapScope && key.equals("cascade")) {
+                    JSTrap.JSTrapScope ts = (JSTrap.JSTrapScope)target;
                     t = ts.t.next;
                     ts.cascadeHappened = true;
                     while (t != null && t.f.numFormalArgs == 0) t = t.next;
-                    if (t == null) o = ts.t.trappee;
+                    if (t == null) target = ts.t.trapee;
                 }
                 if (t != null) {
                     cx.stack.push(new CallMarker(cx));
                     JSArray args = new JSArray();
                     args.addElement(val);
-                    cx.stack.push(ta);
+                    cx.stack.push(args);
                     cx.f = t.f;
-                    cx.scope = new JSTrap.JSTrapScope(cx.f.parentJSScope, val);
+                    cx.scope = new JSTrap.JSTrapScope(cx.f.parentJSScope, t, val);
                     cx.pc = -1;
                     break;
                 }
                 ((JS)target).put(key, val);
-                if (cx.pausecount > initialPauseCount) return;   // we were paused
+                if (cx.pausecount > initialPauseCount) return null;   // we were paused
                 cx.stack.push(val);
                 break;
             }
@@ -284,23 +285,23 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
                     if (o instanceof JSTrap.JSTrappable) {
                         t = ((JSTrap.JSTrappable)o).getTrap(v);
                         while (t != null && t.f.numFormalArgs != 0) t = t.next;
-                    } else if (o instanceof JSTrap.JSTrapScope && key.equals("cascade")) {
+                    } else if (o instanceof JSTrap.JSTrapScope && v.equals("cascade")) {
                         t = ((JSTrap.JSTrapScope)o).t.next;
                         while (t != null && t.f.numFormalArgs != 0) t = t.next;
-                        if (t == null) o = ((JSTrap.JSTrapScope)o).t.trappee;
+                        if (t == null) o = ((JSTrap.JSTrapScope)o).t.trapee;
                     }
                     if (t != null) {
                         cx.stack.push(new CallMarker(cx));
                         JSArray args = new JSArray();
-                        cx.stack.push(ta);
+                        cx.stack.push(args);
                         cx.f = t.f;
-                        cx.scope = new JSTrap.JSTrapScope(cx.f.parentJSScope, null);
+                        cx.scope = new JSTrap.JSTrapScope(cx.f.parentJSScope, t, null);
                         ((JSTrap.JSTrapScope)cx.scope).cascadeHappened = true;
                         cx.pc = -1;
                         break;
                     }
                     ret = ((JS)o).get(v);
-                    if (cx.pausecount > initialPauseCount) return;   // we were paused
+                    if (cx.pausecount > initialPauseCount) return null;   // we were paused
                     cx.stack.push(ret);
                     break;
                 }
@@ -354,7 +355,7 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
                         JSArray arguments = new JSArray();
                         for(int j=numArgs - 1; j >= 0; j--) arguments.setElementAt(cx.stack.pop(), j);
                         ret = c.call(method, arguments);
-                        if (cx.pausecount > initialPauseCount) return;   // we were paused
+                        if (cx.pausecount > initialPauseCount) return null;   // we were paused
                         break;
                     }
                 }