X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fxwt%2Fjs%2FParser.java;h=6ce07606d8058d25b5108c589f9d18963e9da7d1;hb=b895fafa7b8cc7cdc00bef856eacb584c80c89e7;hp=49b5d34e6b998a4acf2a07fd1326c55413a1570c;hpb=650cc315549ff0d546472f8fc3b9426119e8d9fa;p=org.ibex.core.git diff --git a/src/org/xwt/js/Parser.java b/src/org/xwt/js/Parser.java index 49b5d34..6ce0760 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 CompiledFunctionImpl's. + * Parses a stream of lexed tokens into a tree of Function'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 { - CompiledFunctionImpl block = new JS.CompiledFunction("stdin", 0, new InputStreamReader(System.in), null); + Function block = new Function("stdin", 0, new InputStreamReader(System.in), null); if (block == null) return; System.out.println(block); } @@ -83,6 +83,8 @@ class Parser extends Lexer implements ByteCodes { static byte[] precedence = new byte[MAX_TOKEN + 1]; static boolean[] isRightAssociative = new boolean[MAX_TOKEN + 1]; + // Use this as the precedence when we want anything up to the comma + private final static int NO_COMMA = 2; static { isRightAssociative[ASSIGN] = isRightAssociative[ASSIGN_BITOR] = @@ -97,6 +99,8 @@ class Parser extends Lexer implements ByteCodes { isRightAssociative[ASSIGN_DIV] = isRightAssociative[ASSIGN_MOD] = true; + precedence[COMMA] = 1; + // 2 is intentionally left unassigned. we use minPrecedence==2 for comma separated lists precedence[ASSIGN] = precedence[ASSIGN_BITOR] = precedence[ASSIGN_BITXOR] = @@ -108,24 +112,20 @@ class Parser extends Lexer implements ByteCodes { precedence[ASSIGN_SUB] = precedence[ASSIGN_MUL] = precedence[ASSIGN_DIV] = - precedence[ASSIGN_MOD] = 1; - precedence[HOOK] = 2; - precedence[COMMA] = 3; - precedence[OR] = precedence[AND] = precedence[BANG] = 4; - precedence[GT] = precedence[GE] = 5; - precedence[BITOR] = 6; - precedence[BITXOR] = 7; - precedence[BITAND] = 8; - precedence[EQ] = precedence[NE] = 9; - precedence[LT] = precedence[LE] = precedence[TYPEOF] = 10; - precedence[SHEQ] = precedence[SHNE] = 11; + precedence[ASSIGN_MOD] = 3; + precedence[HOOK] = 4; + precedence[OR] = 5; + precedence[AND] = 6; + precedence[BITOR] = 7; + precedence[BITXOR] = 8; + precedence[BITAND] = 9; + precedence[EQ] = precedence[NE] = precedence[SHEQ] = precedence[SHNE] = 10; + precedence[LT] = precedence[LE] = precedence[GT] = precedence[GE] = 11; precedence[LSH] = precedence[RSH] = precedence[URSH] = 12; - precedence[ADD] = precedence[SUB] = 13; - precedence[MUL] = precedence[DIV] = precedence[MOD] = 14; - precedence[BITNOT] = 15; - precedence[INC] = precedence[DEC] = 16; - precedence[LP] = 17; - precedence[DOT] = precedence[LB] = 18; + precedence[ADD] = precedence[SUB] = 12; + precedence[MUL] = precedence[DIV] = precedence[MOD] = 13; + precedence[BITNOT] = precedence[BANG] = precedence[TYPEOF] = 14; + precedence[DOT] = precedence[LB] = precedence[LP] = precedence[INC] = precedence[DEC] = 15; } @@ -142,14 +142,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(CompiledFunctionImpl appendTo, int minPrecedence) throws IOException { + private void startExpr(Function appendTo, int minPrecedence) throws IOException { int saveParserLine = parserLine; _startExpr(appendTo, minPrecedence); parserLine = saveParserLine; } - private void _startExpr(CompiledFunctionImpl appendTo, int minPrecedence) throws IOException { + private void _startExpr(Function appendTo, int minPrecedence) throws IOException { int tok = getToken(); - CompiledFunctionImpl b = appendTo; + Function b = appendTo; switch (tok) { case -1: throw pe("expected expression"); @@ -163,16 +163,16 @@ class Parser extends Lexer implements ByteCodes { case LB: { b.add(parserLine, ARRAY, new Integer(0)); // push an array onto the stack - int size0 = b.size(); + int size0 = b.size; int i = 0; if (peekToken() != RB) while(true) { // iterate over the initialization values - int size = b.size(); + int size = b.size; b.add(parserLine, LITERAL, new Integer(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 - startExpr(b, -1); // push the value onto the stack + startExpr(b, NO_COMMA); // push the value onto the stack b.add(parserLine, PUT); // put it into the array b.add(parserLine, POP); // discard the value remaining on the stack if (peekToken() == RB) break; @@ -194,9 +194,14 @@ class Parser extends Lexer implements ByteCodes { } case INC: case DEC: { // prefix (not postfix) startExpr(b, precedence[tok]); - if (b.get(b.size() - 1) != GET) + int prev = b.size - 1; + if (b.get(prev) == GET && b.getArg(prev) != null) + b.set(prev, LITERAL, b.getArg(prev)); + else if(b.get(prev) == GET) + b.pop(); + else throw pe("prefixed increment/decrement can only be performed on a valid assignment target"); - b.set(b.size() - 1, tok, new Boolean(true)); + b.add(parserLine, tok, Boolean.TRUE); break; } case BANG: case BITNOT: case TYPEOF: { @@ -213,7 +218,7 @@ class Parser extends Lexer implements ByteCodes { getToken(); b.add(parserLine, LITERAL, string); // grab the key consume(COLON); - startExpr(b, -1); // grab the value + startExpr(b, NO_COMMA); // grab the value b.add(parserLine, PUT); // put the value into the object b.add(parserLine, POP); // discard the remaining value if (peekToken() == RC) break; @@ -226,60 +231,53 @@ class Parser extends Lexer implements ByteCodes { case NAME: { b.add(parserLine, TOPSCOPE); b.add(parserLine, LITERAL, string); - continueExprAfterAssignable(b); + continueExprAfterAssignable(b,minPrecedence); break; } case FUNCTION: { consume(LP); int numArgs = 0; - CompiledFunctionImpl b2 = new JS.CompiledFunction(sourceName, parserLine, null, null); + Function b2 = new Function(sourceName, parserLine, null, null); b.add(parserLine, NEWFUNCTION, b2); // function prelude; arguments array is already on the stack - b2.add(parserLine, TOPSCOPE); // push the scope onto the stack - b2.add(parserLine, SWAP); // swap 'this' and 'arguments' - - b2.add(parserLine, LITERAL, "arguments"); // declare arguments (equivalent to 'var arguments;') - b2.add(parserLine, DECLARE); - - b2.add(parserLine, LITERAL, "arguments"); // set this.arguments and leave the value on the stack + b2.add(parserLine, TOPSCOPE); b2.add(parserLine, SWAP); + b2.add(parserLine, DECLARE, "arguments"); // declare arguments (equivalent to 'var arguments;') + b2.add(parserLine, SWAP); // set this.arguments and leave the value on the stack b2.add(parserLine, PUT); - b2.add(parserLine, SWAP); - b2.add(parserLine, POP); while(peekToken() != RP) { // run through the list of argument names + numArgs++; if (peekToken() == NAME) { consume(NAME); // a named argument + String varName = string; - b2.add(parserLine, LITERAL, string); // declare the name - b2.add(parserLine, DECLARE); - - b2.add(parserLine, LITERAL, new Integer(numArgs)); // retrieve it from the arguments array - b2.add(parserLine, GET_PRESERVE); - b2.add(parserLine, SWAP); - b2.add(parserLine, POP); - - b2.add(parserLine, TOPSCOPE); // put it to the current scope + 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, TOPSCOPE); b2.add(parserLine, SWAP); - b2.add(parserLine, LITERAL, string); + b2.add(parserLine, DECLARE, varName); // declare the name b2.add(parserLine, SWAP); - b2.add(parserLine, PUT); - - b2.add(parserLine, POP); // clean the stack - b2.add(parserLine, POP); + b2.add(parserLine, PUT); + b2.add(parserLine, POP); // pop the value + b2.add(parserLine, POP); // pop the scope } if (peekToken() == RP) break; consume(COMMA); - numArgs++; } consume(RP); + b2.numFormalArgs = numArgs; b2.add(parserLine, POP); // pop off the arguments array + b2.add(parserLine, POP); // pop off TOPSCOPE + + if(peekToken() != LC) + throw pe("Functions must have a block surrounded by curly brackets"); + + parseBlock(b2, null); // the function body - parseStatement(b2, null); // the function body - - b2.add(parserLine, LITERAL, null); // in case we "fall out the bottom", return NULL + b2.add(parserLine, LITERAL, null); // in case we "fall out the bottom", return NULL b2.add(parserLine, RETURN); break; @@ -299,38 +297,40 @@ 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(CompiledFunctionImpl b) throws IOException { + private void continueExprAfterAssignable(Function b,int minPrecedence) throws IOException { int saveParserLine = parserLine; - _continueExprAfterAssignable(b); + _continueExprAfterAssignable(b,minPrecedence); parserLine = saveParserLine; } - private void _continueExprAfterAssignable(CompiledFunctionImpl b) throws IOException { + private void _continueExprAfterAssignable(Function 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 ASSIGN_BITOR: case ASSIGN_BITXOR: case ASSIGN_BITAND: case ASSIGN_LSH: case ASSIGN_RSH: case ASSIGN_URSH: - case ASSIGN_ADD: case ASSIGN_SUB: case ASSIGN_MUL: case ASSIGN_DIV: case ASSIGN_MOD: { + case ASSIGN_MUL: case ASSIGN_DIV: case ASSIGN_MOD: case ASSIGN_ADD: case ASSIGN_SUB: { b.add(parserLine, GET_PRESERVE); - startExpr(b, -1); - b.add(parserLine, tok - 1); + startExpr(b, precedence[tok]); + int size = b.size; + if (tok == ASSIGN_ADD || tok == ASSIGN_SUB) { + b.add(parserLine, tok); + } + // 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, 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)); break; } case INC: case DEC: { // postfix - b.add(parserLine, GET_PRESERVE); - b.add(parserLine, LITERAL, new Integer(1)); - b.add(parserLine, tok == INC ? ADD : SUB); - b.add(parserLine, PUT); - b.add(parserLine, SWAP); - b.add(parserLine, POP); - b.add(parserLine, LITERAL, new Integer(1)); - b.add(parserLine, tok == INC ? SUB : ADD); + b.add(parserLine, tok, Boolean.FALSE); break; } case ASSIGN: { - startExpr(b, -1); + startExpr(b, precedence[tok]); b.add(parserLine, PUT); b.add(parserLine, SWAP); b.add(parserLine, POP); @@ -338,12 +338,19 @@ class Parser extends Lexer implements ByteCodes { } 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)); break; } default: { pushBackToken(); - b.add(parserLine, GET); + if(b.get(b.size-1) == LITERAL && b.getArg(b.size-1) != null) + b.set(b.size-1,GET,b.getArg(b.size-1)); + else + b.add(parserLine, GET); return; } } @@ -361,12 +368,12 @@ class Parser extends Lexer implements ByteCodes { * If any bytecodes are appended, they will not alter the stack * depth. */ - private void continueExpr(CompiledFunctionImpl b, int minPrecedence) throws IOException { + private void continueExpr(Function b, int minPrecedence) throws IOException { int saveParserLine = parserLine; _continueExpr(b, minPrecedence); parserLine = saveParserLine; } - private void _continueExpr(CompiledFunctionImpl b, int minPrecedence) throws IOException { + private void _continueExpr(Function 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; @@ -382,44 +389,67 @@ class Parser extends Lexer implements ByteCodes { break; } case BITOR: case BITXOR: case BITAND: case SHEQ: case SHNE: case LSH: - case RSH: case URSH: case ADD: case MUL: case DIV: case MOD: + case RSH: case URSH: case MUL: case DIV: case MOD: case GT: case GE: case EQ: case NE: case LT: case LE: case SUB: { startExpr(b, precedence[tok]); b.add(parserLine, tok); break; } + case ADD: { + int count=1; + int nextTok; + do { + startExpr(b,precedence[tok]); + count++; + nextTok = getToken(); + } while(nextTok == tok); + pushBackToken(); + b.add(parserLine, tok, new Integer(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 - int size = b.size(); + 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, 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 + b.set(size - 1, new Integer(b.size - size)); // write the target of the short-circuit jump break; } case DOT: { - consume(NAME); + // support foo..bar syntax for foo[""].bar + if (peekToken() == DOT) { + string = ""; + } else { + consume(NAME); + } b.add(parserLine, LITERAL, string); - continueExprAfterAssignable(b); + continueExprAfterAssignable(b,minPrecedence); break; } case LB: { // subscripting (not array constructor) startExpr(b, -1); consume(RB); - continueExprAfterAssignable(b); + continueExprAfterAssignable(b,minPrecedence); break; } case HOOK: { b.add(parserLine, JF, new Integer(0)); // jump to the if-false expression - int size = b.size(); - startExpr(b, -1); // write the if-true 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.set(size - 1, new Integer(b.size - size + 1)); // now we know where the target of the jump is consume(COLON); - size = b.size(); - startExpr(b, -1); // write the if-false expression - b.set(size - 1, new Integer(b.size() - size + 1)); // this is the end; jump to here + 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 + break; + } + case COMMA: { + // pop the result of the previous expression, it is ignored + b.add(parserLine,POP); + startExpr(b,-1); break; } default: { @@ -432,12 +462,12 @@ class Parser extends Lexer implements ByteCodes { } // parse a set of comma separated function arguments, assume LP has already been consumed - private int parseArgs(CompiledFunctionImpl b) throws IOException { + private int parseArgs(Function b) throws IOException { int i = 0; while(peekToken() != RP) { i++; if (peekToken() != COMMA) { - startExpr(b, -1); + startExpr(b, NO_COMMA); if (peekToken() == RP) break; } consume(COMMA); @@ -447,13 +477,13 @@ class Parser extends Lexer implements ByteCodes { } /** Parse a block of statements which must be surrounded by LC..RC. */ - void parseBlock(CompiledFunctionImpl b) throws IOException { parseBlock(b, null); } - void parseBlock(CompiledFunctionImpl b, String label) throws IOException { + void parseBlock(Function b) throws IOException { parseBlock(b, null); } + void parseBlock(Function b, String label) throws IOException { int saveParserLine = parserLine; _parseBlock(b, label); parserLine = saveParserLine; } - void _parseBlock(CompiledFunctionImpl b, String label) throws IOException { + void _parseBlock(Function b, String label) throws IOException { if (peekToken() == -1) return; else if (peekToken() != LC) parseStatement(b, null); else { @@ -464,12 +494,12 @@ class Parser extends Lexer implements ByteCodes { } /** Parse a single statement, consuming the RC or SEMI which terminates it. */ - void parseStatement(CompiledFunctionImpl b, String label) throws IOException { + void parseStatement(Function b, String label) throws IOException { int saveParserLine = parserLine; _parseStatement(b, label); parserLine = saveParserLine; } - void _parseStatement(CompiledFunctionImpl b, String label) throws IOException { + void _parseStatement(Function b, String label) throws IOException { int tok = peekToken(); if (tok == -1) return; switch(tok = getToken()) { @@ -493,16 +523,15 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, TOPSCOPE); // push the current scope while(true) { consume(NAME); - String name = string; - b.add(parserLine, LITERAL, name); // push the name to be declared - b.add(parserLine, DECLARE); // declare it + b.add(parserLine, DECLARE, string); // declare it if (peekToken() == ASSIGN) { // if there is an '=' after the variable name - b.add(parserLine, LITERAL, name); // put the var name back on the stack consume(ASSIGN); - startExpr(b, -1); + startExpr(b, NO_COMMA); b.add(parserLine, PUT); // assign it b.add(parserLine, POP); // clean the stack - } + } else { + b.add(parserLine, POP); // pop the string pushed by declare + } if (peekToken() != COMMA) break; consume(COMMA); } @@ -516,24 +545,24 @@ class Parser extends Lexer implements ByteCodes { consume(RP); b.add(parserLine, JF, new Integer(0)); // if false, jump to the else-block - int size = b.size(); + 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)); - size = b.size(); + b.set(size - 1, new Integer(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, new Integer(b.size - size + 1)); // regardless of which branch we took, b[size] needs to point here break; } case WHILE: { consume(LP); if (label != null) b.add(parserLine, LABEL, label); b.add(parserLine, LOOP); - int size = b.size(); + 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 @@ -541,14 +570,14 @@ class Parser extends Lexer implements ByteCodes { 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, new Integer(b.size - size + 1)); // end of the loop break; } case SWITCH: { consume(LP); if (label != null) b.add(parserLine, LABEL, label); b.add(parserLine, LOOP); - int size0 = b.size(); + int size0 = b.size; startExpr(b, -1); consume(RP); consume(LC); @@ -560,9 +589,9 @@ class Parser extends Lexer implements ByteCodes { 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 - int size = b.size(); + 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, new Integer(1 + b.size - size)); } else if (peekToken() == DEFAULT) { consume(DEFAULT); consume(COLON); @@ -574,14 +603,14 @@ 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, new Integer(b.size - size0 + 1)); // end of the loop break; } case DO: { if (label != null) b.add(parserLine, LABEL, label); b.add(parserLine, LOOP); - int size = b.size(); + int size = b.size; parseStatement(b, null); consume(WHILE); consume(LP); @@ -591,27 +620,27 @@ class Parser extends Lexer implements ByteCodes { 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, new Integer(b.size - size + 1)); // end of the loop; write this location to the LOOP instruction break; } case TRY: { b.add(parserLine, TRY); // try bytecode causes a TryMarker to be pushed - int tryInsn = b.size() - 1; + int tryInsn = b.size - 1; // parse the expression to be TRYed parseStatement(b, null); // pop the try marker. this is pushed when the TRY bytecode is executed b.add(parserLine, POP); // jump forward to the end of the catch block, start of the finally block b.add(parserLine, JMP); - int successJMPInsn = b.size() - 1; + int successJMPInsn = b.size - 1; if (peekToken() != CATCH && peekToken() != FINALLY) throw pe("try without catch or finally"); int catchJMPDistance = -1; if (peekToken() == CATCH) { - catchJMPDistance = b.size() - tryInsn; + catchJMPDistance = b.size - tryInsn; String exceptionVar; getToken(); consume(LP); @@ -632,12 +661,12 @@ class Parser extends Lexer implements ByteCodes { } // jump here if no exception was thrown - b.set(successJMPInsn, new Integer(b.size() - successJMPInsn)); + b.set(successJMPInsn, new Integer(b.size - successJMPInsn)); int finallyJMPDistance = -1; if (peekToken() == FINALLY) { b.add(parserLine, LITERAL, null); // null FinallyData - finallyJMPDistance = b.size() - tryInsn; + finallyJMPDistance = b.size - tryInsn; consume(FINALLY); parseStatement(b, null); b.add(parserLine,FINALLY_DONE); @@ -666,7 +695,7 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, LOOP); // we actually only add this to ensure that BREAK works b.add(parserLine, POP); // discard the first-iteration indicator - int size = b.size(); + int size = b.size; consume(NAME); consume(IN); startExpr(b, -1); @@ -688,7 +717,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, new Integer(b.size - size + 1)); // BREAK to here b.add(parserLine, OLDSCOPE); // restore the scope } else { @@ -696,8 +725,8 @@ class Parser extends Lexer implements ByteCodes { b.add(parserLine, NEWSCOPE); // grab a fresh scope parseStatement(b, null); // initializer - CompiledFunctionImpl e2 = // we need to put the incrementor before the test - new JS.CompiledFunction(sourceName, parserLine, null, null); // so we save the test here + Function e2 = // we need to put the incrementor before the test + new Function(sourceName, parserLine, null, null); // so we save the test here if (peekToken() != SEMI) startExpr(e2, -1); else @@ -705,15 +734,15 @@ class Parser extends Lexer implements ByteCodes { consume(SEMI); if (label != null) b.add(parserLine, LABEL, label); b.add(parserLine, LOOP); - int size2 = b.size(); + int size2 = b.size; b.add(parserLine, JT, new Integer(0)); // if we're on the first iteration, jump over the incrementor - int size = b.size(); + 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, new Integer(b.size - size + 1)); consume(RP); b.paste(e2); // ok, *now* test if we're done yet @@ -721,7 +750,7 @@ class Parser extends Lexer implements ByteCodes { 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, new Integer(b.size - size2 + 1)); // end of the loop b.add(parserLine, OLDSCOPE); // get our scope back }