local scope vars indexed by number

[org.ibex.core.git] / src / org / ibex / js / Lexer.java

diff --git a/src/org/ibex/js/Lexer.java b/src/org/ibex/js/Lexer.java
index 6e77eb7..42ec2c7 100644 (file)
--- a/src/org/ibex/js/Lexer.java
+++ b/src/org/ibex/js/Lexer.java
@@ -24,7 +24,7 @@ import java.io.*;
 class Lexer implements Tokens {
 
     /** for debugging */
-    public static void main(String[] s) throws Exception {
+    public static void main(String[] s) throws IOException {
         Lexer l = new Lexer(new InputStreamReader(System.in), "stdin", 0);
         int tok = 0;
         while((tok = l.getToken()) != -1) System.out.println(codeToString[tok]);
@@ -43,7 +43,7 @@ class Lexer implements Tokens {
     protected String string = null;
 
     /** the line number of the most recently <i>lexed</i> token */
-    private int line = 0;
+    protected int line = 0;
 
     /** the line number of the most recently <i>parsed</i> token */
     protected int parserLine = 0;
@@ -137,6 +137,7 @@ class Lexer implements Tokens {
         case "implements": return RESERVED;
         case "instanceof": return RESERVED;
         case "synchronized": return RESERVED;
+        case "cascade": return CASCADE;
         //#end
         return -1;
     }
@@ -194,15 +195,15 @@ class Lexer implements Tokens {
             }
         }
         
-        if (!isInteger) this.number = JS.N(dval);
-        else this.number = JS.N(longval);
+        if (!isInteger) this.number = new Double(dval);
+        else if(longval >= Integer.MIN_VALUE && longval <= Integer.MAX_VALUE) this.number = new Integer((int)longval);
+        else this.number = new Long(longval);
         return NUMBER;
     }
     
     private int getString(int c) throws IOException {
         StringBuffer stringBuf = null;
         int quoteChar = c;
-        int val = 0;
         c = in.read();
         in.startString(); // start after the first "
         while(c != quoteChar) {