2003/06/07 09:37:13
[org.ibex.core.git] / src / org / xwt / js / Parser.java
index b7456fe..cc55164 100644 (file)
@@ -1,12 +1,11 @@
-// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt.js;
 
 import org.xwt.util.*;
 import java.io.*;
 
-
-/** parses a stream of lexed tokens into a tree of Expr's */
-public class Parser extends Lexer {
+/** parses a stream of lexed tokens into ForthBlock's */
+public class Parser extends Lexer implements OpCodes {
 
     // Constructors //////////////////////////////////////////////////////
 
@@ -20,7 +19,8 @@ public class Parser extends Lexer {
     public static void main(String[] s) throws Exception {
        Parser p = new Parser(new InputStreamReader(System.in), "stdin", 0);
        while(true) {
-           Expr block = p.parseBlock(false);
+           ForthBlock block = new ForthBlock(0, "stdin");
+           p.parseStatement(false, block);
            if (block == null) return;
            System.out.println(block);
            if (p.peekToken() == -1) return;
@@ -33,8 +33,9 @@ public class Parser extends Lexer {
     static byte[] precedence = new byte[MAX_TOKEN + 1];
     static boolean[] isRightAssociative = new boolean[MAX_TOKEN + 1];
     static {
-       precedence[ASSIGN] = 1;
        isRightAssociative[ASSIGN] = true;
+
+       precedence[ASSIGN] = 1;
        precedence[HOOK] = 2;
        precedence[COMMA] = 3;
        precedence[OR] = precedence[AND] = 4;
@@ -58,845 +59,560 @@ public class Parser extends Lexer {
 
     // Parsing Logic /////////////////////////////////////////////////////////
 
+    /** gets a token and throws an exception if it is not <tt>code</tt> */
     public void consume(int code) throws IOException {
-       int got = getToken();
-       if (got != code) throw new ParserException("expected " + codeToString[code] + ", got " + (got == -1 ? "EOL" : codeToString[got]));
-    }
-    public void expect(int code) throws IOException {
-       int got = peekToken();
-       if (got != code) throw new ParserException("expected " + codeToString[code] + ", got " + (got == -1 ? "EOL" : codeToString[got]));
+       if (getToken() != code)
+           throw new ParserException("expected " + codeToString[code] + ", got " + (op == -1 ? "EOL" : codeToString[op]));
     }
 
-    /** parses the largest possible expression */
-    public Expr parseMaximalExpr() throws IOException { return parseMaximalExpr(null, -1); }
-    public Expr parseMaximalExpr(Expr prefix, int minPrecedence) throws IOException {
-       while(true) {
-           if (peekToken() == -1) break;
-           Expr save = prefix;
-           prefix = parseSingleExpr(prefix, minPrecedence);
-           if (save == prefix) break;
-           if (prefix == null) throw new ParserException("parseSingleExpr() returned null");
-       }
-       return prefix;
-    }
+    /** append the largest expression beginning with prefix containing no operators of precedence below <tt>minPrecedence</tt> */
+    public ForthBlock startExpr() throws IOException { return startExpr(-1); }
+    public ForthBlock startExpr(int minPrecedence) throws IOException { return startExpr(minPrecedence, new ForthBlock(line, sourceName)); }
+    public ForthBlock startExpr(int minPrecedence, ForthBlock appendTo) throws IOException {
 
-    public Expr parseSingleExpr(Expr prefix, int minPrecedence) throws IOException {
-       Expr e1 = null, e2 = null, e3 = null, head = null, tail = null, ret = null;
-
-       int tok = peekToken();
-       if (minPrecedence > 0 &&
-           tok < precedence.length &&
-           precedence[tok] != 0 &&
-           (isRightAssociative[tok] ?
-            (precedence[tok] < minPrecedence) :
-            (precedence[tok] <= minPrecedence))) {
-           return prefix;
-            }
-       getToken();
+       int tok = getToken();
        int curLine = line;
+       if (tok == -1) return null;
+       if (minPrecedence > 0 && precedence[tok] != 0)
+           if (precedence[tok] < minPrecedence || (precedence[tok] == minPrecedence && !isRightAssociative[tok]))
+               { pushBackToken(); return null; }
 
-       // these case arms match the precedence of operators; each arm is a precedence level.
-       switch (tok) {
-
-       case WITH: throw new ParserException("XWT does not allow the WITH keyword");
-       case VOID: case RESERVED: throw new ParserException("reserved word that you shouldn't be using");
-       case NAME: if (prefix != null) { pushBackToken(); return prefix; } else return parseMaximalExpr(new Expr(curLine, NAME, string), minPrecedence);
-       case STRING: if (prefix != null) { pushBackToken(); return prefix; } else return new Expr(curLine, string);
-       case NUMBER: if (prefix != null) { pushBackToken(); return prefix; } else return new Expr(curLine, number);
-       case NULL: case TRUE: case FALSE: case NOP: if (prefix != null) { pushBackToken(); return prefix; } else return new Expr(curLine, 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:
-           return new Expr(curLine, ASSIGN, prefix, new Expr(curLine, tok - 1, prefix, parseMaximalExpr(null, precedence[ASSIGN])));
-
-       case COMMA: pushBackToken();return prefix;
-
-       case THIS:
-           if (prefix != null) { pushBackToken(); return prefix; } 
-           return new Expr(curLine, THIS);
-
-       case SUB:
-           if (prefix == null && peekToken() == NUMBER) {
-               getToken();
-               return new Expr(curLine, new Double(number.doubleValue() * -1));
-           } // else fall through
-        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 ASSIGN: case GT: case GE: case OR: case AND:
-       case EQ: case NE: case LT: case LE:
-           if (prefix == null) throw new ParserException("the " + codeToString[tok] + " token cannot start an expression");
-           return new Expr(curLine, tok, prefix, parseMaximalExpr(null, precedence[tok]));
-
-       case DOT: {
-           //e1 = parseMaximalExpr(null, precedence[DOT]);
-           //if (e1.code == NAME) e1.code = STRING;
-           //else throw new ParserException("argument to DOT must be a NAME; got a " + codeToString[e1.code]);
-           //return new Expr(curLine, DOT, prefix, e1);
-           tok = getToken();
-           if (tok != NAME) throw new ParserException("DOT must be followed by a NAME");
-           return new Expr(curLine, DOT, prefix, new Expr(curLine, STRING, string));
-       }
-
-       case BANG: case BITNOT: case INSTANCEOF: case TYPEOF:
-           if (prefix != null) { pushBackToken(); return prefix; }
-           return new Expr(curLine, tok, parseMaximalExpr(null, precedence[tok]));
+       ForthBlock b = appendTo;
 
-       case INC: case DEC:
-           if (prefix == null) {
-               // prefix
-               e1 = parseMaximalExpr(null, precedence[tok]);
-               return new Expr(curLine, ASSIGN, e1, new Expr(curLine, tok == INC ? ADD : SUB, e1, new Expr(curLine, new Integer(1))));
-           } else {
-               // postfix
-               return new Expr(curLine, tok, prefix);
-           }
-
-       case LP:
-           if (prefix == null) {  // grouping
-               Expr r = parseMaximalExpr();
-               expect(RP); getToken();
-               return r;
-
-           } else {  // invocation
-               ExprList list = new ExprList(curLine, LP);
-               while(peekToken() != RP) {
-                   list.add(parseMaximalExpr());
-                   if (peekToken() == RP) break;
-                   consume(COMMA);
-               }
-               getToken();
-               return new Expr(curLine, LP, prefix, list);
-           }
-
-       case LB:
-           if (prefix == null) {
-               // array ctor
-               ExprList list = new ExprList(curLine, LB);
-               while(true) {
-                   Expr e = parseMaximalExpr();
-                   if (e != null) {
-                       list.add(e);
-                   } else {
-                       if (peekToken() == COMMA) list.add(new Expr(curLine, NULL));
-                   }
-                   if (peekToken() == RB) { consume(RB); return list; }
-                   consume(COMMA);
-               }
-           } else {
-               // subscripting
-               e1 = parseMaximalExpr();
-               if (getToken() != RB) throw new ParserException("expected a right brace");
-               return new Expr(curLine, DOT, prefix, e1);
-           }
-           
-       case LC: {
-           // object ctor
-           if (prefix != null) { pushBackToken(); return prefix; }
-           tok = getToken();
-           ExprList list = new ExprList(curLine, RC);
-           if (tok == RC) return list;
+       switch (tok) {
+       case NUMBER: return continueExpr(b.add(ForthBlock.LITERAL, number), minPrecedence);
+       case STRING: return continueExpr(b.add(ForthBlock.LITERAL, string), minPrecedence);
+       case THIS: return continueExpr(b.add(THIS, null), minPrecedence);
+       case NULL: return continueExpr(b.add(ForthBlock.LITERAL, null), minPrecedence);
+       case TRUE: case FALSE: return continueExpr(b.add(ForthBlock.LITERAL, new Boolean(tok == TRUE)), minPrecedence);
+       case LB: {
+           b.add(b.ARRAY, new Integer(0));
+           int i = 0;
            while(true) {
-               if (tok != NAME && tok != STRING) throw new ParserException("expecting name, got " + codeToString[tok]);
-               Expr name = new Expr(curLine, NAME, string);
-               if (getToken() != COLON) throw new ParserException("expecting colon");          
-               e1 = new Expr(curLine, COLON, name, parseMaximalExpr());
-               list.add(e1);
-               tok = getToken();
-               if (tok != COMMA && tok != RC) throw new ParserException("expected right curly or comma, got " + codeToString[tok]);
-               if (tok == RC) return list;
-               tok = getToken();
-               if (tok == RC) return list;
+               ForthBlock e = startExpr();
+               if (e == null && peekToken() == RB) { consume(RB); return continueExpr(b, minPrecedence); }
+               b.add(b.LITERAL, new Integer(i++));
+               if (e == null) b.add(b.LITERAL, null);
+               else b.add(b.EXPR, e);
+               b.add(b.PUT);
+               b.add(b.POP);
+               if (peekToken() == RB) { consume(RB); return continueExpr(b, minPrecedence); }
+               consume(COMMA);
            }
        }
-           
-       case HOOK:
-           e2 = parseMaximalExpr();
-           if (getToken() != COLON) throw new ParserException("expected colon to close ?: expression");
-           e3 = parseMaximalExpr();
-           return new Expr(curLine, HOOK, prefix, new Expr(curLine, ELSE, e2, e3));
-           
-       case SWITCH: {
-           if (prefix != null) { pushBackToken(); return prefix; }
-           if (getToken() != LP) throw new ParserException("expected left paren");
-           Expr switchExpr = parseMaximalExpr();
-           if (getToken() != RP) throw new ParserException("expected left paren");
-           if (getToken() != LC) throw new ParserException("expected left brace");
-           ExprList toplevel = new ExprList(curLine, LC);
+       case SUB: {
+           consume(NUMBER);
+           return continueExpr(b.add(ForthBlock.LITERAL, new Double(number.doubleValue() * -1)), minPrecedence);
+       }
+       case LP: {
+           b.add(EXPR, startExpr());
+           consume(RP);
+           return continueExpr(b, minPrecedence);
+       }
+       case INC: case DEC: {
+           // prefix
+           ForthBlock subexp = startExpr(precedence[tok]);
+           subexp.set(subexp.size() - 1, tok, new Boolean(true));
+           b.add(b.EXPR, subexp);
+           return continueExpr(b, minPrecedence);
+       }
+       case BANG: case BITNOT: case INSTANCEOF: case TYPEOF: {
+           b.add(b.EXPR, startExpr(precedence[tok]));
+           b.add(tok);
+           return continueExpr(b, minPrecedence);
+       }
+       case LC: {
+           b.add(b.OBJECT, null);
+           if (peekToken() == RC) { consume(RC); return continueExpr(b, minPrecedence); }
            while(true) {
-               tok = getToken();
-               Expr caseExpr;
-               if (tok == DEFAULT) caseExpr = null;
-               else if (tok == CASE) caseExpr = parseMaximalExpr();
-               else throw new ParserException("expected CASE or DEFAULT");
+               if (peekToken() != NAME && peekToken() != STRING) throw new Error("expected NAME or STRING");
+               getToken();
+               b.add(b.LITERAL, string);
                consume(COLON);
-               // FIXME: we shouldn't be creating a scope here
-               ExprList list = new ExprList(curLine, LC);
-               while(peekToken() != CASE && peekToken() != DEFAULT && peekToken() != RC) {
-                   if ((e1 = parseBlock(false)) == null) break;
-                   list.add(e1);
-               }
-               toplevel.add(new Expr(curLine, tok, caseExpr, list));
-               if (peekToken() == RC) { consume(RC); return new Expr(curLine, SWITCH, switchExpr, toplevel); }
+               b.add(b.EXPR, startExpr());
+               b.add(b.PUT);
+               b.add(b.POP);
+               if (peekToken() == RC) { consume(RC); return continueExpr(b, minPrecedence); }
+               consume(COMMA);
+               if (peekToken() == RC) { consume(RC); return continueExpr(b, minPrecedence); }
            }
        }
-           
-       case FUNCTION: {
-           if (prefix != null) { pushBackToken(); return prefix; }
+       case NAME: {
+           String name = string;
+           if (peekToken() == ASSIGN) {
+               consume(ASSIGN);
+               b.add(THIS);
+               b.add(ForthBlock.LITERAL, name);
+               b.add(ForthBlock.EXPR, startExpr(minPrecedence));
+               b.add(ForthBlock.PUT);
+               b.add(ForthBlock.SWAP);
+               b.add(ForthBlock.POP);
+           } else {
+               b.add(THIS);
+               b.add(ForthBlock.LITERAL, name);
+               b.add(ForthBlock.GET);
+           }
+           return continueExpr(b, minPrecedence);
+       }
+       case Tokens.FUNCTION: {
            consume(LP);
-           ExprList list = new ExprList(curLine, LC);
+           int numArgs = 0;
+           ForthBlock b2 = new ForthBlock(curLine, sourceName);
+           b2.add(THIS);
+           b2.add(b.SWAP);
+           b2.add(b.LITERAL, "arguments");
+           b2.add(b.LITERAL, "arguments");
+           b2.add(b.DECLARE);
+           b2.add(b.SWAP);
+           b2.add(b.PUT);
+           b2.add(b.SWAP);
+           b2.add(b.POP);
            if (peekToken() == RP) consume(RP);
            else while(true) {
-               tok = peekToken();
-               if (tok == COMMA) {
+               if (peekToken() == COMMA) {
+                   // FIXME: pop an item off the stack here?
                    consume(COMMA);
-                   list.add(new Expr(curLine, NULL));
                } else {
                    consume(NAME);
-                   list.add(new Expr(curLine, NAME, string));
+
+                   // declare the name
+                   b2.add(b.LITERAL, string);
+                   b2.add(b.DECLARE);
+
+                   // retrieve it from the arguments array
+                   b2.add(b.LITERAL, new Integer(numArgs));
+                   b2.add(b.GET_PRESERVE);
+                   b2.add(b.SWAP);
+                   b2.add(b.POP);
+
+                   // put it to the current scope
+                   b2.add(THIS);
+                   b2.add(b.SWAP);
+                   b2.add(b.LITERAL, string);
+                   b2.add(b.SWAP);
+                   b2.add(b.PUT);
+
+                   // clean the stack
+                   b2.add(b.POP);
+                   b2.add(b.POP);
+
                    if (peekToken() == RP) { consume(RP); break; }
                    consume(COMMA);
                }
+               numArgs++;
            }
-           return new Expr(curLine, FUNCTION, list, parseBlock(true));
+           // pop off the arguments array
+           b2.add(b.POP);
+           parseStatement(true, b2);
+           b2.add(b.LITERAL, null);
+           b2.add(RETURN);
+           return continueExpr(b.add(OpCodes.FUNCTION, b2), minPrecedence);
        }
-           
-       case VAR: {
-           if (prefix != null) { pushBackToken(); return prefix; }
-           ExprList list = new ExprList(curLine, VAR);
-           while(true) {
-               if (getToken() != NAME) throw new ParserException("variable declarations must start with a variable name");
-               String name = string;
-               Expr initVal = null;
-               tok = peekToken();
-               Expr e = null;
-               if (tok == ASSIGN) {
-                   getToken();
-                   initVal = parseMaximalExpr();
-                   tok = peekToken();
-                   e = new Expr(curLine, VAR,
-                                new Expr(curLine, name),
-                                new Expr(curLine, ASSIGN,
-                                         new Expr(curLine, name),
-                                         initVal));
-               } else {
-                   e = new Expr(curLine, VAR, new Expr(curLine, name));
-               }
-               list.add(e);
-               if (tok != COMMA) break;
-               getToken();
-           }
-           return list;
+       default: pushBackToken(); return null;
+       }
+    }
+
+
+    /** return the largest expression beginning with prefix containing no operators of precedence below <tt>minPrecedence</tt> */
+    public ForthBlock continueExpr(ForthBlock prefix, int minPrecedence) throws IOException {
+       return continueExpr(prefix, minPrecedence, new ForthBlock(line, sourceName));
+    }
+    public ForthBlock continueExpr(ForthBlock prefix, int minPrecedence, ForthBlock appendTo) throws IOException {
+       int tok = getToken();
+       int curLine = line;
+       if (tok == -1) return prefix;
+       if (minPrecedence > 0 && precedence[tok] != 0)
+           if (precedence[tok] < minPrecedence || (precedence[tok] == minPrecedence && !isRightAssociative[tok]))
+               { pushBackToken(); return prefix; }
+
+       if (prefix == null) throw new Error("got null prefix");
+
+       ForthBlock b = appendTo;
+
+       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: {
+           b.add(b.EXPR, prefix);
+           prefix.set(prefix.size() - 1, b.GET_PRESERVE, new Boolean(true));
+           prefix.add(prefix.EXPR, startExpr(precedence[tok - 1]));
+           prefix.add(tok - 1);
+           prefix.add(b.PUT);
+           prefix.add(b.SWAP);
+           prefix.add(b.POP);
+           return continueExpr(b, minPrecedence);
        }
 
-       case TRY: {
-           // We deliberately allow you to omit braces in catch{}/finally{} if they are single statements...
-           if (prefix != null) { pushBackToken(); return prefix; }
-           Expr tryBlock = parseBlock(true);
-           
-           tok = peekToken();
-           ExprList list = new ExprList(curLine, TRY);
-           if (tok == CATCH) {
-               getToken();
-               if (getToken() != LP) throw new ParserException("expected (");
-               if (getToken() != NAME) throw new ParserException("expected name");
-               Expr name = new Expr(curLine, NAME, string);
-               if (getToken() != RP) throw new ParserException("expected )");
-               list.add(new Expr(curLine, CATCH, name, parseBlock(false)));
-               tok = peekToken();
-           }
-           if (tok == FINALLY) {
-               getToken();
-               list.add(new Expr(curLine, FINALLY, parseBlock(false)));
+       case INC: case DEC: {
+           // postfix
+           prefix.set(prefix.size() - 1, tok, new Boolean(false));
+           b.add(b.EXPR, prefix);
+           return continueExpr(b, minPrecedence);
+       }
+
+       case LP: {
+           // invocation
+           int i = 0;
+           b.add(b.EXPR, prefix);
+           while(peekToken() != RP) {
+               b.add(b.EXPR, startExpr());
+               i++;
+               if (peekToken() == RP) break;
+               consume(COMMA);
            }
+           consume(RP);
+           b.add(b.CALL, new Integer(i));
+           return continueExpr(b, minPrecedence);
+       }
 
-           if (list.size() == 0) throw new ParserException("try without catch or finally");
-           return new Expr(curLine, TRY, tryBlock, list);
+        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 GT: case GE: case EQ: case NE: case LT: case LE: case SUB: {
+           b.add(b.EXPR, prefix);
+           b.add(b.EXPR, startExpr(precedence[tok]));
+           b.add(tok);
+           return continueExpr(b, minPrecedence);
        }
 
-       case IF: case WHILE: {
-           if (prefix != null) { pushBackToken(); return prefix; }
-           if (getToken() != LP) throw new ParserException("expected left paren");
-           Expr parenExpr = parseMaximalExpr();
-           int t;
-           if ((t = getToken()) != RP) throw new ParserException("expected right paren, but got " + codeToString[t]);
-           Expr firstBlock = parseBlock(false);
-           if (tok == IF && peekToken() == ELSE) {
-               getToken();
-               return new Expr(curLine, tok, parenExpr, new Expr(curLine, ELSE, firstBlock, parseBlock(false)));
+       case OR: case AND: {
+           b.add(b.LITERAL, tok == AND ? new Boolean(false) : new Boolean(true));
+           b.add(b.EXPR, prefix);
+           b.add(tok == AND ? b.JF : b.JT, new Integer(3));
+           b.add(b.POP);
+           b.add(b.EXPR, startExpr(precedence[tok]));
+           return continueExpr(b, minPrecedence);
+       }
+
+       case DOT: {
+           consume(NAME);
+           String target = string;
+           b.add(b.EXPR, prefix);
+           if (peekToken() == ASSIGN) {
+               consume(ASSIGN);
+               ForthBlock val = startExpr();
+               b.add(b.LITERAL, target);
+               b.add(b.EXPR, val);
+               b.add(b.PUT);
+               b.add(b.SWAP);
+               b.add(b.POP);
            } else {
-               if (tok == IF) return new Expr(curLine, tok, parenExpr, firstBlock);
-               if (tok == WHILE) {
-                   ExprList list = new ExprList(curLine, WHILE);
-                   list.add(parenExpr);
-                   list.add(firstBlock);
-                   list.add(new Expr(curLine, NULL));
-                   return list;
-               }
+               b.add(b.LITERAL, target);
+               b.add(b.GET);
            }
+           return continueExpr(b, minPrecedence);
        }
 
-       case IN: pushBackToken(); return prefix;
-
-       case FOR:
-           if (prefix != null) { pushBackToken(); return prefix; }
-           if (getToken() != LP) throw new ParserException("expected left paren");
-           e1 = parseMaximalExpr();
-           if (peekToken() == IN) {
-               getToken();
-               e2 = parseMaximalExpr();
-               if (getToken() != RP) throw new ParserException("expected right paren");
-               return new Expr(curLine, FOR, new Expr(curLine, IN, e1.left, e2), parseBlock(false));
-               
+       case LB: {
+           b.add(b.EXPR, prefix);
+           b.add(b.EXPR, startExpr());
+           consume(RB);
+           if (peekToken() == ASSIGN) {
+               consume(ASSIGN);
+               b.add(b.EXPR, startExpr());
+               b.add(b.PUT);
+               b.add(b.SWAP);
+               b.add(b.POP);
            } else {
-               Expr initExpr = e1;
-               if (initExpr == null) initExpr = new Expr(curLine, NULL);
-               expect(SEMI); getToken();
-               Expr whileExpr = parseMaximalExpr();
-               expect(SEMI); getToken();
-               Expr incExpr = parseMaximalExpr();
-               expect(RP); getToken();
-               Expr body = parseBlock(false);
-               Expr loop = new Expr(curLine, WHILE, whileExpr, body);
-               ExprList list = new ExprList(curLine, LC);
-               list.add(initExpr);
-               ExprList list2 = new ExprList(curLine, WHILE);
-               list.add(list2);
-               list2.add(whileExpr);
-               list2.add(body);
-               list2.add(incExpr);
-               return list;
+               b.add(b.GET);
            }
-           
-       case DO: {
-           if (prefix != null) { pushBackToken(); return prefix; }
-           ExprList list = new ExprList(curLine, DO);
-           Expr body = parseBlock(false);
-           consume(WHILE);
-           consume(LP);
-           list.add(parseMaximalExpr());
-           list.add(body);
-           list.add(new Expr(curLine, NULL));
-           consume(RP);
-           consume(SEMI);
-           return list;
+           return continueExpr(b, minPrecedence);
        }
-           
-       default:
-           pushBackToken();
-           return prefix;
+
+       case HOOK: {
+           b.add(b.EXPR, prefix);
+           b.add(b.JF, new Integer(3));
+           b.add(b.EXPR, startExpr());
+           b.add(b.JMP, new Integer(2));
+           consume(COLON);
+           b.add(b.EXPR, startExpr());
+           return continueExpr(b, minPrecedence);
        }
-    }
-    
-    // Expr //////////////////////////////////////////////////////////////////////
-
-    class ExprList extends Expr {
-       Vec v = new Vec();
-       public ExprList(int curLine, int code) { super(curLine, code); }
-       public void add(Expr e) { v.addElement(e); }
-       public int numExprs() { return v.size(); }
-       public int size() { return v.size(); }
-       public Expr elementAt(int i) { return (Expr)v.elementAt(i); }
-       public Object eval(final JS.Scope s) throws ControlTransferException, JS.Exn {
-           switch(code) {
-           case LC: {
-               // Block
-               JS.Scope scope = new JS.Scope(s);
-               for(int i=0; i<v.size(); i++) ((Expr)v.elementAt(i)).eval(scope);
-               return null;
-           }
-           case Lexer.LB: {
-               // Array ctor
-               JS.Array ret = new JS.Array();
-               for(int i=0; i<numExprs(); i++) ret.addElement(elementAt(i).eval(s));
-               return ret;
-           }
-           case Lexer.RC: {
-               // Object ctor
-               JS.Obj ret = new JS.Obj();
-               for(int i=0; i<numExprs(); i++) {
-                   Expr e = elementAt(i);
-                   Object key = e.left.string;
-                   Object val = e.right.eval(s);
-                   ret.put(key, val);
-               }
-               return ret;
-           }
-           case Lexer.WHILE:
-           case Lexer.DO:
-               try {
-                   boolean first = true;
-                   Object bogus = null;
-                   ExprList list = this;
-                   Expr whileExpr = list.elementAt(0);
-                   Expr bodyExpr = list.elementAt(1);
-                   Expr incExpr = list.elementAt(2);
-                   for(;(first && code == Lexer.DO) || toBoolean(whileExpr.eval(s)); bogus = incExpr.eval(s)) {
-                       first = false;
-                       try { bodyExpr.eval(s);
-                       } catch (ContinueException c) {
-                           if (c.label == null || c.label.equals(string)) continue;
-                       } catch (BreakException b) {
-                           if (b.label == null || b.label.equals(string)) return null;
-                           throw (BreakException)b.fillInStackTrace();
-                       }
-                   }
-               } catch (BreakException e) {
-                   if (e.label != null && !e.label.equals(string)) throw e;
-               }
-               return null;
-           case Lexer.VAR:
-               for(int i=0; i<size(); i++) {
-                   Expr e = elementAt(i);
-                   s.declare(e.left.string);
-                   if (e.right != null) e.right.eval(s);
-               }
-               return null;
-           default: throw new Error("augh!");
-           }
+           
+           
+       default: pushBackToken(); return prefix;
        }
     }
     
     /** a block is either a single statement or a list of statements surrounded by curly braces; all expressions are also statements */
-    public Expr parseBlock(boolean requireBraces) throws IOException {
-       Expr smt = null;
+    public ForthBlock parseStatement() throws IOException {
+       ForthBlock ret = new ForthBlock(line, sourceName);
+       ret.add(ret.LITERAL, null);
+       parseStatement(false, ret);
+       if (ret.size() == 1) return null;
+       return ret;
+    }
+
+    public void parseStatement(boolean requireBraces) throws IOException {
+       parseStatement(requireBraces, new ForthBlock(line, sourceName));
+    }
+    public void parseStatement(boolean requireBraces, ForthBlock b) throws IOException {
        int tok = peekToken();
-       if (tok == -1) return null;
+       if (tok == -1) return;
        boolean braced = tok == LC;
        if (requireBraces && !braced) throw new ParserException("expected {, got " + codeToString[tok]);
-       if (braced) getToken();
+       if (braced) consume(LC);
        int curLine = line;
-       ExprList block = new ExprList(curLine, LC);
        while(true) {
            switch(tok = peekToken()) {
 
-           case -1:
-               return block;
-
-           case LC:
-               smt = parseBlock(true); break;
-
-           case THROW: case RETURN: case ASSERT:
+           case THROW: case RETURN: case ASSERT: {
                getToken();
-               if (peekToken() == SEMI) {
-                   if (tok == THROW || tok == ASSERT) throw new ParserException(codeToString[tok] + " requires an argument");
-                   consume(SEMI);
-                   smt = new Expr(curLine, tok);
-               } else {
-                   smt = new Expr(curLine, tok, parseMaximalExpr());
-                   consume(SEMI);
-               }
+               if (tok == RETURN && peekToken() == SEMI) b.add(b.LITERAL, null);
+               else b.add(b.EXPR, startExpr());
+               consume(SEMI);
+               b.add(tok);
                break;
+           }
 
-           case GOTO: case BREAK: case CONTINUE: {
+           case BREAK: case CONTINUE: {
                getToken();
-               int t = peekToken();
-               if (t == NAME) {
-                   getToken();
-                   smt = new Expr(curLine, tok, new Expr(curLine, string));
-               } else if (tok == GOTO) {
-                   throw new ParserException("goto must be followed by a label");
-               }
-               smt = new Expr(curLine, tok, new Expr(curLine, string));
+               if (peekToken() == NAME) consume(NAME);
+               b.add(tok, string);
                consume(SEMI);
                break;
            }
                
-           case RC:
-               if (braced) consume(RC);
-               return block;
-               
            case SEMI:
                consume(SEMI);
-               if (!braced) return block;
-               continue;
+               if (!braced) return;
+               break;
                
-/*  FIXME: LL(2)
-           case NAME: {
-               String name = string;
-               getToken();
-               if (peekToken() == COLON) {
-                   smt = new Expr(curLine, COLON, new Expr(curLine, name), parseBlock(false));
-                   break;
-               } else {
-                   pushBackToken(tok);
-                   string = name;
-                   // fall through to default case
-               }
-           }
-*/             
-           default:
-               smt = parseMaximalExpr();
-               if (smt == null) {
-                   if (block.numExprs() == 0) return null;
-                   return block;
+           case VAR: {
+               consume(VAR);
+               b.add(THIS);                               // push the current scope
+               while(true) {
+                   consume(NAME);
+                   String name = string;
+                   b.add(b.LITERAL, name);                // push the name to be declared
+                   b.add(b.DECLARE);                      // declare it
+                   if (peekToken() == ASSIGN) {           // if there is an '=' after the variable name
+                       b.add(b.LITERAL, name);            // put the var name back on the stack
+                       consume(ASSIGN);
+                       b.add(b.EXPR, startExpr());
+                       b.add(b.PUT);
+                       b.add(b.POP);
+                   }
+                   if (peekToken() != COMMA) break;
+                   consume(COMMA);
                }
-               if (peekToken() == SEMI) getToken();
+               b.add(b.POP);
+               if (peekToken() == SEMI) consume(SEMI);
                break;
            }
-
-           if (!braced) return smt;
-           block.add(smt);
-       }
-    }
-    
-
-    /** sorta like gcc trees */
-    class Expr {
-       int code = -1;
-    
-       final Expr left;
-       final Expr right;
-       int line = -1;
-       String sourceName = "unknown";
-    
-       String string = null;
-       Number number = null;
-    
-       public String toString() { return toString(0); }
-       public String toString(int indent) {
-           String ret = "";
-           for(int i=0; i<indent; i++) ret += " ";
-           ret += Lexer.codeToString[code];
-           if (code == Lexer.NUMBER) ret += " " + number;
-           else if (string != null) ret += " \"" + string + "\"";
-           ret += "\n";
-           if (left != null) ret += left.toString(indent + 2);
-           if (right != null) ret += right.toString(indent + 2);
-           return ret;
-       }
-    
-       public Expr(int line, String s) { this(line, Lexer.STRING); this.string = s; }  // an identifier or label
-       public Expr(int line, int code, String s) { this(line, code); this.string = s; }
-       public Expr(int line, Number n) { this(line, Lexer.NUMBER); this.number = n; }  // an identifier or label
-       public Expr(int line, int code) { this(line, code, null, null); }
-       public Expr(int line, int code, Expr left) { this(line, code, left, null); }
-       public Expr(int line, int code, Expr left, Expr right) {
-           this.code = code; this.left = left; this.right = right;
-           this.line = line;
-           this.sourceName = Parser.this.sourceName;
-       }
-
-       public double toDouble(Object o) { return toNumber(o).doubleValue(); }
-       public long toLong(Object o) { return toNumber(o).longValue(); }
-       public boolean toBoolean(Object o) {
-           if (o == null) return false;
-           if (o instanceof Boolean) return ((Boolean)o).booleanValue();
-           if (o instanceof Number) return o.equals(new Integer(0));
-           return true;
-       }
-
-       public Object eval(final JS.Scope s) throws ControlTransferException, JS.Exn {
-           switch(code) {
-
-           case Lexer.BITOR: return new Long(toLong(left.eval(s)) | toLong(right.eval(s)));
-           case Lexer.BITXOR: return new Long(toLong(left.eval(s)) ^ toLong(right.eval(s)));
-           case Lexer.BITAND: return new Long(toLong(left.eval(s)) & toLong(right.eval(s)));
-           case Lexer.BITNOT: return new Long(~toLong(left.eval(s)));
-
-           case Lexer.ADD: {
-               Object l = left.eval(s);
-               Object r = right.eval(s);
-               if (l instanceof String || r instanceof String) {
-                   if (l == null) l = "null";
-                   if (r == null) r = "null";
-                   if (l instanceof Number && ((Number)l).doubleValue() == ((Number)l).longValue())
-                       l = new Long(((Number)l).longValue());
-                   if (r instanceof Number && ((Number)r).doubleValue() == ((Number)r).longValue())
-                       r = new Long(((Number)r).longValue());
-                   return l.toString() + r.toString();
+               
+           case IF: {
+               consume(IF);
+               consume(LP);
+               b.add(b.EXPR, startExpr());
+               consume(RP);
+               b.add(b.JF, new Integer(4));
+               b.add(b.EXPR, parseStatement());
+               b.add(b.POP);
+               b.add(b.JMP, new Integer(3));
+               if (peekToken() == ELSE) {
+                   consume(ELSE);
+                   b.add(b.EXPR, parseStatement());
+                   b.add(b.POP);
+               } else {
+                   b.add(b.JMP, new Integer(1));  // nop
+                   b.add(b.JMP, new Integer(1));  // nop
                }
-               return new Double(toDouble(l) + toDouble(r));
-           }
-
-           case Lexer.SUB: return new Double(toDouble(left.eval(s)) - toDouble(right.eval(s)));
-           case Lexer.MUL: return new Double(toDouble(left.eval(s)) * toDouble(right.eval(s)));
-           case Lexer.DIV: return new Double(toDouble(left.eval(s)) / toDouble(right.eval(s)));
-           case Lexer.MOD: return new Double(toDouble(left.eval(s)) % toDouble(right.eval(s)));
-
-           case Lexer.LSH: return new Long(toLong(left.eval(s)) << toLong(right.eval(s)));
-           case Lexer.RSH: return new Long(toLong(left.eval(s)) >> toLong(right.eval(s)));
-           case Lexer.URSH: return new Long(toLong(left.eval(s)) >>> toLong(right.eval(s)));
-
-               // FIXME: these need to work on strings
-           case Lexer.LT: return toDouble(left.eval(s)) < toDouble(right.eval(s)) ? Boolean.TRUE : Boolean.FALSE;
-           case Lexer.LE: return toDouble(left.eval(s)) <= toDouble(right.eval(s)) ? Boolean.TRUE : Boolean.FALSE;
-           case Lexer.GT: return toDouble(left.eval(s)) > toDouble(right.eval(s)) ? Boolean.TRUE : Boolean.FALSE;
-           case Lexer.GE: return toDouble(left.eval(s)) >= toDouble(right.eval(s)) ? Boolean.TRUE : Boolean.FALSE;
-
-           case Lexer.OR: {
-               boolean b1 = toBoolean(left.eval(s));
-               if (b1) return Boolean.TRUE;
-               return new Boolean(b1 || toBoolean(right.eval(s)));
-           }
-
-           case Lexer.AND: {
-               boolean b1 = toBoolean(left.eval(s));
-               if (!b1) return Boolean.FALSE;
-               return new Boolean(b1 && toBoolean(right.eval(s)));
+               break;
            }
 
-           case Lexer.BANG: return new Boolean(!toBoolean(left.eval(s)));
-
-           case Lexer.EQ:
-           case Lexer.NE: {
-               // FIXME: should use Javascript coercion-equality rules
-               Object l = left.eval(s);
-               Object r = right.eval(s);
-               boolean ret;
-               if (l == null) { Object t = r; r = l; l = t; }
-               if (l == null && r == null) ret = true;
-               else if (l instanceof Boolean) ret = new Boolean(toBoolean(r)).equals(l);
-               else if (l instanceof Number) ret = toNumber(r).doubleValue() == toNumber(l).doubleValue();
-               else if (l instanceof String) ret = r != null && l.equals(r.toString());
-               else ret = l.equals(r);
+           case WHILE: {
+               consume(WHILE);
+               consume(LP);
+               ForthBlock loop = new ForthBlock(curLine, sourceName);
+               b.add(loop.LOOP, loop);
+               
+               loop.add(loop.POP);
+               loop.add(loop.EXPR, startExpr());
+               loop.add(loop.JT, new Integer(2));
+               loop.add(Lexer.BREAK);
+               consume(RP);
+               parseStatement(false, loop);
                
-               return new Boolean(code == Lexer.EQ ? ret : !ret);
+               // if we fall out of the end, definately continue
+               loop.add(CONTINUE);
+               break;
            }
 
-           case Lexer.INC:
-           case Lexer.DEC:
-           case Lexer.ASSIGN: {
-               Object v = (code == Lexer.ASSIGN) ? right.eval(s) : new Double(toDouble(left.eval(s)) + (code == Lexer.INC ? 1 : -1));
-               if (left.code == Lexer.DOT) {
-                   Object o = left.left.eval(s);
-                   if (o instanceof String) {
-                       throw new EvaluatorException("can't set properties on a String");
-                   } else if (o instanceof Number) {
-                       throw new EvaluatorException("can't set properties on a Number");
-                   } else if (o instanceof Boolean) {
-                       throw new EvaluatorException("can't set properties on a Boolean");
-                   } else {
-                       JS target = (JS)o;
-                       if (target == null) throw new JS.Exn(new EvaluatorException("attempted to put to the null value"));
-                       target.put(left.right.eval(s), v);
-                       return v;
+           case SWITCH: {
+               consume(SWITCH);
+               consume(LP);
+               ForthBlock loop = new ForthBlock(curLine, sourceName);
+               b.add(loop.LOOP, loop);
+               loop.add(loop.EXPR, startExpr());
+               consume(RP);
+               consume(LC);
+               while(true) {
+                   ForthBlock caseForthBlock;
+                   tok = getToken();
+                   if (tok == CASE) {
+                       loop.add(loop.DUP);
+                       loop.add(loop.EXPR, startExpr());
+                       loop.add(EQ);
+                       loop.add(loop.JF, new Integer(2));
+                   } else if (tok != DEFAULT) throw new ParserException("expected CASE or DEFAULT");
+                   consume(COLON);
+                   ForthBlock b2 = new ForthBlock(curLine, sourceName);
+                   ForthBlock e1 = null;
+                   while(peekToken() != CASE && peekToken() != DEFAULT && peekToken() != RC) {
+                       if ((e1 = parseStatement()) == null) break;
+                       b2.add(b.EXPR, e1);
+                       b2.add(b.POP);
+                   }
+                   loop.add(loop.EXPR, b2);
+                   if (peekToken() == RC) {
+                       consume(RC);
+                       loop.add(BREAK);
+                       break;
                    }
-               } else {
-                   s.put(left.string, v);
-                   return v;
                }
+               break;
            }
-
-           case Lexer.TYPEOF: {
-               Object o = left.eval(s);
-               if (o == null) return "null";
-               if (o.getClass() == String.class) return "string";
-               if (o.getClass() == Boolean.class) return "boolean";
-               if (o instanceof Number) return "number";
-               if (o instanceof JS.Array) return "array";
-               if (o instanceof JS) return "object";
-               throw new EvaluatorException("typeof " + o.getClass().getName() + " unknown");
+               
+           case DO: {
+               consume(DO);
+               ForthBlock loop = new ForthBlock(curLine, sourceName);
+               b.add(loop.LOOP, loop);
+               
+               parseStatement(false, loop);
+               consume(WHILE);
+               consume(LP);
+               loop.add(loop.EXPR, startExpr());
+               loop.add(loop.JT, new Integer(2));
+               loop.add(Lexer.BREAK);
+               loop.add(Lexer.CONTINUE);
+               consume(RP);
+               consume(SEMI);
+               break;
            }
-
-           case Lexer.NUMBER: return number;
-           case Lexer.STRING: return string;
-
-           case Lexer.NULL: return null;
-           case Lexer.FALSE: return Boolean.FALSE;
-           case Lexer.TRUE: return Boolean.TRUE;
-           case Lexer.ASSERT: if (!toBoolean(left.eval(s))) throw new EvaluatorException("assertion failed");
-           case Lexer.THROW: throw new JS.Exn(left.eval(s));
-           case Lexer.NAME: return s.get(string);
-           case Lexer.THIS: return s.isTransparent() ? s : this.eval(s.getParentScope());
-           case Lexer.DOT: {
-               final Object o = left.eval(s);
-               if (o == null) throw new EvaluatorException("tried to get a property from the null value");
-               Object v = (right.code == Lexer.STRING) ? right.string : right.eval(s);
-               if (o instanceof String) {
-                   if (v.equals("length")) return new Integer(((String)o).length());
-                   else if (v.equals("substring")) return new JS.Function() {
-                           public Object _call(JS.Array args) {
-                               if (args.length() == 1) return ((String)o).substring(toNumber(args.elementAt(0)).intValue());
-                               else if (args.length() == 2) return ((String)o).substring(toNumber(args.elementAt(0)).intValue(),
-                                                                                         toNumber(args.elementAt(1)).intValue());
-                               else throw new EvaluatorException("String.substring() can only take one or two arguments");
-                           }
-                       };
-                   else if (v.equals("toLowerCase")) return new JS.Function() {
-                           public Object _call(JS.Array args) {
-                               return ((String)o).toLowerCase();
-                           } };
-                   else if (v.equals("toUpperCase")) return new JS.Function() {
-                           public Object _call(JS.Array args) {
-                               return ((String)o).toString().toUpperCase();
-                           } };
-                   else if (v.equals("charAt")) return new JS.Function() {
-                           public Object _call(JS.Array args) {
-                               return ((String)o).charAt(toNumber(args.elementAt(0)).intValue()) + "";
-                           } };
-                   else if (v.equals("lastIndexOf")) return new JS.Function() {
-                           public Object _call(JS.Array args) {
-                               if (args.length() != 1) return null;
-                               return new Integer(((String)o).lastIndexOf(args.elementAt(0).toString()));
-                           } };
-                   else if (v.equals("indexOf")) return new JS.Function() {
-                           public Object _call(JS.Array args) {
-                               if (args.length() != 1) return null;
-                               return new Integer(((String)o).indexOf(args.elementAt(0).toString()));
-                           } };
-                   throw new EvaluatorException("Not Implemented: properties on String objects");
-               } else if (o instanceof Boolean) {
-                   throw new EvaluatorException("Not Implemented: properties on Boolean objects");
-               } else if (o instanceof Number) {
-                   Log.log(this, "Not Implemented: properties on Number objects");
-                   return null;
-                   //throw new EvaluatorException("Not Implemented: properties on Number objects");
-               } else if (o instanceof JS) {
-                   return ((JS)o).get(v);
+               
+           case TRY: {
+               // FIXME: don't just ignore this!
+               // We deliberately allow you to omit braces in catch{}/finally{} if they are single statements...
+               consume(TRY);
+               parseStatement(true, b);
+               
+               if (peekToken() == CATCH) {
+                   getToken();
+                   consume(LP);
+                   consume(NAME);
+                   consume(RP);
+                   parseStatement();   // just discard the catchblock
                }
-           }
 
-           case Lexer.TRY: {
-               boolean safeToExit = false;
-               try {
-                   Object ret = left.eval(s);
-                   safeToExit = true;
-                   return ret;
-               } catch (JS.Exn e) {
-                   ExprList list = (ExprList)right;
-                   Expr c = list.elementAt(0);
-                   if (c.code == Lexer.CATCH) {
-                       JS.Scope scope = new JS.Scope(s);
-                       s.put(c.left.string, e);
-                       c.right.eval(scope);
-                       c = list.elementAt(1);
-                   }
-                   if (c.code == Lexer.FINALLY) {
-                       JS.Scope scope = new JS.Scope(s);
-                       c.left.eval(scope);
-                   }
-               } finally {
-                   if (!safeToExit) Log.log(this, "WARNING: Java exception penetrated a JavaScript try{} block");
+               if (peekToken() == FINALLY) {
+                   consume(FINALLY);
+                   parseStatement(false, b);
                }
-               return null;
+               break;
            }
 
-           case Lexer.LP:
-               JS.Function f = (JS.Function)left.eval(s);
-               JS.Array arguments = new JS.Array();
-               for(int i=0; i<((ExprList)right).numExprs(); i++) arguments.addElement(((ExprList)right).elementAt(i).eval(s));
-               if (f == null) throw new JS.Exn(new EvaluatorException("attempted to call null"));
-               return f.call(arguments);
-           
-           case Lexer.FUNCTION:
-               return new JS.Function() {
-                       public String toString() { return right.sourceName + ":" + right.line; }
-                       public String getSourceName() throws JS.Exn { return right.sourceName; }
-                       public Object _call(final JS.Array args) throws JS.Exn {
-                           Function save = JS.getCurrentFunction();
-                           JS.currentFunction.put(Thread.currentThread(), this);
-                           JS.Scope scope = new JS.Scope(s) {
-                                   // FIXME
-                                   public String getSourceName() { return sourceName; }
-                                   public Object get(Object key) throws JS.Exn {
-                                       if (key.equals("trapee")) return org.xwt.Trap.currentTrapee();
-                                       else if (key.equals("cascade")) return org.xwt.Trap.cascadeFunction;
-                                       else if (key.equals("arguments")) return args;
-                                       return super.get(key);
-                                   }
-                               };
-                           int i = 0;
-                           ExprList list = (ExprList)left;
-                           for(i=0; i<list.size(); i++) {
-                               scope.declare(list.elementAt(i).string);
-                               scope.put(list.elementAt(i).string, args.get(new Integer(i)));
-                           }
-                           try {
-                               return right.eval(scope);
-                           } catch (ReturnException r) {
-                               return r.retval;
-                           } catch (ControlTransferException c) {
-                               throw new EvaluatorException("error, ControlTransferException tried to leave a function: "
-                                                            + c);
-                           } finally {
-                               if (save == null) JS.currentFunction.remove(Thread.currentThread());
-                               else JS.currentFunction.put(Thread.currentThread(), save);
-                           }
-                       }
-                   };
+       case FOR: {
+           consume(FOR);
+           consume(LP);
+
+           tok = getToken();
+           if (tok == VAR) tok = getToken();
+           String varName = string;
+           boolean forIn = peekToken() == IN;
+           pushBackToken(tok, varName);
+
+           if (forIn) {
+               consume(NAME);
+               consume(IN);
+               b.add(b.EXPR, startExpr());
+               b.add(b.PUSHKEYS);
+               b.add(b.LITERAL, "length");
+               b.add(b.GET);
+               consume(RP);
+               ForthBlock b2 = new ForthBlock(curLine, sourceName);
+               b.add(b.SCOPE, b2);
+               b2.add(b.LITERAL, new Integer(1));
+               b2.add(SUB);
+               b2.add(b.DUP);
+               b2.add(b.LITERAL, new Integer(0));
+               b2.add(LT);
+               b2.add(b.JT, new Integer(7));
+               b2.add(b.GET_PRESERVE);
+               b2.add(b.LITERAL, varName);
+               b2.add(b.LITERAL, varName);
+               b2.add(b.DECLARE);
+               b2.add(b.PUT);
+               b2.add(b.EXPR, parseStatement());
+               //b2.add(b.LITERAL, null);
+               break;
                
-           case Lexer.FOR:
-               Object[] keys = ((JS)left.right.eval(s)).keys();
-               for(int i=0; i<keys.length; i++) {
-                   JS.Scope scope = new JS.Scope(s);
-                   scope.declare(left.string);
-                   scope.put(left.string, keys[i]);
-                   try {
-                       right.eval(scope);
-                   } catch (ContinueException c) {
-                       if (c.label == null || c.label.equals(string)) continue;
-                   } catch (BreakException b) {
-                       if (b.label == null || b.label.equals(string)) return null;
-                       throw (BreakException)b.fillInStackTrace();
-                   }
-               }
-               return null;
-
-           case Lexer.SWITCH:
-               Object switchVal = left.eval(s);
-               boolean go = false;
-               try {
-                   ExprList list = (ExprList)right;
-                   for(int i=0; i<list.size(); i++) {
-                       Expr e = list.elementAt(i);
-                       if (go || e.code == Lexer.DEFAULT || e.left.eval(s).equals(switchVal)) go = true;
-                       if (go) e.right.eval(s);
-                   }
-               } catch (BreakException b) {
-                   if (b.label == null || b.label.equals(string)) return null;
-                   throw (BreakException)b.fillInStackTrace();
-               }
-               return null;
-
-           case Lexer.HOOK: return toBoolean(left.eval(s)) ? right.left.eval(s) : right.right.eval(s);
-           case Lexer.IF:
-               if (right.code == ELSE) {
-                   if (toBoolean(left.eval(s))) right.left.eval(s);
-                   else right.right.eval(s);
-                   return null;
-               } else {
-                   if (toBoolean(left.eval(s))) right.eval(s);
-                   return null;
-               }
-           case Lexer.BREAK: throw new BreakException(string);
-           case Lexer.CONTINUE: throw new ContinueException(string);
-           case Lexer.RETURN: throw new ReturnException(left == null ? null : left.eval(s));
+           } else {
+               ForthBlock b2 = new ForthBlock(curLine, sourceName);
+               b.add(b.SCOPE, b2);
+               b.add(b.POP);
 
-           default: throw new EvaluatorException("don't know how to eval an Expr with code " + Lexer.codeToString[code] + "\n" + this);
+               ForthBlock e1 = startExpr();
+               if (e1 == null) e1 = new ForthBlock(curLine, sourceName, b.LITERAL, null);
+
+               b2.add(b.EXPR, e1);
+               b2.add(b.POP);
+               consume(SEMI);
+               ForthBlock e2 = startExpr();
+               consume(SEMI);
+               ForthBlock e3 = startExpr();
+               consume(RP);
+
+               if (e2 == null) e2 = new ForthBlock(curLine, sourceName, b.LITERAL, null);
+               if (e3 == null) e3 = new ForthBlock(curLine, sourceName, b.LITERAL, null);
+
+               ForthBlock b3 = new ForthBlock(curLine, sourceName);
+               b2.add(b.LOOP, b3);
+               b2.add(b.LITERAL, null);
+               b3.add(b.JT, new Integer(3));
+               b3.add(b.EXPR, e3);
+               b3.add(b.POP);
+               b3.add(b.EXPR, e2);
+               b3.add(b.JT, new Integer(2));
+               b3.add(BREAK);
+               parseStatement(false, b3);
+               b3.add(BREAK);
+               break;
            }
        }
-
-       class EvaluatorException extends RuntimeException {
-           public EvaluatorException(String s) { super(sourceName + ":" + line + " " + s); }
+           
+           case NAME: {
+               consume(NAME);
+               String name = string;
+               if (peekToken() == COLON) {
+                   consume(COLON);
+                   b.add(ForthBlock.LABEL, string);
+                   break;
+               } else {
+                   pushBackToken(NAME, name);
+                   // fall through to default case
+               }
+           }
+            // fall through
+           case RC:
+               if (tok == RC && braced) { consume(RC); return; }
+            // fall through
+           default: {
+               ForthBlock ret = startExpr();
+               if (ret == null) return;
+               b.add(b.EXPR, ret);
+               b.add(b.POP);
+               if (peekToken() == SEMI) consume(SEMI);
+               break;
+           }
+           }
+           
+           if (!braced) return;
        }
     }
-
-       static abstract class ControlTransferException extends Exception { }
-       static class BreakException extends ControlTransferException {
-           public String label;
-           BreakException(String label) { this.label = label; }
-       }
-       static class ContinueException extends ControlTransferException {
-           public String label;
-           ContinueException(String label) { this.label = label; }
-       }
-       static class ReturnException extends ControlTransferException {
-           public Object retval;
-           ReturnException(Object retval) { this.retval = retval; }
-       }
-
+    
     class ParserException extends RuntimeException {
        public ParserException(String s) { super(sourceName + ":" + line + " " + s); }
     }
-
-       public static Number toNumber(Object o) {
-           if (o == null) return new Long(0);
-           if (o instanceof Number) return ((Number)o);
-           if (o instanceof String) try { return new Double((String)o); } catch (NumberFormatException e) { return new Double(0); }
-           if (o instanceof Boolean) return ((Boolean)o).booleanValue() ? new Long(1) : new Long(0);
-           if (o instanceof JS) return ((JS)o).coerceToNumber();
-           // FIXME
-           throw new Error("toNumber() got object of type " + o.getClass().getName());
-       }
- }
+    
+}