import org.xwt.util.*;
import java.io.*;
-// FEATURE intern Integers/Numbers
-
/**
* Parses a stream of lexed tokens into a tree of JSFunction's.
*
/** 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);
}
/** gets a token and throws an exception if it is not <tt>code</tt> */
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]));
+ }
}
/**
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
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)
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);
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
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
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, 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;
}
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: {
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:
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: {
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: {
// 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);
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: {
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: {
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);
} 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;
}
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;
}
}
// 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) {
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);
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 {
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
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
}
projects / org.ibex.core.git / blobdiff