X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fjs%2FParser.java;h=4bf273d78d1e1331d19bad76c702ff7a7ee20bd4;hb=96cc912c45623abf8a8a37d7c1d6103e5fe58bd5;hp=b3c174234301142bdf430cdaf848a3bba2162f8b;hpb=c150258fc143a468aa2adc63d4e0b94b8e884580;p=org.ibex.core.git diff --git a/src/org/xwt/js/Parser.java b/src/org/xwt/js/Parser.java index b3c1742..4bf273d 100644 --- a/src/org/xwt/js/Parser.java +++ b/src/org/xwt/js/Parser.java @@ -4,8 +4,6 @@ package org.xwt.js; import org.xwt.util.*; import java.io.*; -// FEATURE intern Integers/Numbers - /** * Parses a stream of lexed tokens into a tree of JSFunction's. * @@ -75,7 +73,7 @@ class Parser extends Lexer implements ByteCodes { /** for debugging */ public static void main(String[] s) throws Exception { - JSFunction block = new JSFunction("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); } @@ -135,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])); + } } /** @@ -160,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 @@ -179,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) @@ -203,8 +222,8 @@ class Parser extends Lexer implements ByteCodes { else throw pe("prefixed increment/decrement can only be performed on a valid assignment target"); b.add(parserLine, GET_PRESERVE, Boolean.TRUE); - b.add(parserLine, LITERAL, new Integer(1)); - b.add(parserLine, tok == INC ? ADD : SUB, null); + 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); @@ -243,7 +262,7 @@ class Parser extends Lexer implements ByteCodes { case FUNCTION: { consume(LP); int numArgs = 0; - JSFunction b2 = new JSFunction(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 @@ -260,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 @@ -317,28 +336,34 @@ class Parser extends Lexer implements ByteCodes { switch(tok) { 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, GET_PRESERVE, Boolean.TRUE); - b.add(parserLine, LITERAL, new Integer(1)); - b.add(parserLine, tok == INC ? ADD : SUB, null); + 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, new Integer(1)); + 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; } @@ -350,12 +375,13 @@ class Parser extends Lexer implements ByteCodes { break; } case LP: { - int n = parseArgs(b); - // if the object supports CALLMETHOD, 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,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: { @@ -397,8 +423,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: @@ -417,17 +443,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: { @@ -448,15 +474,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: { @@ -476,13 +502,13 @@ class Parser extends Lexer implements ByteCodes { // parse a set of comma separated function arguments, assume LP has already been consumed // 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) throws IOException { + 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, new Integer(2)); + b.add(parserLine, SWAP, JS.N(pushdown)); if (peekToken() == RP) break; } consume(COMMA); @@ -559,18 +585,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: { @@ -580,12 +606,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: { @@ -603,10 +629,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); @@ -618,7 +644,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; } @@ -630,12 +656,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; } @@ -676,7 +702,7 @@ class Parser extends Lexer implements ByteCodes { } // 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) { @@ -719,12 +745,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); @@ -732,7 +758,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 { @@ -741,7 +767,7 @@ class Parser extends Lexer implements ByteCodes { parseStatement(b, null); // initializer JSFunction e2 = // we need to put the incrementor before the test - new JSFunction(sourceName, parserLine, null, null); // so we save the test here + new JSFunction(sourceName, parserLine, null); // so we save the test here if (peekToken() != SEMI) startExpr(e2, -1); else @@ -751,21 +777,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 }