var a = 1e+1 was processed incorrectly.

kindy61 · Apr 18, 2009 · 66ef5ad · 66ef5ad
1 parent 52c6f6b
commit 66ef5ad
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/beautify-tests.js b/beautify-tests.js
@@ -149,6 +149,10 @@ function test_js_beautify()
     bt("a = 'a'\nb = 'b'");
     bt("a = /reg/exp");
     bt("a = /reg/");
+
+    bt("a = 1e+2");
+    bt("a = 1e-2");
+
     bt("x(); /reg/exp.match(something)", "x();\n/reg/exp.match(something)");
 
     bt("something();(", "something();\n(");

diff --git a/beautify.js b/beautify.js
@@ -78,7 +78,10 @@ function js_beautify(js_source_text, options)
 
     function print_space()
     {
-        var last_output = output.length ? output[output.length - 1] : ' ';
+        var last_output = ' ';
+        if (output.length) {
+            last_output = output[output.length - 1]
+        }
         if (last_output !== ' ' && last_output !== '\n' && last_output !== indent_string) { // prevent occassional duplicate space
             output.push(' ');
         }
@@ -142,20 +145,27 @@ function js_beautify(js_source_text, options)
     function get_next_token()
     {
         var n_newlines = 0;
-        var c = '';
 
-        do {
+        if (parser_pos >= input.length) {
+            return ['', 'TK_EOF'];
+        }
+
+        var c = input.charAt(parser_pos);
+        parser_pos += 1;
+
+        while (in_array(c, whitespace)) {
             if (parser_pos >= input.length) {
                 return ['', 'TK_EOF'];
             }
-            c = input.charAt(parser_pos);
 
-            parser_pos += 1;
             if (c === "\n") {
                 n_newlines += 1;
             }
+
+            c = input.charAt(parser_pos);
+            parser_pos += 1;
+
         }
-        while (in_array(c, whitespace));
 
         var wanted_newline = false;
 
@@ -181,11 +191,13 @@ function js_beautify(js_source_text, options)
             }
 
             // small and surprisingly unugly hack for 1E-10 representation
-            if (parser_pos !== input.length && c.match(/^[0-9]+[Ee]$/) && input.charAt(parser_pos) === '-') {
+            if (parser_pos !== input.length && c.match(/^[0-9]+[Ee]$/) && (input.charAt(parser_pos) === '-' || input.charAt(parser_pos) === '+')) {
+
+                var sign = input.charAt(parser_pos);
                 parser_pos += 1;
 
                 var t = get_next_token(parser_pos);
-                c += '-' + t[0];
+                c += sign + t[0];
                 return [c, 'TK_WORD'];
             }