Object key = stack.pop();
Object obj = stack.peek();
// A trap addition/removal
- JS js = obj instanceof JSScope ? ((JSScope)obj).top() : (JS) obj;
+ JS js = (JS) obj;
+ if(js instanceof JSScope) {
+ JSScope s = (JSScope) js;
+ while(s.getParentScope() != null) {
+ if(s.has(key)) throw new JSExn("cannot trap a variable that isn't at the top level scope");
+ s = s.getParentScope();
+ }
+ js = s;
+ }
+ // might want this?
+ // if(!js.has(key)) throw new JSExn("tried to add/remove a trap from an uninitialized variable");
if(op == ADD_TRAP) js.addTrap(key, (JSFunction)val);
else js.delTrap(key, (JSFunction)val);
break;
if (right == null) right = JS.N(0);
int result = 0;
if (left instanceof String || right instanceof String) {
- result = left.toString().compareTo(right.toString());
+ result = JS.toString(left).compareTo(JS.toString(right));
} else {
result = (int)java.lang.Math.ceil(JS.toDouble(left) - JS.toDouble(right));
}
case EQ:
case NE: {
+ // FIXME: This is not correct, see ECMA-262 11.9.3
Object l = left;
Object r = right;
boolean ret;
else if (r == null) ret = false; // l != null, so its false
else if (l instanceof Boolean) ret = JS.B(JS.toBoolean(r)).equals(l);
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 if (l instanceof String) ret = r != null && l.equals(JS.toString(r));
else ret = l.equals(r);
stack.push(JS.B(op == EQ ? ret : !ret)); break;
}
return sb.toString();
}
case "indexOf": {
- String search = alength >= 1 ? arg0.toString() : "null";
+ String search = alength >= 1 ? JS.toString(arg0) : "null";
int start = alength >= 2 ? JS.toInt(arg1) : 0;
// Java's indexOf handles an out of bounds start index, it'll return -1
return JS.N(s.indexOf(search,start));
}
case "lastIndexOf": {
- String search = alength >= 1 ? arg0.toString() : "null";
+ String search = alength >= 1 ? JS.toString(arg0) : "null";
int start = alength >= 2 ? JS.toInt(arg1) : 0;
// Java's indexOf handles an out of bounds start index, it'll return -1
return JS.N(s.lastIndexOf(search,start));
}
if (!returnJS) {
// the string stuff applies to everything
- String s = o.toString();
+ String s = JS.toString(o);
// this is sort of ugly, but this list should never change
// These should provide a complete (enough) implementation of the ECMA-262 String object
}
if (returnJS) {
final Object target = o;
- final String method = key.toString();
+ final String method = JS.toString(o);
return new JS() {
public Object call(Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
if (nargs > 2) throw new JSExn("cannot call that method with that many arguments");