From: megacz Date: Fri, 30 Jan 2004 07:43:40 +0000 (+0000) Subject: 2003/12/29 04:04:35 X-Git-Tag: RC3~220 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=32fa4185423afaf8700228f7864d062ded5ca8e8 2003/12/29 04:04:35 darcs-hash:20040130074340-2ba56-9ea8f4ab053ccaa00a989b666a1cb26127084364.gz --- diff --git a/src/org/xwt/js/Interpreter.java b/src/org/xwt/js/Interpreter.java index 6d3cdb5..a471412 100644 --- a/src/org/xwt/js/Interpreter.java +++ b/src/org/xwt/js/Interpreter.java @@ -83,7 +83,7 @@ class Interpreter implements ByteCodes, Tokens { case DUP: stack.push(stack.peek()); break; case NEWSCOPE: scope = new JSScope(scope); break; case OLDSCOPE: scope = scope.getParentScope(); break; - case ASSERT: if (!JS.toBoolean(stack.pop())) throw je("assertion failed"); break; + case ASSERT: if (!JS.toBoolean(stack.pop())) throw je("xwt.assertion.failed" /*FEATURE: line number*/); break; case BITNOT: stack.push(JS.N(~JS.toLong(stack.pop()))); break; case BANG: stack.push(JS.B(!JS.toBoolean(stack.pop()))); break; case NEWFUNCTION: stack.push(((JSFunction)arg).cloneWithNewParentScope(scope)); break; diff --git a/src/org/xwt/js/Lexer.java b/src/org/xwt/js/Lexer.java index e0ecde9..6e541c1 100644 --- a/src/org/xwt/js/Lexer.java +++ b/src/org/xwt/js/Lexer.java @@ -80,6 +80,8 @@ class Lexer implements Tokens { private int getKeyword(String name) throws IOException { //#switch(name) case "if": return IF; + case "lt": return LT; + case "gt": return GT; case "in": return IN; case "do": return DO; case "and": return AND;