Simplified number regexes (#5430)

jashkenas · Oct 25, 2022 · 98a2331 · 98a2331
1 parent 5748210
commit 98a2331
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 14 deletions.
diff --git a/docs/v2/annotated-source/lexer.html b/docs/v2/annotated-source/lexer.html
@@ -2605,9 +2605,9 @@ <h2 id="constants">Constants</h2>
   ^ 0b[01](?:_?[01])*n?                         | <span class="hljs-comment"># binary</span>
   ^ 0o[0-7](?:_?[0-7])*n?                       | <span class="hljs-comment"># octal</span>
   ^ 0x[\da-f](?:_?[\da-f])*n?                   | <span class="hljs-comment"># hex</span>
-  ^ \d+n                                        | <span class="hljs-comment"># decimal bigint</span>
-  ^ (?:\d(?:_?\d)*)?    \.?   (?:\d(?:_?\d)*)+    <span class="hljs-comment"># decimal</span>
-                    (?:e[+-]? (?:\d(?:_?\d)*)+ )?
+  ^ \d+(?:_\d+)*n                               | <span class="hljs-comment"># decimal bigint</span>
+  ^ (?:\d+(?:_\d+)*)?      \.? \d+(?:_\d+)*       <span class="hljs-comment"># decimal</span>
+                     (?:e[+-]? \d+(?:_\d+)* )?
 </span></pre></div></div>
 
         </li>

diff --git a/docs/v2/annotated-source/nodes.html b/docs/v2/annotated-source/nodes.html
@@ -10237,7 +10237,7 @@ <h2 id="constants">Constants</h2>
 
             <div class="content"><div class='highlight'><pre>TAB = <span class="hljs-string">&#x27;  &#x27;</span>
 
-SIMPLENUM = <span class="hljs-regexp">/^[+-]?(?:\d(?:_?\d)*)+$/</span>
+SIMPLENUM = <span class="hljs-regexp">/^[+-]?\d+(?:_\d+)*$/</span>
 SIMPLE_STRING_OMIT = <span class="hljs-regexp">/\s*\n\s*/g</span>
 LEADING_BLANK_LINE  = <span class="hljs-regexp">/^[^\n\S]*\n/</span>
 TRAILING_BLANK_LINE = <span class="hljs-regexp">/\n[^\n\S]*$/</span>

diff --git a/docs/v2/browser-compiler-legacy/coffeescript.js b/docs/v2/browser-compiler-legacy/coffeescript.js
diff --git a/docs/v2/browser-compiler-modern/coffeescript.js b/docs/v2/browser-compiler-modern/coffeescript.js
diff --git a/docs/v2/test.html b/docs/v2/test.html
@@ -29389,6 +29389,9 @@ <h2>Another heading</h2>
 test "Parser recognizes decimal BigInt literals", ->
   eq 42n, BigInt 42
 
+test "Parser recognizes decimal BigInt literals with separator", ->
+  eq 1_000n, BigInt 1000
+
 test "Parser recognizes binary BigInt literals", ->
   eq 42n, 0b101010n
 

diff --git a/lib/coffeescript-browser-compiler-legacy/coffeescript.js b/lib/coffeescript-browser-compiler-legacy/coffeescript.js
diff --git a/lib/coffeescript-browser-compiler-modern/coffeescript.js b/lib/coffeescript-browser-compiler-modern/coffeescript.js
diff --git a/lib/coffeescript/lexer.js b/lib/coffeescript/lexer.js
diff --git a/lib/coffeescript/nodes.js b/lib/coffeescript/nodes.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -1310,9 +1310,9 @@ NUMBER     = ///
   ^ 0b[01](?:_?[01])*n?                         | # binary
   ^ 0o[0-7](?:_?[0-7])*n?                       | # octal
   ^ 0x[\da-f](?:_?[\da-f])*n?                   | # hex
-  ^ \d+n                                        | # decimal bigint
-  ^ (?:\d(?:_?\d)*)?    \.?   (?:\d(?:_?\d)*)+    # decimal
-                    (?:e[+-]? (?:\d(?:_?\d)*)+ )?
+  ^ \d+(?:_\d+)*n                               | # decimal bigint
+  ^ (?:\d+(?:_\d+)*)?      \.? \d+(?:_\d+)*       # decimal
+                     (?:e[+-]? \d+(?:_\d+)* )?
   # decimal without support for numeric literal separators for reference:
   # \d*\.?\d+ (?:e[+-]?\d+)?
 ///i

diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -5772,7 +5772,7 @@ LEVEL_ACCESS = 6  # ...[0]
 # Tabs are two spaces for pretty printing.
 TAB = '  '
 
-SIMPLENUM = /^[+-]?(?:\d(?:_?\d)*)+$/
+SIMPLENUM = /^[+-]?\d+(?:_\d+)*$/
 SIMPLE_STRING_OMIT = /\s*\n\s*/g
 LEADING_BLANK_LINE  = /^[^\n\S]*\n/
 TRAILING_BLANK_LINE = /\n[^\n\S]*$/

diff --git a/test/numbers_bigint.coffee b/test/numbers_bigint.coffee
@@ -7,6 +7,9 @@ test "BigInt exists", ->
 test "Parser recognizes decimal BigInt literals", ->
   eq 42n, BigInt 42
 
+test "Parser recognizes decimal BigInt literals with separator", ->
+  eq 1_000n, BigInt 1000
+
 test "Parser recognizes binary BigInt literals", ->
   eq 42n, 0b101010n