Merge pull request #4 from gbaptista/gb-numbers

Numbers
gbaptista · Mar 29, 2022 · bd66dea · bd66dea
2 parents 79bc676 + 37d3806
commit bd66dea
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/Fennel.sublime-syntax b/Fennel.sublime-syntax
@@ -51,11 +51,12 @@ variables:
   evil_octal: '[-+]?0\d+N?(?=[{{non_symbol_chars}}])'
   sign: '[-+]?'
   exponent: (?:[eE]{{sign}}\d+)
-  dec_integer: ({{sign}})\d+(N?)(?=[{{non_number_chars}}])
+  number_separator: \d+(?:_\d+)*
+  dec_integer: ({{sign}}){{number_separator}}(N?)(?=[{{non_number_chars}}])
   hex_integer: ({{sign}})(0[Xx])\h+(N?)(?=[{{non_number_chars}}])
   other_integer: ({{sign}})((?:[2-9]|[1-9]\d+)[Rr])[0-9A-Za-z]+(?=[{{non_number_chars}}])
   rational: ({{sign}})\d+(/)\d+(?=[{{non_number_chars}}])
-  float: ({{sign}})\d+(?:(?:(\.)\d+{{exponent}}?|{{exponent}})(M)?|(M))(?=[{{non_number_chars}}])
+  float: ({{sign}}){{number_separator}}(?:(?:(\.){{number_separator}}{{exponent}}?|{{exponent}})(M)?|(M))(?=[{{non_number_chars}}])
 
 contexts:
   main:
@@ -142,11 +143,11 @@ contexts:
       captures:
         1: punctuation.definition.numeric.sign.fennel
         2: punctuation.definition.numeric.base.fennel
-    - match: '{{rational}}'
-      scope: constant.numeric.rational.decimal.fennel
-      captures:
-        1: punctuation.definition.numeric.sign.fennel
-        2: punctuation.separator.rational.fennel
+    # - match: '{{rational}}'
+    #   scope: constant.numeric.rational.decimal.fennel
+    #   captures:
+    #     1: punctuation.definition.numeric.sign.fennel
+    #     2: punctuation.separator.rational.fennel
     - match: '{{float}}'
       scope: constant.numeric.float.decimal.fennel
       captures:

diff --git a/tests/syntax_test_fennel_reference.fnl b/tests/syntax_test_fennel_reference.fnl
@@ -2279,7 +2279,7 @@
 ;        ^^^^ source.fennel
 ;             ^ punctuation.section.parens.begin.fennel
 ;              ^^^^^ entity.name.tag.lua_support.fennel
-;                    ^^ variable.language.lua_constant.fennel
+;                    ^^ entity.other.inherited-class.constant.fennel
 ;                      ^ punctuation.section.parens.end.fennel
 ;                       ^ punctuation.section.brackets.end.fennel
     (print name)))

diff --git a/tests/syntax_test_fennel_reference_110.fnl b/tests/syntax_test_fennel_reference_110.fnl
@@ -30,6 +30,21 @@
 
 ; New forms
 
+_1 7/8 1_
+; <- source.fennel
+;^^^^^^^^ source.fennel
+
+10 120_000 1.5 120_0_00.10_10_0
+; <- constant.numeric.integer.decimal.fennel
+;^ constant.numeric.integer.decimal.fennel
+;  ^^^^^^^ constant.numeric.integer.decimal.fennel
+;          ^ constant.numeric.float.decimal.fennel
+;           ^ punctuation.separator.decimal.fennel
+;            ^ constant.numeric.float.decimal.fennel
+;              ^^^^^^^^ constant.numeric.float.decimal.fennel
+;                      ^ punctuation.separator.decimal.fennel
+;                       ^^^^^^^ constant.numeric.float.decimal.fennel
+
 (collect [k v (pairs {:apple "red" :orange "orange"})]
 ; <- punctuation.section.parens.begin.fennel
 ;^^^^^^^ entity.name.tag.fennel_support.fennel
@@ -250,15 +265,15 @@
 (set _G.a 1)
 ; <- punctuation.section.parens.begin.fennel
 ;^^^ entity.name.tag.fennel_support.fennel
-;    ^^ variable.language.lua_constant.fennel
+;    ^^ entity.other.inherited-class.constant.fennel
 ;      ^^ source.fennel
 ;         ^ constant.numeric.integer.decimal.fennel
 ;          ^ punctuation.section.parens.end.fennel
 
 (set _ENV.a 2)
 ; <- punctuation.section.parens.begin.fennel
 ;^^^ entity.name.tag.fennel_support.fennel
-;    ^^^^ variable.language.lua_constant.fennel
+;    ^^^^ entity.other.inherited-class.constant.fennel
 ;        ^^ source.fennel
 ;           ^ constant.numeric.integer.decimal.fennel
 ;            ^ punctuation.section.parens.end.fennel
diff --git a/tests/syntax_test_lua.fnl b/tests/syntax_test_lua.fnl
@@ -27,7 +27,7 @@
 (print _G)
 ; <- punctuation.section.parens.begin.fennel
 ;^^^^^ entity.name.tag.lua_support.fennel
-;      ^^ variable.language.lua_constant.fennel
+;      ^^ entity.other.inherited-class.constant.fennel
 ;        ^ punctuation.section.parens.end.fennel
 
 (print (_G 1))
@@ -41,7 +41,7 @@
 (print _VERSION)
 ; <- punctuation.section.parens.begin.fennel
 ;^^^^^ entity.name.tag.lua_support.fennel
-;      ^^^^^^^^ variable.language.lua_constant.fennel
+;      ^^^^^^^^ entity.other.inherited-class.constant.fennel
 ;              ^ punctuation.section.parens.end.fennel
 
 (print (_VERSION 1))