X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fjs%2FParser.java;h=0583202e6a3759e24715c629d24aff969114c923;hb=87c3b60d5ad529a02a85aaa184ac98779b967463;hp=5e3759657f15c064624b416b034a2359ba7f7b41;hpb=55ba92deb32e860a485d544479850e98288cee43;p=org.ibex.core.git
diff --git a/src/org/xwt/js/Parser.java b/src/org/xwt/js/Parser.java
index 5e37596..0583202 100644
--- a/src/org/xwt/js/Parser.java
+++ b/src/org/xwt/js/Parser.java
@@ -5,7 +5,7 @@ import org.xwt.util.*;
import java.io.*;
/**
- * Parses a stream of lexed tokens into a tree of Function's.
+ * Parses a stream of lexed tokens into a tree of JSFunction's.
*
* There are three kinds of things we parse: blocks, statements, and
* expressions.
@@ -73,7 +73,7 @@ class Parser extends Lexer implements ByteCodes {
/** for debugging */
public static void main(String[] s) throws Exception {
- Function block = new Function("stdin", 0, new InputStreamReader(System.in), null);
+ JSFunction block = JSFunction.fromReader("stdin", 0, new InputStreamReader(System.in));
if (block == null) return;
System.out.println(block);
}
@@ -133,7 +133,16 @@ class Parser extends Lexer implements ByteCodes {
/** gets a token and throws an exception if it is not code */
private void consume(int code) throws IOException {
- if (getToken() != code) throw pe("expected " + codeToString[code] + ", got " + (op == -1 ? "EOF" : codeToString[op]));
+ if (getToken() != code) {
+ if(code == NAME) switch(op) {
+ case RETURN: case TYPEOF: case BREAK: case CONTINUE: case TRY: case THROW:
+ case ASSERT: case NULL: case TRUE: case FALSE: case IN: case IF: case ELSE:
+ case SWITCH: case CASE: case DEFAULT: case WHILE: case VAR: case WITH:
+ case CATCH: case FINALLY:
+ throw pe("Bad variable name; '" + codeToString[op].toLowerCase() + "' is a javascript keyword");
+ }
+ throw pe("expected " + codeToString[code] + ", got " + (op == -1 ? "EOF" : codeToString[op]));
+ }
}
/**
@@ -142,14 +151,14 @@ class Parser extends Lexer implements ByteCodes {
* bytecodes for that expression to appendTo; the
* appended bytecodes MUST grow the stack by exactly one element.
*/
- private void startExpr(Function appendTo, int minPrecedence) throws IOException {
+ private void startExpr(JSFunction appendTo, int minPrecedence) throws IOException {
int saveParserLine = parserLine;
_startExpr(appendTo, minPrecedence);
parserLine = saveParserLine;
}
- private void _startExpr(Function appendTo, int minPrecedence) throws IOException {
+ private void _startExpr(JSFunction appendTo, int minPrecedence) throws IOException {
int tok = getToken();
- Function b = appendTo;
+ JSFunction b = appendTo;
switch (tok) {
case -1: throw pe("expected expression");
@@ -158,16 +167,28 @@ class Parser extends Lexer implements ByteCodes {
case NUMBER: b.add(parserLine, LITERAL, number); break;
case STRING: b.add(parserLine, LITERAL, string); break;
case NULL: b.add(parserLine, LITERAL, null); break;
- case TRUE: case FALSE: b.add(parserLine, LITERAL, new Boolean(tok == TRUE)); break;
+ case TRUE: case FALSE: b.add(parserLine, LITERAL, JS.B(tok == TRUE)); break;
+
+ // (.foo) syntax
+ case DOT: {
+ consume(NAME);
+ b.add(parserLine, TOPSCOPE);
+ b.add(parserLine, LITERAL, "");
+ b.add(parserLine, GET);
+ b.add(parserLine, LITERAL, string);
+ b.add(parserLine, GET);
+ continueExpr(b, minPrecedence);
+ break;
+ }
case LB: {
- b.add(parserLine, ARRAY, new Integer(0)); // push an array onto the stack
+ b.add(parserLine, ARRAY, JS.ZERO); // push an array onto the stack
int size0 = b.size;
int i = 0;
if (peekToken() != RB)
while(true) { // iterate over the initialization values
int size = b.size;
- b.add(parserLine, LITERAL, new Integer(i++)); // push the index in the array to place it into
+ b.add(parserLine, LITERAL, JS.N(i++)); // push the index in the array to place it into
if (peekToken() == COMMA || peekToken() == RB)
b.add(parserLine, LITERAL, null); // for stuff like [1,,2,]
else
@@ -177,13 +198,13 @@ class Parser extends Lexer implements ByteCodes {
if (peekToken() == RB) break;
consume(COMMA);
}
- b.set(size0 - 1, new Integer(i)); // back at the ARRAY instruction, write the size of the array
+ b.set(size0 - 1, JS.N(i)); // back at the ARRAY instruction, write the size of the array
consume(RB);
break;
}
case SUB: { // negative literal (like "3 * -1")
consume(NUMBER);
- b.add(parserLine, LITERAL, new Double(number.doubleValue() * -1));
+ b.add(parserLine, LITERAL, JS.N(number.doubleValue() * -1));
break;
}
case LP: { // grouping (not calling)
@@ -200,7 +221,12 @@ class Parser extends Lexer implements ByteCodes {
b.pop();
else
throw pe("prefixed increment/decrement can only be performed on a valid assignment target");
- b.add(parserLine, tok, Boolean.TRUE);
+ b.add(parserLine, GET_PRESERVE, Boolean.TRUE);
+ b.add(parserLine, LITERAL, JS.N(1));
+ b.add(parserLine, tok == INC ? ADD : SUB, JS.N(2));
+ b.add(parserLine, PUT, null);
+ b.add(parserLine, SWAP, null);
+ b.add(parserLine, POP, null);
break;
}
case BANG: case BITNOT: case TYPEOF: {
@@ -236,7 +262,7 @@ class Parser extends Lexer implements ByteCodes {
case FUNCTION: {
consume(LP);
int numArgs = 0;
- Function b2 = new Function(sourceName, parserLine, null, null);
+ JSFunction b2 = new JSFunction(sourceName, parserLine, null);
b.add(parserLine, NEWFUNCTION, b2);
// function prelude; arguments array is already on the stack
@@ -253,7 +279,7 @@ class Parser extends Lexer implements ByteCodes {
String varName = string;
b2.add(parserLine, DUP); // dup the args array
- b2.add(parserLine, GET, new Integer(numArgs - 1)); // retrieve it from the arguments array
+ b2.add(parserLine, GET, JS.N(numArgs - 1)); // retrieve it from the arguments array
b2.add(parserLine, TOPSCOPE);
b2.add(parserLine, SWAP);
b2.add(parserLine, DECLARE, varName); // declare the name
@@ -272,7 +298,7 @@ class Parser extends Lexer implements ByteCodes {
b2.add(parserLine, POP); // pop off TOPSCOPE
if(peekToken() != LC)
- throw pe("Functions must have a block surrounded by curly brackets");
+ throw pe("JSFunctions must have a block surrounded by curly brackets");
parseBlock(b2, null); // the function body
@@ -288,6 +314,36 @@ class Parser extends Lexer implements ByteCodes {
continueExpr(b, minPrecedence);
}
+ private Grammar parseGrammar(Grammar g) throws IOException {
+ int tok = getToken();
+ if (g != null)
+ switch(tok) {
+ case BITOR: return new Grammar.Alternative(g, parseGrammar(null));
+ case ADD: return parseGrammar(new Grammar.Repetition(g, 1, Integer.MAX_VALUE));
+ case MUL: return parseGrammar(new Grammar.Repetition(g, 0, Integer.MAX_VALUE));
+ case HOOK: return parseGrammar(new Grammar.Repetition(g, 0, 1));
+ }
+ Grammar g0 = null;
+ switch(tok) {
+ //case NUMBER: g0 = new Grammar.Literal(number); break;
+ case NAME: g0 = new Grammar.Reference(string); break;
+ case STRING:
+ g0 = new Grammar.Literal(string);
+ if (peekToken() == DOT) {
+ String old = string;
+ consume(DOT);
+ consume(DOT);
+ consume(STRING);
+ if (old.length() != 1 || string.length() != 1) throw pe("literal ranges must be single-char strings");
+ g0 = new Grammar.Range(old.charAt(0), string.charAt(0));
+ }
+ break;
+ case LP: g0 = parseGrammar(null); consume(RP); break;
+ default: pushBackToken(); return g;
+ }
+ if (g == null) return parseGrammar(g0);
+ return parseGrammar(new Grammar.Juxtaposition(g, g0));
+ }
/**
* Assuming that a complete assignable (lvalue) has just been
@@ -296,36 +352,64 @@ class Parser extends Lexer implements ByteCodes {
* expression that modifies the assignable. This method always
* decreases the stack depth by exactly one element.
*/
- private void continueExprAfterAssignable(Function b,int minPrecedence) throws IOException {
+ private void continueExprAfterAssignable(JSFunction b,int minPrecedence) throws IOException {
int saveParserLine = parserLine;
_continueExprAfterAssignable(b,minPrecedence);
parserLine = saveParserLine;
}
- private void _continueExprAfterAssignable(Function b,int minPrecedence) throws IOException {
+ private void _continueExprAfterAssignable(JSFunction b,int minPrecedence) throws IOException {
if (b == null) throw new Error("got null b; this should never happen");
int tok = getToken();
if (minPrecedence != -1 && (precedence[tok] < minPrecedence || (precedence[tok] == minPrecedence && !isRightAssociative[tok])))
// force the default case
tok = -1;
switch(tok) {
+
+ case GRAMMAR: {
+ b.add(parserLine, GET_PRESERVE);
+ Grammar g = parseGrammar(null);
+ if (peekToken() == LC) {
+ g.action = new JSFunction(sourceName, parserLine, null);
+ parseBlock(g.action);
+ g.action.add(parserLine, LITERAL, null); // in case we "fall out the bottom", return NULL
+ g.action.add(parserLine, RETURN);
+ }
+ b.add(parserLine, MAKE_GRAMMAR, g);
+ b.add(parserLine, PUT);
+ break;
+ }
+
case ASSIGN_BITOR: case ASSIGN_BITXOR: case ASSIGN_BITAND: case ASSIGN_LSH: case ASSIGN_RSH: case ASSIGN_URSH:
case ASSIGN_MUL: case ASSIGN_DIV: case ASSIGN_MOD: case ASSIGN_ADD: case ASSIGN_SUB: {
- b.add(parserLine, GET_PRESERVE);
+ if (tok != ASSIGN_ADD && tok != ASSIGN_SUB) b.add(parserLine, GET_PRESERVE);
+
startExpr(b, precedence[tok]);
+
int size = b.size;
if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) {
b.add(parserLine, tok);
+ b.add(parserLine, GET);
+ b.add(parserLine, SWAP);
}
+
// tok-1 is always s/^ASSIGN_// (0 is BITOR, 1 is ASSIGN_BITOR, etc)
- b.add(parserLine, tok - 1, tok-1==ADD ? new Integer(2) : null);
+ b.add(parserLine, tok - 1, tok-1==ADD ? JS.N(2) : null);
b.add(parserLine, PUT);
b.add(parserLine, SWAP);
b.add(parserLine, POP);
- if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) b.set(size, tok, new Integer(b.size - size));
+
+ if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) b.set(size, tok, JS.N(b.size - size));
break;
}
case INC: case DEC: { // postfix
- b.add(parserLine, tok, Boolean.FALSE);
+ b.add(parserLine, GET_PRESERVE, Boolean.TRUE);
+ b.add(parserLine, LITERAL, JS.N(1));
+ b.add(parserLine, tok == INC ? ADD : SUB, JS.N(2));
+ b.add(parserLine, PUT, null);
+ b.add(parserLine, SWAP, null);
+ b.add(parserLine, POP, null);
+ b.add(parserLine, LITERAL, JS.N(1));
+ b.add(parserLine, tok == INC ? SUB : ADD, null); // undo what we just did, since this is postfix
break;
}
case ASSIGN: {
@@ -336,12 +420,13 @@ class Parser extends Lexer implements ByteCodes {
break;
}
case LP: {
- int n = parseArgs(b);
- // if the object supports GETCALL, we use this, and jump over the following two instructions
- b.add(parserLine,CALLMETHOD,new Integer(n));
- b.add(parserLine,GET);
- b.add(parserLine,CALL_REVERSED,new Integer(n));
+ // Method calls are implemented by doing a GET_PRESERVE
+ // first. If the object supports method calls, it will
+ // return JS.METHOD
+ int n = parseArgs(b, 2);
+ b.add(parserLine, GET_PRESERVE);
+ b.add(parserLine, CALLMETHOD, JS.N(n));
break;
}
default: {
@@ -367,12 +452,12 @@ class Parser extends Lexer implements ByteCodes {
* If any bytecodes are appended, they will not alter the stack
* depth.
*/
- private void continueExpr(Function b, int minPrecedence) throws IOException {
+ private void continueExpr(JSFunction b, int minPrecedence) throws IOException {
int saveParserLine = parserLine;
_continueExpr(b, minPrecedence);
parserLine = saveParserLine;
}
- private void _continueExpr(Function b, int minPrecedence) throws IOException {
+ private void _continueExpr(JSFunction b, int minPrecedence) throws IOException {
if (b == null) throw new Error("got null b; this should never happen");
int tok = getToken();
if (tok == -1) return;
@@ -383,8 +468,8 @@ class Parser extends Lexer implements ByteCodes {
switch (tok) {
case LP: { // invocation (not grouping)
- int n = parseArgs(b);
- b.add(parserLine, CALL, new Integer(n));
+ int n = parseArgs(b, 1);
+ b.add(parserLine, CALL, JS.N(n));
break;
}
case BITOR: case BITXOR: case BITAND: case SHEQ: case SHNE: case LSH:
@@ -403,17 +488,17 @@ class Parser extends Lexer implements ByteCodes {
nextTok = getToken();
} while(nextTok == tok);
pushBackToken();
- b.add(parserLine, tok, new Integer(count));
+ b.add(parserLine, tok, JS.N(count));
break;
}
case OR: case AND: {
- b.add(parserLine, tok == AND ? b.JF : b.JT, new Integer(0)); // test to see if we can short-circuit
+ b.add(parserLine, tok == AND ? b.JF : b.JT, JS.ZERO); // test to see if we can short-circuit
int size = b.size;
startExpr(b, precedence[tok]); // otherwise check the second value
- b.add(parserLine, JMP, new Integer(2)); // leave the second value on the stack and jump to the end
+ b.add(parserLine, JMP, JS.N(2)); // leave the second value on the stack and jump to the end
b.add(parserLine, LITERAL, tok == AND ?
- new Boolean(false) : new Boolean(true)); // target of the short-circuit jump is here
- b.set(size - 1, new Integer(b.size - size)); // write the target of the short-circuit jump
+ JS.B(false) : JS.B(true)); // target of the short-circuit jump is here
+ b.set(size - 1, JS.N(b.size - size)); // write the target of the short-circuit jump
break;
}
case DOT: {
@@ -434,15 +519,15 @@ class Parser extends Lexer implements ByteCodes {
break;
}
case HOOK: {
- b.add(parserLine, JF, new Integer(0)); // jump to the if-false expression
+ b.add(parserLine, JF, JS.ZERO); // jump to the if-false expression
int size = b.size;
startExpr(b, minPrecedence); // write the if-true expression
- b.add(parserLine, JMP, new Integer(0)); // if true, jump *over* the if-false expression
- b.set(size - 1, new Integer(b.size - size + 1)); // now we know where the target of the jump is
+ b.add(parserLine, JMP, JS.ZERO); // if true, jump *over* the if-false expression
+ b.set(size - 1, JS.N(b.size - size + 1)); // now we know where the target of the jump is
consume(COLON);
size = b.size;
startExpr(b, minPrecedence); // write the if-false expression
- b.set(size - 1, new Integer(b.size - size + 1)); // this is the end; jump to here
+ b.set(size - 1, JS.N(b.size - size + 1)); // this is the end; jump to here
break;
}
case COMMA: {
@@ -461,12 +546,14 @@ class Parser extends Lexer implements ByteCodes {
}
// parse a set of comma separated function arguments, assume LP has already been consumed
- private int parseArgs(Function b) throws IOException {
+ // if swap is true, (because the function is already on the stack) we will SWAP after each argument to keep it on top
+ private int parseArgs(JSFunction b, int pushdown) throws IOException {
int i = 0;
while(peekToken() != RP) {
i++;
if (peekToken() != COMMA) {
startExpr(b, NO_COMMA);
+ b.add(parserLine, SWAP, JS.N(pushdown));
if (peekToken() == RP) break;
}
consume(COMMA);
@@ -476,13 +563,13 @@ class Parser extends Lexer implements ByteCodes {
}
/** Parse a block of statements which must be surrounded by LC..RC. */
- void parseBlock(Function b) throws IOException { parseBlock(b, null); }
- void parseBlock(Function b, String label) throws IOException {
+ void parseBlock(JSFunction b) throws IOException { parseBlock(b, null); }
+ void parseBlock(JSFunction b, String label) throws IOException {
int saveParserLine = parserLine;
_parseBlock(b, label);
parserLine = saveParserLine;
}
- void _parseBlock(Function b, String label) throws IOException {
+ void _parseBlock(JSFunction b, String label) throws IOException {
if (peekToken() == -1) return;
else if (peekToken() != LC) parseStatement(b, null);
else {
@@ -493,12 +580,12 @@ class Parser extends Lexer implements ByteCodes {
}
/** Parse a single statement, consuming the RC or SEMI which terminates it. */
- void parseStatement(Function b, String label) throws IOException {
+ void parseStatement(JSFunction b, String label) throws IOException {
int saveParserLine = parserLine;
_parseStatement(b, label);
parserLine = saveParserLine;
}
- void _parseStatement(Function b, String label) throws IOException {
+ void _parseStatement(JSFunction b, String label) throws IOException {
int tok = peekToken();
if (tok == -1) return;
switch(tok = getToken()) {
@@ -543,18 +630,18 @@ class Parser extends Lexer implements ByteCodes {
startExpr(b, -1);
consume(RP);
- b.add(parserLine, JF, new Integer(0)); // if false, jump to the else-block
+ b.add(parserLine, JF, JS.ZERO); // if false, jump to the else-block
int size = b.size;
parseStatement(b, null);
if (peekToken() == ELSE) {
consume(ELSE);
- b.add(parserLine, JMP, new Integer(0)); // if we took the true-block, jump over the else-block
- b.set(size - 1, new Integer(b.size - size + 1));
+ b.add(parserLine, JMP, JS.ZERO); // if we took the true-block, jump over the else-block
+ b.set(size - 1, JS.N(b.size - size + 1));
size = b.size;
parseStatement(b, null);
}
- b.set(size - 1, new Integer(b.size - size + 1)); // regardless of which branch we took, b[size] needs to point here
+ b.set(size - 1, JS.N(b.size - size + 1)); // regardless of which branch we took, b[size] needs to point here
break;
}
case WHILE: {
@@ -564,12 +651,12 @@ class Parser extends Lexer implements ByteCodes {
int size = b.size;
b.add(parserLine, POP); // discard the first-iteration indicator
startExpr(b, -1);
- b.add(parserLine, JT, new Integer(2)); // if the while() clause is true, jump over the BREAK
+ b.add(parserLine, JT, JS.N(2)); // if the while() clause is true, jump over the BREAK
b.add(parserLine, BREAK);
consume(RP);
parseStatement(b, null);
b.add(parserLine, CONTINUE); // if we fall out of the end, definately continue
- b.set(size - 1, new Integer(b.size - size + 1)); // end of the loop
+ b.set(size - 1, JS.N(b.size - size + 1)); // end of the loop
break;
}
case SWITCH: {
@@ -587,10 +674,10 @@ class Parser extends Lexer implements ByteCodes {
startExpr(b, -1);
consume(COLON);
b.add(parserLine, EQ); // check if we should do this case-block
- b.add(parserLine, JF, new Integer(0)); // if not, jump to the next one
+ b.add(parserLine, JF, JS.ZERO); // if not, jump to the next one
int size = b.size;
while(peekToken() != CASE && peekToken() != DEFAULT && peekToken() != RC) parseStatement(b, null);
- b.set(size - 1, new Integer(1 + b.size - size));
+ b.set(size - 1, JS.N(1 + b.size - size));
} else if (peekToken() == DEFAULT) {
consume(DEFAULT);
consume(COLON);
@@ -602,7 +689,7 @@ class Parser extends Lexer implements ByteCodes {
} else {
throw pe("expected CASE, DEFAULT, or RC; got " + codeToString[peekToken()]);
}
- b.set(size0 - 1, new Integer(b.size - size0 + 1)); // end of the loop
+ b.set(size0 - 1, JS.N(b.size - size0 + 1)); // end of the loop
break;
}
@@ -614,12 +701,12 @@ class Parser extends Lexer implements ByteCodes {
consume(WHILE);
consume(LP);
startExpr(b, -1);
- b.add(parserLine, JT, new Integer(2)); // check the while() clause; jump over the BREAK if true
+ b.add(parserLine, JT, JS.N(2)); // check the while() clause; jump over the BREAK if true
b.add(parserLine, BREAK);
b.add(parserLine, CONTINUE);
consume(RP);
consume(SEMI);
- b.set(size - 1, new Integer(b.size - size + 1)); // end of the loop; write this location to the LOOP instruction
+ b.set(size - 1, JS.N(b.size - size + 1)); // end of the loop; write this location to the LOOP instruction
break;
}
@@ -640,27 +727,64 @@ class Parser extends Lexer implements ByteCodes {
int catchJMPDistance = -1;
if (peekToken() == CATCH) {
catchJMPDistance = b.size - tryInsn;
- String exceptionVar;
- getToken();
- consume(LP);
- consume(NAME);
- exceptionVar = string;
- consume(RP);
- b.add(parserLine, TOPSCOPE); // the exception is on top of the stack; put it to the chosen name
- b.add(parserLine, SWAP);
- b.add(parserLine, LITERAL,exceptionVar);
- b.add(parserLine, SWAP);
- b.add(parserLine, PUT);
- b.add(parserLine, POP);
- b.add(parserLine, POP);
- parseStatement(b, null);
+ while(peekToken() == CATCH) {
+ String exceptionVar;
+ getToken();
+ consume(LP);
+ consume(NAME);
+ exceptionVar = string;
+ int[] writebacks = new int[] { -1, -1, -1 };
+ if (peekToken() != RP) {
+ // extended XWT catch block: catch(e faultCode "foo.bar.baz")
+ consume(NAME);
+ String propName = string;
+ b.add(parserLine, DUP);
+ b.add(parserLine, LITERAL, string);
+ b.add(parserLine, GET);
+ b.add(parserLine, DUP);
+ b.add(parserLine, LITERAL, null);
+ b.add(parserLine, EQ);
+ b.add(parserLine, JT);
+ writebacks[0] = b.size - 1;
+ if (peekToken() == STRING) {
+ consume(STRING);
+ b.add(parserLine, DUP);
+ b.add(parserLine, LITERAL, string);
+ b.add(parserLine, LT);
+ b.add(parserLine, JT);
+ writebacks[1] = b.size - 1;
+ b.add(parserLine, LITERAL, string + "/"); // (slash is ASCII after dot)
+ b.add(parserLine, GE);
+ b.add(parserLine, JT);
+ writebacks[2] = b.size - 1;
+ } else {
+ consume(NUMBER);
+ b.add(parserLine, LITERAL, number);
+ b.add(parserLine, EQ);
+ b.add(parserLine, JF);
+ writebacks[1] = b.size - 1;
+ }
+ }
+ consume(RP);
+ // the exception is on top of the stack; put it to the chosen name
+ b.add(parserLine, TOPSCOPE);
+ b.add(parserLine, SWAP);
+ b.add(parserLine, LITERAL,exceptionVar);
+ b.add(parserLine, SWAP);
+ b.add(parserLine, PUT);
+ b.add(parserLine, POP);
+ b.add(parserLine, POP);
+ parseStatement(b, null);
+ b.add(parserLine, LITERAL, null); // so we have something to pop
+ for(int i=0; i<3; i++) if (writebacks[i] != -1) b.set(i, JS.N(b.size - i));
+ }
// pop the try and catch markers
b.add(parserLine,POP);
b.add(parserLine,POP);
}
// jump here if no exception was thrown
- b.set(successJMPInsn, new Integer(b.size - successJMPInsn));
+ b.set(successJMPInsn, JS.N(b.size - successJMPInsn));
int finallyJMPDistance = -1;
if (peekToken() == FINALLY) {
@@ -703,12 +827,12 @@ class Parser extends Lexer implements ByteCodes {
b.add(parserLine, GET);
consume(RP);
- b.add(parserLine, LITERAL, new Integer(1)); // decrement the length
+ b.add(parserLine, LITERAL, JS.N(1)); // decrement the length
b.add(parserLine, SUB);
b.add(parserLine, DUP);
- b.add(parserLine, LITERAL, new Integer(0)); // see if we've exhausted all the elements
+ b.add(parserLine, LITERAL, JS.ZERO); // see if we've exhausted all the elements
b.add(parserLine, LT);
- b.add(parserLine, JF, new Integer(2));
+ b.add(parserLine, JF, JS.N(2));
b.add(parserLine, BREAK); // if we have, then BREAK
b.add(parserLine, GET_PRESERVE); // get the key out of the keys array
b.add(parserLine, LITERAL, varName);
@@ -716,7 +840,7 @@ class Parser extends Lexer implements ByteCodes {
parseStatement(b, null); // do some stuff
b.add(parserLine, CONTINUE); // continue if we fall out the bottom
- b.set(size - 1, new Integer(b.size - size + 1)); // BREAK to here
+ b.set(size - 1, JS.N(b.size - size + 1)); // BREAK to here
b.add(parserLine, OLDSCOPE); // restore the scope
} else {
@@ -724,8 +848,8 @@ class Parser extends Lexer implements ByteCodes {
b.add(parserLine, NEWSCOPE); // grab a fresh scope
parseStatement(b, null); // initializer
- Function e2 = // we need to put the incrementor before the test
- new Function(sourceName, parserLine, null, null); // so we save the test here
+ JSFunction e2 = // we need to put the incrementor before the test
+ new JSFunction(sourceName, parserLine, null); // so we save the test here
if (peekToken() != SEMI)
startExpr(e2, -1);
else
@@ -735,21 +859,21 @@ class Parser extends Lexer implements ByteCodes {
b.add(parserLine, LOOP);
int size2 = b.size;
- b.add(parserLine, JT, new Integer(0)); // if we're on the first iteration, jump over the incrementor
+ b.add(parserLine, JT, JS.ZERO); // if we're on the first iteration, jump over the incrementor
int size = b.size;
if (peekToken() != RP) { // do the increment thing
startExpr(b, -1);
b.add(parserLine, POP);
}
- b.set(size - 1, new Integer(b.size - size + 1));
+ b.set(size - 1, JS.N(b.size - size + 1));
consume(RP);
b.paste(e2); // ok, *now* test if we're done yet
- b.add(parserLine, JT, new Integer(2)); // break out if we don't meet the test
+ b.add(parserLine, JT, JS.N(2)); // break out if we don't meet the test
b.add(parserLine, BREAK);
parseStatement(b, null);
b.add(parserLine, CONTINUE); // if we fall out the bottom, CONTINUE
- b.set(size2 - 1, new Integer(b.size - size2 + 1)); // end of the loop
+ b.set(size2 - 1, JS.N(b.size - size2 + 1)); // end of the loop
b.add(parserLine, OLDSCOPE); // get our scope back
}