X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fjs%2FCompiledFunctionImpl.java;h=721b0a4bf189fb11dc25be5fbfa6fc16db0bb584;hb=bbf5ef35ca37016d19d92deffc0c992428c3bf6d;hp=9d61a0f60626c84e3dd0580cb66adc0e5dcdcef4;hpb=00a29178bac1ee7725928dc5c7022babf6b454f4;p=org.ibex.core.git diff --git a/src/org/xwt/js/CompiledFunctionImpl.java b/src/org/xwt/js/CompiledFunctionImpl.java index 9d61a0f..721b0a4 100644 --- a/src/org/xwt/js/CompiledFunctionImpl.java +++ b/src/org/xwt/js/CompiledFunctionImpl.java @@ -6,7 +6,7 @@ import java.io.*; // FIXME: could use some cleaning up /** a JavaScript function, compiled into bytecode */ -class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { +class CompiledFunctionImpl extends JSCallable implements ByteCodes, Tokens { // Fields and Accessors /////////////////////////////////////////////// @@ -33,12 +33,16 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { /** the scope in which this function was declared; by default this function is called in a fresh subscope of the parentScope */ private JS.Scope parentScope; - // Constructors //////////////////////////////////////////////////////// private CompiledFunctionImpl cloneWithNewParentScope(JS.Scope s) throws IOException { CompiledFunctionImpl ret = new JS.CompiledFunction(sourceName, firstLine, null, s); - ret.paste(this); + // Reuse the same op, arg, line, and size variables for the new "instance" of the function + // NOTE: Neither *this* function nor the new function should be modified after this call + ret.op = this.op; + ret.arg = this.arg; + ret.line = this.line; + ret.size = this.size; return ret; } @@ -53,7 +57,8 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { p.parseStatement(this, null); if (s == size()) break; } - add(-1, Tokens.RETURN); + add(-1, LITERAL, null); + add(-1, RETURN); } public Object call(JS.Array args) throws JS.Exn { return call(args, new FunctionScope(sourceName, parentScope)); } @@ -63,11 +68,14 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { try { cx.currentCompiledFunction = (CompiledFunction)this; int size = cx.stack.size(); - cx.stack.push(new CallMarker()); + cx.stack.push(callMarker); cx.stack.push(args); eval(scope); Object ret = cx.stack.pop(); - if (cx.stack.size() > size) Log.logJS(this, "warning, stack grew by " + (cx.stack.size() - size) + " elements during call"); + // FIXME: if we catch an exception in Java, JS won't notice and the stack will be messed up + if (cx.stack.size() > size) + // this should never happen + throw new Error("ERROR: stack grew by " + (cx.stack.size() - size) + " elements during call"); return ret; } finally { cx.currentCompiledFunction = saved; @@ -78,8 +86,10 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { // Adding and Altering Bytecodes /////////////////////////////////////////////////// int get(int pos) { return op[pos]; } + Object getArg(int pos) { return arg[pos]; } void set(int pos, int op_, Object arg_) { op[pos] = op_; arg[pos] = arg_; } void set(int pos, Object arg_) { arg[pos] = arg_; } + int pop() { size--; arg[size] = null; return op[size]; } void paste(CompiledFunctionImpl other) { for(int i=0; i= size) return -1; + return line[pc]; + } // Invoking the Bytecode /////////////////////////////////////////////////////// - int pc = 0; void eval(JS.Scope s) { final JS.Thread cx = JS.Thread.fromJavaThread(java.lang.Thread.currentThread()); final Vec t = cx.stack; + int pc; + int lastPC = -1; OUTER: for(pc=0; pc 0 && op[pc - 1] == LABEL ? (String)arg[pc - 1] : (String)null)); + t.push(new LoopMarker(pc, pc > 0 && op[pc - 1] == LABEL ? (String)arg[pc - 1] : (String)null,s)); t.push(Boolean.TRUE); break; } @@ -167,21 +189,31 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { while(t.size() > 0) { Object o = t.pop(); if (o instanceof CallMarker) ee("break or continue not within a loop"); - if (o != null && o instanceof LoopMarker) { - if (arg[pc] == null || arg[pc].equals(((LoopMarker)o).label)) { + if (o instanceof TryMarker) { + if(((TryMarker)o).finallyLoc < 0) continue; // no finally block, keep going + t.push(new FinallyData(curOP, curArg)); + s = ((TryMarker)o).scope; + pc = ((TryMarker)o).finallyLoc - 1; + continue OUTER; + } + if (o instanceof LoopMarker) { + if (curArg == null || curArg.equals(((LoopMarker)o).label)) { int loopInstructionLocation = ((LoopMarker)o).location; int endOfLoop = ((Integer)arg[loopInstructionLocation]).intValue() + loopInstructionLocation; - s = (JS.Scope)t.pop(); - if (op[pc] == CONTINUE) { t.push(s); t.push(o); t.push(Boolean.FALSE); } - pc = op[pc] == BREAK ? endOfLoop - 1 : loopInstructionLocation; + s = ((LoopMarker)o).scope; + if (curOP == CONTINUE) { t.push(o); t.push(Boolean.FALSE); } + pc = curOP == BREAK ? endOfLoop - 1 : loopInstructionLocation; continue OUTER; } } } - throw new Error("CONTINUE/BREAK invoked but couldn't find a LoopMarker at " + sourceName + ":" + line); + throw new Error("CONTINUE/BREAK invoked but couldn't find a LoopMarker at " + sourceName + ":" + getLine(pc)); case TRY: { - t.push(new TryMarker(pc + ((Integer)arg[pc]).intValue(), s)); + int[] jmps = (int[]) arg[pc]; + // jmps[0] is how far away the catch block is, jmps[1] is how far away the finally block is + // each can be < 0 if the specified block does not exist + t.push(new TryMarker(jmps[0] < 0 ? -1 : pc + jmps[0], jmps[1] < 0 ? -1 : pc + jmps[1],s)); break; } @@ -189,7 +221,15 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { Object retval = t.pop(); while(t.size() > 0) { Object o = t.pop(); - if (o != null && o instanceof CallMarker) { + if (o instanceof TryMarker) { + if(((TryMarker)o).finallyLoc < 0) continue; + t.push(retval); + t.push(new FinallyData(RETURN)); + s = ((TryMarker)o).scope; + pc = ((TryMarker)o).finallyLoc - 1; + continue OUTER; + } + if (o instanceof CallMarker) { t.push(retval); return; } @@ -205,6 +245,8 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { throw je("tried to put a value to the " + key + " property on the null value"); if (!(target instanceof JS)) throw je("tried to put a value to the " + key + " property on a " + target.getClass().getName()); + if (key == null) + throw je("tried to assign \"" + (val==null?"(null)":val.toString()) + "\" to the null key"); ((JS)target).put(key, val); t.push(val); break; @@ -214,7 +256,7 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { case GET_PRESERVE: { Object o, v; if (op[pc] == GET) { - v = t.pop(); + v = arg[pc] == null ? t.pop() : arg[pc]; o = t.pop(); } else { v = t.pop(); @@ -223,29 +265,41 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { } 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 " + v); - if (o instanceof String) { - ret = getFromString((String)o, v); - } else if (o instanceof Boolean) { - throw je("Not Implemented: properties on Boolean objects"); - } else if (o instanceof Number) { - Log.log(this, "Not Implemented: properties on Number objects"); - } else if (o instanceof JS) { + if (v == null) throw je("tried to get the null key from " + o); + if (o instanceof String || o instanceof Number || o instanceof Boolean) + ret = Internal.getFromPrimitive(o,v); + else if (o instanceof JS) ret = ((JS)o).get(v); - } + else + throw je("tried to get property " + v + " from a " + o.getClass().getName()); t.push(ret); break; } - - case CALL: { + + case CALLMETHOD: + case CALL: + { JS.Array arguments = new JS.Array(); int numArgs = JS.toNumber(arg[pc]).intValue(); arguments.setSize(numArgs); for(int j=numArgs - 1; j >= 0; j--) arguments.setElementAt(t.pop(), j); - JS.Callable f = (JS.Callable)t.pop(); - if (f == null) throw je("attempted to call null"); + Object o = t.pop(); + if(o == null) throw je("attempted to call null"); try { - t.push(f.call(arguments)); + Object ret; + if(op[pc] == CALLMETHOD) { + Object method = o; + o = t.pop(); + if(o instanceof String || o instanceof Number || o instanceof Boolean) + ret = Internal.callMethodOnPrimitive(o,method,arguments); + else if(o instanceof JS) + ret = ((JS)o).callMethod(method,arguments,false); + else + throw new JS.Exn("Tried to call a method on an object that isn't a JS object"); + } else { + ret = ((JS.Callable)o).call(arguments); + } + t.push(ret); break; } catch (JS.Exn e) { t.push(e); @@ -256,14 +310,37 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { Object exn = t.pop(); while(t.size() > 0) { Object o = t.pop(); - if (o instanceof TryMarker) { - t.push(exn); - pc = ((TryMarker)o).location - 1; - s = ((TryMarker)o).scope; - continue OUTER; + if (o instanceof CatchMarker || o instanceof TryMarker) { + boolean inCatch = o instanceof CatchMarker; + if(inCatch) { + o = t.pop(); + if(((TryMarker)o).finallyLoc < 0) continue; // no finally block, keep going + } + if(!inCatch && ((TryMarker)o).catchLoc >= 0) { + // run the catch block, this will implicitly run the finally block, if it exists + t.push(o); + t.push(catchMarker); + t.push((exn instanceof JS.Exn) ? ((JS.Exn)exn).getObject() : exn); + s = ((TryMarker)o).scope; + pc = ((TryMarker)o).catchLoc - 1; + continue OUTER; + } else { + t.push(exn); + t.push(new FinallyData(THROW)); + s = ((TryMarker)o).scope; + pc = ((TryMarker)o).finallyLoc - 1; + continue OUTER; + } + } + // no handler found within this func + if(o instanceof CallMarker) { + if(exn instanceof JS.Exn) + throw (JS.Exn)exn; + else + throw new JS.Exn(exn); } } - throw new JS.Exn(exn); + throw new Error("error: THROW invoked but couldn't find a Try or Call Marker!"); } case INC: case DEC: { @@ -276,26 +353,51 @@ class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens { t.push(isPrefix ? val : num); break; } + + + case ADD: { + int count = ((Number)arg[pc]).intValue(); + if(count < 2) throw new Error("this should never happen"); + if(count == 2) { + // common case + Object right = t.pop(); + Object left = t.pop(); + if(left instanceof String || right instanceof String) t.push(JS.toString(left).concat(JS.toString(right))); + else t.push(new Double(JS.toDouble(left) + JS.toDouble(right))); + break; + } + Object[] args = new Object[count]; + while(--count >= 0) args[count] = t.pop(); + if(args[0] instanceof String) { + StringBuffer sb = new StringBuffer(64); + for(int i=0;i