Interpret numbers in exponential notation.

cweider · Jul 11, 2011 · 7464220 · 7464220
1 parent 7108de3
commit 7464220
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/examples/mini_script.js b/examples/mini_script.js
@@ -48,12 +48,12 @@ var RULES = [
     , function (token) {
         token.value = token.match[1];
       }]
-  , [/[+-]?(?:((?:[1-9][0-9]*|0?)\.[0-9]+|NaN|Infinity)|(0x[0-9a-fA-F]+|[0-9]+))/, 'NUM'
+  , [/[+-]?(?:(0x[0-9a-fA-F]+|0[0-7]+)|((?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?|NaN|Infinity))/, 'NUM'
     , function (token) {
         if (token.match[1]) {
-          token.value = parseFloat(token.match[0]);
-        } else {
           token.value = parseInt(token.match[0]);
+        } else {
+          token.value = parseFloat(token.match[0]);
         }
       }]
   , [/\)/, 'RPAREN']

diff --git a/tests/mini_script.js b/tests/mini_script.js
@@ -59,8 +59,8 @@ assertObjectsEqual((new MiniScript('aMethod(\"aMethod(1)\",\"aMethod(2)\")'))._s
 assertObjectsEqual((new MiniScript('_aMethod(\"aMethod(1)\",\"aMethod(2)\")'))._statements,
     [['_aMethod', ['aMethod(1)','aMethod(2)']]]
     );
-assertObjectsEqual((new MiniScript('aMethod(1,+1,-1,1.001,.999,0xFF,0022,+Infinity,-Infinity,NaN)'))._statements,
-    [['aMethod', [1,+1,-1,1.001,.999,0xFF,0022,+Infinity,-Infinity,NaN]]]
+assertObjectsEqual((new MiniScript('aMethod(1,+1,-1,1.001,.999,0xFF,0022,+Infinity,-Infinity,NaN,10e-10)'))._statements,
+    [['aMethod', [1,+1,-1,1.001,.999,0xFF,0022,+Infinity,-Infinity,NaN,10e-10]]]
     );
 expectException(function () {new MiniScript()})
 expectException(function () {new MiniScript('aMethod(\u2026)')})