import java.io.*;
/** a JavaScript function, compiled into bytecode */
-class CompiledFunctionImpl extends JS.Callable implements ByteCodes, Tokens {
+class CompiledFunctionImpl extends JS.Obj implements ByteCodes, Tokens {
// Fields and Accessors ///////////////////////////////////////////////
int numFormalArgs = 0;
/** the source code file that this block was drawn from */
- private String sourceName;
+ String sourceName;
public String getSourceName() throws JS.Exn { return sourceName; }
/** the line numbers */
- private int[] line = new int[10];
+ int[] line = new int[10];
/** the first line of this script */
private int firstLine = -1;
/** the instructions */
- private int[] op = new int[10];
+ int[] op = new int[10];
/** the arguments to the instructions */
- private Object[] arg = new Object[10];
+ Object[] arg = new Object[10];
/** the number of instruction/argument pairs */
- private int size = 0;
+ int size = 0;
int size() { return size; }
/** 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;
+ JS.Scope parentScope;
// Constructors ////////////////////////////////////////////////////////
add(-1, RETURN);
}
- public Object call(JS.Array args) throws JS.Exn { return call(args, new FunctionScope(sourceName, parentScope)); }
- public Object call(JS.Array args, JS.Scope scope) throws JS.Exn {
- JS.Thread cx = JS.Thread.fromJavaThread(java.lang.Thread.currentThread());
- CompiledFunction saved = cx.currentCompiledFunction;
- try {
- cx.currentCompiledFunction = (CompiledFunction)this;
- int size = cx.stack.size();
- cx.stack.push(callMarker);
- cx.stack.push(args);
- eval(scope);
- Object ret = cx.stack.pop();
- if (cx.stack.size() > size)
- // this should never happen
- throw new Error("ERROR: stack grew by " + (cx.stack.size() - size) +
- " elements during call at " + sourceName + ":" + firstLine);
- return ret;
- } catch(Error e) {
- // Unwind the stack
- while(cx.stack.size() > 0) if(cx.stack.pop() instanceof CallMarker) throw e;
- throw new Error("CallMarker not found on the stack"); // should never happen
- } finally {
- cx.currentCompiledFunction = saved;
- }
- }
// Adding and Altering Bytecodes ///////////////////////////////////////////////////
return this;
}
- public int getLine(int pc) {
- if(pc < 0 || pc >= size) return -1;
- return line[pc];
+ public static int getLine(JS.Thread cx) {
+ if(cx.pc < 0 || cx.pc >= ((CompiledFunctionImpl)cx.currentCompiledFunction).size) return -1;
+ return ((CompiledFunctionImpl)cx.currentCompiledFunction).line[cx.pc];
}
// Invoking the Bytecode ///////////////////////////////////////////////////////
-
- 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<size; pc++) {
+
+ /** returns false if the thread has been paused */
+ static void eval(final JS.Thread cx) throws JS.Exn {
+ OUTER: for(; cx.currentCompiledFunction == null || cx.pc<((CompiledFunctionImpl)cx.currentCompiledFunction).size; cx.pc++) {
try {
+ if (cx.paused || cx.currentCompiledFunction == null) return;
+ if (cx.tailCallFunction != null) {
+ cx.stack.pop(); // discard actual return value
+ cx.pc -= 2;
+ cx.stack.push(new CallMarker(cx));
+ cx.stack.push(cx.tailCallArgs);
+ cx.currentCompiledFunction = cx.tailCallFunction;
+ cx.tailCallFunction = null;
+ cx.tailCallArgs = null;
+ cx.scope = new FunctionScope("unknown", cx.currentCompiledFunction.parentScope);
+ cx.pc = 0;
+ }
String label = null;
- cx.pc = lastPC = pc;
- int curOP = op[pc];
- Object curArg = arg[pc];
+ int curOP = cx.currentCompiledFunction.op[cx.pc];
+ Object curArg = cx.currentCompiledFunction.arg[cx.pc];
if(curOP == FINALLY_DONE) {
- FinallyData fd = (FinallyData) t.pop();
+ FinallyData fd = (FinallyData) cx.stack.pop();
if(fd == null) continue OUTER; // NOP
curOP = fd.op;
curArg = fd.arg;
}
switch(curOP) {
- case LITERAL: t.push(arg[pc]); break;
- case OBJECT: t.push(new JS.Obj()); break;
- case ARRAY: t.push(new JS.Array(JS.toNumber(arg[pc]).intValue())); break;
- case DECLARE: s.declare((String)(arg[pc]==null ? t.peek() : arg[pc])); if(arg[pc] != null) t.push(arg[pc]); break;
- case TOPSCOPE: t.push(s); break;
- case JT: if (JS.toBoolean(t.pop())) pc += JS.toNumber(arg[pc]).intValue() - 1; break;
- case JF: if (!JS.toBoolean(t.pop())) pc += JS.toNumber(arg[pc]).intValue() - 1; break;
- case JMP: pc += JS.toNumber(arg[pc]).intValue() - 1; break;
- case POP: t.pop(); break;
- case SWAP: { Object o1 = t.pop(); Object o2 = t.pop(); t.push(o1); t.push(o2); break; }
- case DUP: t.push(t.peek()); break;
- case NEWSCOPE: s = new JS.Scope(s); break;
- case OLDSCOPE: s = s.getParentScope(); break;
- case ASSERT: if (!JS.toBoolean(t.pop())) throw je("assertion failed"); break;
- case BITNOT: t.push(new Long(~JS.toLong(t.pop()))); break;
- case BANG: t.push(new Boolean(!JS.toBoolean(t.pop()))); break;
+ case LITERAL: cx.stack.push(curArg); break;
+ case OBJECT: cx.stack.push(new JS.Obj()); break;
+ case ARRAY: cx.stack.push(new JS.Array(JS.toNumber(curArg).intValue())); break;
+ case DECLARE: cx.scope.declare((String)(curArg==null ? cx.stack.peek() : curArg)); if(curArg != null) cx.stack.push(curArg); break;
+ case TOPSCOPE: cx.stack.push(cx.scope); break;
+ case JT: if (JS.toBoolean(cx.stack.pop())) cx.pc += JS.toNumber(curArg).intValue() - 1; break;
+ case JF: if (!JS.toBoolean(cx.stack.pop())) cx.pc += JS.toNumber(curArg).intValue() - 1; break;
+ case JMP: cx.pc += JS.toNumber(curArg).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 DUP: cx.stack.push(cx.stack.peek()); break;
+ case NEWSCOPE: cx.scope = new JS.Scope(cx.scope); break;
+ case OLDSCOPE: cx.scope = cx.scope.getParentScope(); break;
+ case ASSERT: if (!JS.toBoolean(cx.stack.pop())) throw je("assertion failed"); break;
+ case BITNOT: cx.stack.push(new Long(~JS.toLong(cx.stack.pop()))); break;
+ case BANG: cx.stack.push(new Boolean(!JS.toBoolean(cx.stack.pop()))); break;
case TYPEOF: {
- Object o = t.pop();
- if (o == null) t.push(null);
- else if (o instanceof JS) t.push(((JS)o).typeName());
- else if (o instanceof String) t.push("string");
- else if (o instanceof Number) t.push("number");
- else if (o instanceof Boolean) t.push("boolean");
- else t.push("unknown");
+ Object o = cx.stack.pop();
+ if (o == null) cx.stack.push(null);
+ else if (o instanceof JS) cx.stack.push(((JS)o).typeName());
+ else if (o instanceof String) cx.stack.push("string");
+ else if (o instanceof Number) cx.stack.push("number");
+ else if (o instanceof Boolean) cx.stack.push("boolean");
+ else cx.stack.push("unknown");
break;
}
case NEWFUNCTION: {
try {
- t.push(((CompiledFunctionImpl)arg[pc]).cloneWithNewParentScope(s));
+ cx.stack.push(((CompiledFunctionImpl)curArg).cloneWithNewParentScope(cx.scope));
} catch (IOException e) {
throw new Error("this should never happen");
}
}
case PUSHKEYS: {
- Object o = t.peek();
+ Object o = cx.stack.peek();
Object[] keys = ((JS)o).keys();
JS.Array a = new JS.Array();
a.setSize(keys.length);
for(int j=0; j<keys.length; j++) a.setElementAt(keys[j], j);
- t.push(a);
+ cx.stack.push(a);
break;
}
case LABEL: break;
case LOOP: {
- t.push(new LoopMarker(pc, pc > 0 && op[pc - 1] == LABEL ? (String)arg[pc - 1] : (String)null,s));
- t.push(Boolean.TRUE);
+ cx.stack.push(new LoopMarker(cx.pc, cx.pc > 0 && cx.currentCompiledFunction.op[cx.pc - 1] == LABEL ? (String)cx.currentCompiledFunction.arg[cx.pc - 1] : (String)null, cx.scope));
+ cx.stack.push(Boolean.TRUE);
break;
}
case BREAK:
case CONTINUE:
- while(t.size() > 0) {
- Object o = t.pop();
+ while(cx.stack.size() > 0) {
+ Object o = cx.stack.pop();
if (o instanceof CallMarker) ee("break or continue not within a loop");
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;
+ cx.stack.push(new FinallyData(curOP, curArg));
+ cx.scope = ((TryMarker)o).scope;
+ cx.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 = ((LoopMarker)o).scope;
- if (curOP == CONTINUE) { t.push(o); t.push(Boolean.FALSE); }
- pc = curOP == BREAK ? endOfLoop - 1 : loopInstructionLocation;
+ int endOfLoop = ((Integer)cx.currentCompiledFunction.arg[loopInstructionLocation]).intValue() + loopInstructionLocation;
+ cx.scope = ((LoopMarker)o).scope;
+ if (curOP == CONTINUE) { cx.stack.push(o); cx.stack.push(Boolean.FALSE); }
+ cx.pc = curOP == BREAK ? endOfLoop - 1 : loopInstructionLocation;
continue OUTER;
}
}
}
- throw new Error("CONTINUE/BREAK invoked but couldn't find a LoopMarker at " + sourceName + ":" + getLine(pc));
+ throw new Error("CONTINUE/BREAK invoked but couldn't find a LoopMarker at " + ((CompiledFunctionImpl)cx.currentCompiledFunction).sourceName + ":" + getLine(cx));
case TRY: {
- int[] jmps = (int[]) arg[pc];
+ int[] jmps = (int[]) curArg;
// 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));
+ cx.stack.push(new TryMarker(jmps[0] < 0 ? -1 : cx.pc + jmps[0], jmps[1] < 0 ? -1 : cx.pc + jmps[1], cx.scope));
break;
}
case RETURN: {
- Object retval = t.pop();
- while(t.size() > 0) {
- Object o = t.pop();
+ Object retval = cx.stack.pop();
+ while(cx.stack.size() > 0) {
+ Object o = cx.stack.pop();
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;
+ cx.stack.push(retval);
+ cx.stack.push(new FinallyData(RETURN));
+ cx.scope = ((TryMarker)o).scope;
+ cx.pc = ((TryMarker)o).finallyLoc - 1;
continue OUTER;
}
if (o instanceof CallMarker) {
- t.push(retval);
- return;
+ cx.scope = ((CallMarker)o).scope;
+ cx.pc = ((CallMarker)o).pc;
+ cx.currentCompiledFunction = (CompiledFunction)((CallMarker)o).currentCompiledFunction;
+ cx.stack.push(retval);
+ continue OUTER;
}
}
throw new Error("error: RETURN invoked but couldn't find a CallMarker!");
}
case PUT: {
- Object val = t.pop();
- Object key = t.pop();
- Object target = t.peek();
+ Object val = cx.stack.pop();
+ Object key = cx.stack.pop();
+ Object target = cx.stack.peek();
if (target == null)
throw je("tried to put a value to the " + key + " property on the null value");
if (!(target instanceof JS))
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);
+ cx.stack.push(val);
break;
}
case GET:
case GET_PRESERVE: {
Object o, v;
- if (op[pc] == GET) {
- v = arg[pc] == null ? t.pop() : arg[pc];
- o = t.pop();
+ if (curOP == GET) {
+ v = curArg == null ? cx.stack.pop() : curArg;
+ o = cx.stack.pop();
} else {
- v = t.pop();
- o = t.peek();
- t.push(v);
+ v = cx.stack.pop();
+ o = cx.stack.peek();
+ 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 instanceof String || o instanceof Number || o instanceof Boolean)
ret = Internal.getFromPrimitive(o,v);
- else if (o instanceof JS)
+ else if (o instanceof JS) {
ret = ((JS)o).get(v);
- else
+ } else
throw je("tried to get property " + v + " from a " + o.getClass().getName());
- t.push(ret);
+ cx.stack.push(ret);
break;
}
case CALL:
{
JS.Array arguments = new JS.Array();
- int numArgs = JS.toNumber(arg[pc]).intValue();
+ int numArgs = JS.toNumber(curArg).intValue();
arguments.setSize(numArgs);
- for(int j=numArgs - 1; j >= 0; j--) arguments.setElementAt(t.pop(), j);
- Object o = t.pop();
+ for(int j=numArgs - 1; j >= 0; j--) arguments.setElementAt(cx.stack.pop(), j);
+ Object o = cx.stack.pop();
if(o == null) throw je("attempted to call null");
Object ret;
- if(op[pc] == CALLMETHOD) {
+ if(curOP == CALLMETHOD) {
Object method = o;
- o = t.pop();
- if(o instanceof String || o instanceof Number || o instanceof Boolean)
+ o = cx.stack.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 {
+ cx.stack.push(ret);
+ break;
+ } else if (o instanceof JS) {
+ if (((JS)o).callMethod(method, arguments, true) == Boolean.TRUE) {
+ ret = ((JS)o).callMethod(method,arguments,false);
+ cx.stack.push(ret);
+ break;
+ } else {
+ o = ((JS)o).get(method);
+ }
+ } else {
+ throw new JS.Exn("Tried to call a method on an object that isn't a JS object: " + o);
+ }
+ }
+
+ if (o instanceof CompiledFunctionImpl) {
+ cx.stack.push(new CallMarker(cx));
+ cx.stack.push(arguments);
+ cx.currentCompiledFunction = (CompiledFunction)o;
+ cx.scope = new FunctionScope("unknown", cx.currentCompiledFunction.parentScope);
+ cx.pc = -1;
+ break;
+
+ } else {
ret = ((JS.Callable)o).call(arguments);
}
- t.push(ret);
+ cx.stack.push(ret);
break;
}
// fall through if exception was thrown
case THROW: {
- Object o = t.pop();
+ Object o = cx.stack.pop();
if(o instanceof JS.Exn) throw (JS.Exn)o;
throw new JS.Exn(o);
}
case INC: case DEC: {
- boolean isPrefix = JS.toBoolean(arg[pc]);
- Object key = t.pop();
- JS obj = (JS)t.pop();
+ boolean isPrefix = JS.toBoolean(curArg);
+ Object key = cx.stack.pop();
+ JS obj = (JS)cx.stack.pop();
Number num = JS.toNumber(obj.get(key));
- Number val = new Double(op[pc] == INC ? num.doubleValue() + 1.0 : num.doubleValue() - 1.0);
+ Number val = new Double(curOP == INC ? num.doubleValue() + 1.0 : num.doubleValue() - 1.0);
obj.put(key, val);
- t.push(isPrefix ? val : num);
+ cx.stack.push(isPrefix ? val : num);
break;
}
case ASSIGN_SUB: case ASSIGN_ADD: {
- Object val = t.pop();
- Object old = t.pop();
- Object key = t.pop();
- Object obj = t.peek();
+ Object val = cx.stack.pop();
+ Object old = cx.stack.pop();
+ Object key = cx.stack.pop();
+ Object obj = cx.stack.peek();
if (val instanceof CompiledFunction) {
if (obj instanceof JS.Scope) {
JS.Scope parent = (JS.Scope)obj;
((org.xwt.Box)parent).delTrap(key, val);
}
// skip over the "normal" implementation of +=/-=
- pc += ((Integer)arg[pc]).intValue() - 1;
+ cx.pc += ((Integer)curArg).intValue() - 1;
break;
}
}
}
// use the "normal" implementation
- t.push(key);
- t.push(old);
- t.push(val);
+ cx.stack.push(key);
+ cx.stack.push(old);
+ cx.stack.push(val);
break;
}
case ADD: {
- int count = ((Number)arg[pc]).intValue();
+ int count = ((Number)curArg).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)));
+ Object right = cx.stack.pop();
+ Object left = cx.stack.pop();
+ if(left instanceof String || right instanceof String) cx.stack.push(JS.toString(left).concat(JS.toString(right)));
+ else cx.stack.push(new Double(JS.toDouble(left) + JS.toDouble(right)));
} else {
Object[] args = new Object[count];
- while(--count >= 0) args[count] = t.pop();
+ while(--count >= 0) args[count] = cx.stack.pop();
if(args[0] instanceof String) {
StringBuffer sb = new StringBuffer(64);
for(int i=0;i<args.length;i++) sb.append(JS.toString(args[i]));
- t.push(sb.toString());
+ cx.stack.push(sb.toString());
} else {
int numStrings = 0;
for(int i=0;i<args.length;i++) if(args[i] instanceof String) numStrings++;
if(numStrings == 0) {
double d = 0.0;
for(int i=0;i<args.length;i++) d += JS.toDouble(args[i]);
- t.push(new Double(d));
+ cx.stack.push(new Double(d));
} else {
int i=0;
StringBuffer sb = new StringBuffer(64);
sb.append(JS.toString(new Double(d)));
}
while(i < args.length) sb.append(JS.toString(args[i++]));
- t.push(sb.toString());
+ cx.stack.push(sb.toString());
}
}
}
}
default: {
- Object right = t.pop();
- Object left = t.pop();
- switch(op[pc]) {
+ Object right = cx.stack.pop();
+ Object left = cx.stack.pop();
+ switch(curOP) {
- case BITOR: t.push(new Long(JS.toLong(left) | JS.toLong(right))); break;
- case BITXOR: t.push(new Long(JS.toLong(left) ^ JS.toLong(right))); break;
- case BITAND: t.push(new Long(JS.toLong(left) & JS.toLong(right))); break;
-
- case SUB: t.push(new Double(JS.toDouble(left) - JS.toDouble(right))); break;
- case MUL: t.push(new Double(JS.toDouble(left) * JS.toDouble(right))); break;
- case DIV: t.push(new Double(JS.toDouble(left) / JS.toDouble(right))); break;
- case MOD: t.push(new Double(JS.toDouble(left) % JS.toDouble(right))); break;
+ case BITOR: cx.stack.push(new Long(JS.toLong(left) | JS.toLong(right))); break;
+ case BITXOR: cx.stack.push(new Long(JS.toLong(left) ^ JS.toLong(right))); break;
+ case BITAND: cx.stack.push(new Long(JS.toLong(left) & JS.toLong(right))); break;
+
+ case SUB: cx.stack.push(new Double(JS.toDouble(left) - JS.toDouble(right))); break;
+ case MUL: cx.stack.push(new Double(JS.toDouble(left) * JS.toDouble(right))); break;
+ case DIV: cx.stack.push(new Double(JS.toDouble(left) / JS.toDouble(right))); break;
+ case MOD: cx.stack.push(new Double(JS.toDouble(left) % JS.toDouble(right))); break;
- case LSH: t.push(new Long(JS.toLong(left) << JS.toLong(right))); break;
- case RSH: t.push(new Long(JS.toLong(left) >> JS.toLong(right))); break;
- case URSH: t.push(new Long(JS.toLong(left) >>> JS.toLong(right))); break;
+ case LSH: cx.stack.push(new Long(JS.toLong(left) << JS.toLong(right))); break;
+ case RSH: cx.stack.push(new Long(JS.toLong(left) >> JS.toLong(right))); break;
+ case URSH: cx.stack.push(new Long(JS.toLong(left) >>> JS.toLong(right))); break;
case LT: case LE: case GT: case GE: {
if (left == null) left = new Integer(0);
} else {
result = (int)java.lang.Math.ceil(JS.toDouble(left) - JS.toDouble(right));
}
- t.push(new Boolean((op[pc] == LT && result < 0) || (op[pc] == LE && result <= 0) ||
- (op[pc] == GT && result > 0) || (op[pc] == GE && result >= 0)));
+ cx.stack.push(new Boolean((curOP == LT && result < 0) || (curOP == LE && result <= 0) ||
+ (curOP == GT && result > 0) || (curOP == GE && result >= 0)));
break;
}
else if (l instanceof Number) ret = JS.toNumber(r).doubleValue() == JS.toNumber(l).doubleValue();
else if (l instanceof String) ret = r != null && l.equals(r.toString());
else ret = l.equals(r);
- t.push(new Boolean(op[pc] == EQ ? ret : !ret)); break;
+ cx.stack.push(new Boolean(curOP == EQ ? ret : !ret)); break;
}
- default: throw new Error("unknown opcode " + op[pc]);
+ default: throw new Error("unknown opcode " + curOP);
} }
}
} catch(JS.Exn e) {
- while(t.size() > 0) {
- Object o = t.pop();
+ while(cx.stack.size() > 0) {
+ Object o = cx.stack.pop();
if (o instanceof CatchMarker || o instanceof TryMarker) {
boolean inCatch = o instanceof CatchMarker;
if(inCatch) {
- o = t.pop();
+ o = cx.stack.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(e.getObject());
- s = ((TryMarker)o).scope;
- pc = ((TryMarker)o).catchLoc - 1;
+ cx.stack.push(o);
+ cx.stack.push(catchMarker);
+ cx.stack.push(e.getObject());
+ cx.scope = ((TryMarker)o).scope;
+ cx.pc = ((TryMarker)o).catchLoc - 1;
continue OUTER;
} else {
- t.push(e);
- t.push(new FinallyData(THROW));
- s = ((TryMarker)o).scope;
- pc = ((TryMarker)o).finallyLoc - 1;
+ cx.stack.push(e);
+ cx.stack.push(new FinallyData(THROW));
+ cx.scope = ((TryMarker)o).scope;
+ cx.pc = ((TryMarker)o).finallyLoc - 1;
continue OUTER;
}
}
// no handler found within this func
if(o instanceof CallMarker) throw e;
}
- throw new Error("couldn't find a Try or Call Marker!");
+ throw e;
} // end try/catch
} // end for
// this should never happen, we will ALWAYS have a RETURN at the end of the func
- throw new Error("Just fell out of CompiledFunction::eval() loop. Last PC was " + lastPC);
+ throw new Error("Just fell out of CompiledFunction::eval() loop.");
}
// Debugging //////////////////////////////////////////////////////////////////////
// Exception Stuff ////////////////////////////////////////////////////////////////
static class EvaluatorException extends RuntimeException { public EvaluatorException(String s) { super(s); } }
- EvaluatorException ee(String s) { throw new EvaluatorException(sourceName + ":" + JS.Thread.currentJSThread().getLine() + " " + s); }
- JS.Exn je(String s) { throw new JS.Exn(sourceName + ":" + JS.Thread.currentJSThread().getLine() + " " + s); }
+ static EvaluatorException ee(String s) { throw new EvaluatorException(((CompiledFunctionImpl)(JS.Thread.current()).currentCompiledFunction).sourceName + ":" + JS.Thread.current().getLine() + " " + s); }
+ static JS.Exn je(String s) { throw new JS.Exn(((CompiledFunctionImpl)(JS.Thread.current()).currentCompiledFunction).sourceName + ":" + JS.Thread.current().getLine() + " " + s); }
// FunctionScope /////////////////////////////////////////////////////////////////
- private static class FunctionScope extends JS.Scope {
+ static class FunctionScope extends JS.Scope {
String sourceName;
public FunctionScope(String sourceName, Scope parentScope) { super(parentScope); this.sourceName = sourceName; }
public String getSourceName() { return sourceName; }
// Markers //////////////////////////////////////////////////////////////////////
- public static class CallMarker { public CallMarker() { } }
- private static CallMarker callMarker = new CallMarker();
+ public static class CallMarker {
+ int pc;
+ Scope scope;
+ CompiledFunctionImpl currentCompiledFunction;
+ public CallMarker(JS.Thread cx) { pc = cx.pc + 1; scope = cx.scope; currentCompiledFunction = cx.currentCompiledFunction; }
+ }
public static class CatchMarker { public CatchMarker() { } }
private static CatchMarker catchMarker = new CatchMarker();
projects / org.ibex.core.git / commitdiff