2003/06/09 01:48:26

darcs-hash:20040130070056-2ba56-06c125aa1fec1118a26af62f0006a0a3d4e1159c.gz

diff --git a/src/org/xwt/js/Lexer.java b/src/org/xwt/js/Lexer.java
index 4aaf47d..f7039f4 100644 (file)
--- a/src/org/xwt/js/Lexer.java
+++ b/src/org/xwt/js/Lexer.java
@@ -396,7 +396,7 @@ class Lexer implements Tokens {
     public int getToken() throws IOException {
        number = null;
        string = null;
-       if (pushBackDepth == 0) return _getToken();
+       if (pushBackDepth == 0) return op = _getToken();
        pushBackDepth--;
        op = pushBackInts[pushBackDepth];
        if (pushBackObjects[pushBackDepth] != null) {

diff --git a/src/org/xwt/js/Tokens.java b/src/org/xwt/js/Tokens.java
index e9391c1..fc70577 100644 (file)
--- a/src/org/xwt/js/Tokens.java
+++ b/src/org/xwt/js/Tokens.java
@@ -87,12 +87,12 @@ interface Tokens {
     public static final int DEFAULT       = 69;  // default keyword
     public static final int WHILE         = 70;  // while keyword
     public static final int DO            = 71;  // do keyword
-    public static final int FOR           = 74;  // for keyword
-    public static final int VAR           = 75;  // var keyword
-    public static final int WITH          = 76;  // with keyword
-    public static final int CATCH         = 77;  // catch keyword
-    public static final int FINALLY       = 78;  // finally keyword
-    public static final int RESERVED      = 79;  // reserved keyword
+    public static final int FOR           = 72;  // for keyword
+    public static final int VAR           = 73;  // var keyword
+    public static final int WITH          = 74;  // with keyword
+    public static final int CATCH         = 75;  // catch keyword
+    public static final int FINALLY       = 76;  // finally keyword
+    public static final int RESERVED      = 77;  // reserved keyword
  
     public static final int MAX_TOKEN = RESERVED;