2003/11/13 09:15:12

[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 66b2e72..11f8031 100644 (file)
--- a/src/org/xwt/js/JSFunction.java
+++ b/src/org/xwt/js/JSFunction.java
@@ -112,7 +112,13 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
             case JF: if (!JS.toBoolean(cx.stack.pop())) cx.pc += JS.toNumber(arg).intValue() - 1; break;
             case JMP: cx.pc += JS.toNumber(arg).intValue() - 1; break;
             case POP: cx.stack.pop(); break;
-            case SWAP: { Object o1 = cx.stack.pop(); Object o2 = cx.stack.pop(); cx.stack.push(o1); cx.stack.push(o2); break; }
+            case SWAP: {
+                int depth = (1 + (arg == null ? 1 : toInt(arg)));
+                Object save = cx.stack.elementAt(cx.stack.size() - 1);
+                for(int i=cx.stack.size() - 1; i > cx.stack.size() - depth; i--)
+                    cx.stack.setElementAt(cx.stack.elementAt(i-1), i);
+                cx.stack.setElementAt(save, cx.stack.size() - depth);
+                break; }
             case DUP: cx.stack.push(cx.stack.peek()); break;
             case NEWSCOPE: cx.scope = new JSScope(cx.scope); break;
             case OLDSCOPE: cx.scope = cx.scope.getParentJSScope(); break;
@@ -274,8 +280,8 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
                     cx.stack.push(v);
                 }
                 Object ret = null;
-                if (o == null) throw je("tried to get property \"" + v + "\" from the null value");
                 if (v == null) throw je("tried to get the null key from " + o);
+                if (o == null) throw je("tried to get property \"" + v + "\" from the null value");
                 if (o instanceof String || o instanceof Number || o instanceof Boolean) {
                     ret = Internal.getFromPrimitive(o,v);
                     cx.stack.push(ret);
@@ -309,7 +315,10 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
             }
             
             case CALL: case CALLMETHOD: {
-                int numArgs = JS.toNumber(arg).intValue();
+                int numArgs = JS.toInt(arg);
+                JSArray arguments = null;
+                Object arg0 = null;
+                Object arg1 = null;
                 Object o = cx.stack.pop();
                 if(o == null) throw je("attempted to call null");
                 Object ret;
@@ -318,14 +327,19 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
                     method = o;
                     if (method == null) throw new JS.Exn("cannot call the null method");
                     o = cx.stack.pop();
+                    System.out.println("o == " + o);
+                    System.out.println("method == " + method);
                     if(o instanceof String || o instanceof Number || o instanceof Boolean) {
-                        JSArray arguments = new JSArray();
+                        arguments = new JSArray();
                         for(int j=numArgs - 1; j >= 0; j--) arguments.setElementAt(cx.stack.pop(), j);
-                        ret = Internal.callMethodOnPrimitive(o,method,arguments);
+                        System.out.println(cx.f.dump());
+                        System.out.println(cx.pc);
+                        ret = Internal.callMethodOnPrimitive(o, method, arguments);
                         cx.stack.push(ret);
                         cx.pc += 2;  // skip the GET and CALL
                         break;
                     } else if (o instanceof JSCallable) {
+                        cx.pc += 2;  // skip the GET and CALL
                         // fall through
                     } else {
                         // put the args back on the stack and let the GET followed by CALL happen
@@ -336,7 +350,7 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
 
                 } else if (o instanceof JSFunction) {
                     // FEATURE: use something similar to call0/call1/call2 here
-                    JSArray arguments = new JSArray();
+                    arguments = new JSArray();
                     for(int j=numArgs - 1; j >= 0; j--) arguments.setElementAt(cx.stack.pop(), j);
                     cx.stack.push(new CallMarker(cx));
                     cx.stack.push(arguments);
@@ -346,13 +360,14 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
                     break;
                 }
 
+                if (!(o instanceof JSCallable)) throw new JS.Exn("can't call " + o + " @ " + cx.pc + "\n" + cx.f.dump());
                 JSCallable c = ((JSCallable)o);
                 switch(numArgs) {
                     case 0: ret = c.call0(method); break;
                     case 1: ret = c.call1(method, cx.stack.pop()); break;
-                    case 2: ret = c.call2(method, cx.stack.pop(), cx.stack.pop()); break;
+                    case 2: { Object first = cx.stack.pop(); ret = c.call2(method, cx.stack.pop(), first); break; }
                     default: {
-                        JSArray arguments = new 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 null;   // we were paused
@@ -360,7 +375,6 @@ public class JSFunction extends JSCallable implements ByteCodes, Tokens {
                     }
                 }
                 cx.stack.push(ret);
-                if (method != null) cx.pc += 2;  // skip the GET and CALL if this was a GETCALL
 
                 break;
             }