X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fibex%2Fjs%2FJSFunction.java;h=71da16250ce8664a7a71f57ba9228da668782e9b;hp=40a550dab55bcb51a6d9b789a29d76f51823e283;hb=a19b897271a8ab6b25aba63e4b30223c2477c28d;hpb=64b8c4b435a4457e342fd03fc4a725d5ea16da36

diff --git a/src/org/ibex/js/JSFunction.java b/src/org/ibex/js/JSFunction.java
index 40a550d..71da162 100644
--- a/src/org/ibex/js/JSFunction.java
+++ b/src/org/ibex/js/JSFunction.java
@@ -28,7 +28,7 @@ class JSFunction extends JS implements ByteCodes, Tokens, Task {
     // FEATURE: make sure that this can only be called from the Scheduler...
     /** if you enqueue a function, it gets invoked in its own pauseable context */
     public void perform() throws JSExn {
-        Interpreter i = new Interpreter(this, true, new JSArray());
+        Interpreter i = new Interpreter(this, true, new Interpreter.JSArgs(this));
         i.resume();
     }
 
@@ -60,13 +60,8 @@ class JSFunction extends JS implements ByteCodes, Tokens, Task {
     }
 
     /** Note: code gets run in an <i>unpauseable</i> context. */
-    public Object call(Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
-        JSArray args = new JSArray();
-        if (nargs > 0) args.addElement(a0);
-        if (nargs > 1) args.addElement(a1);
-        if (nargs > 2) args.addElement(a2);
-        for(int i=3; i<nargs; i++) args.addElement(rest[i-3]);
-        Interpreter cx = new Interpreter(this, false, args);
+    public JS call(JS a0, JS a1, JS a2, JS[] rest, int nargs) throws JSExn {
+        Interpreter cx = new Interpreter(this, false, new Interpreter.JSArgs(a0,a1,a2,rest,nargs,this));
         return cx.resume();
     }
 
@@ -103,7 +98,7 @@ class JSFunction extends JS implements ByteCodes, Tokens, Task {
 
     // Debugging //////////////////////////////////////////////////////////////////////
 
-    public String toString() { return "JSFunction [" + sourceName + ":" + firstLine + "]"; }
+    String extendedToString() { return "[" + sourceName + ":" + firstLine + "]"; }
 
     String dump() { return dump(""); }
     private  String dump(String prefix) {
@@ -115,7 +110,7 @@ class JSFunction extends JS implements ByteCodes, Tokens, Task {
             if (op[i] < 0) sb.append(bytecodeToString[-op[i]]);
             else sb.append(codeToString[op[i]]);
             sb.append(" ");
-            sb.append(arg[i] == null ? "(no arg)" : arg[i]);
+            sb.append(arg[i] == null ? "(no arg)" : arg[i] instanceof JS ? JS.debugToString((JS)arg[i]) : arg[i]);
             if((op[i] == JF || op[i] == JT || op[i] == JMP) && arg[i] != null && arg[i] instanceof Number) {
                 sb.append(" jump to ").append(i+((Number) arg[i]).intValue());
             } else  if(op[i] == TRY) {