[re]-merged in Brians stuff

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

diff --git a/src/org/ibex/js/Lexer.java b/src/org/ibex/js/Lexer.java
index ac6f6e1..42ec2c7 100644 (file)
--- a/src/org/ibex/js/Lexer.java
+++ b/src/org/ibex/js/Lexer.java
@@ -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,8 +195,9 @@ 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;
     }