Fix up expressions for numbers

MrEbbinghaus · MrEbbinghaus · commit 45bdb881501d · 2021-12-12T02:16:57.000+01:00
diff --git a/grammars/clojure.cson b/grammars/clojure.cson
@@ -104,36 +104,34 @@
         'match': '(true|false)'
         'name': 'constant.language.boolean.clojure'
       }
+      {
+        'match': '(##(?:Inf|-Inf|NaN))'
+        'name': 'constant.numeric.symbol.clojure'
+      }
       {
         'match': '([-+]?\\d+/\\d+)'
         'name': 'constant.numeric.ratio.clojure'
       }
       {
-        'match': '([-+]?\\d+[rR]\\w+)'
+        # Only Radixes between 2 and 36 are allowed
+        'match': '([-+]?(?:(?:3[0-6])|(?:[12]\\d)|[2-9])[rR][0-9A-Za-z]+N?)'
         'name': 'constant.numeric.arbitrary-radix.clojure'
       }
       {
-        'match': '([-+]?0[xX][0-9a-fA-F]+)'
+        'match': '([-+]?0[xX][0-9a-fA-F]+N?)'
         'name': 'constant.numeric.hexadecimal.clojure'
       }
       {
-        'match': '([-+]?0\\d+)'
+        'match': '([-+]?0[0-7]+N?)'
         'name': 'constant.numeric.octal.clojure'
       }
       {
-        'match': '([-+]?\\d+\\.\\d+([eE][+-]?\\d+)?M)'
-        'name': 'constant.numeric.bigdecimal.clojure'
-      }
-      {
-        'match': '([-+]?\\d+\\.\\d+([eE][+-]?\\d+)?)'
+        # The decimal separator is optional only when followed by e, E or M! 
+        'match': '([-+]?[0-9]+(?:(\\.|(?=[eEM]))[0-9]*([eE][-+]?[0-9]+)?)M?)'
         'name': 'constant.numeric.double.clojure'
       }
       {
-        'match': '([-+]?\\d+N)'
-        'name': 'constant.numeric.bigint.clojure'
-      }
-      {
-        'match': '([-+]?\\d+)'
+        'match': '([-+]?\\d+N?)'
         'name': 'constant.numeric.long.clojure'
       }
       { # separating the pattern for reuse
diff --git a/spec/clojure-spec.coffee b/spec/clojure-spec.coffee
@@ -62,14 +62,13 @@ describe "Clojure grammar", ->
 
   it "tokenizes numerics", ->
     numbers =
-      "constant.numeric.ratio.clojure": ["1/2", "123/456"]
-      "constant.numeric.arbitrary-radix.clojure": ["2R1011", "16rDEADBEEF", "56råäöÅÄÖπ"]
-      "constant.numeric.hexadecimal.clojure": ["0xDEADBEEF", "0XDEADBEEF"]
-      "constant.numeric.octal.clojure": ["0123"]
-      "constant.numeric.bigdecimal.clojure": ["123.456M"]
-      "constant.numeric.double.clojure": ["123.45", "123.45e6", "123.45E6"]
-      "constant.numeric.bigint.clojure": ["123N"]
-      "constant.numeric.long.clojure": ["123", "12321"]
+      "constant.numeric.ratio.clojure": ["1/2", "123/456", "+0/2", "-23/1"]
+      "constant.numeric.arbitrary-radix.clojure": ["2R1011", "16rDEADBEEF", "16rDEADBEEFN", "36rZebra"]
+      "constant.numeric.hexadecimal.clojure": ["0xDEADBEEF", "0XDEADBEEF", "0xDEADBEEFN", "0x0"]
+      "constant.numeric.octal.clojure": ["0123", "0123N", "00"]
+      "constant.numeric.double.clojure": ["123.45", "123.45e6", "123.45E6", "123.456M", "42.", "42.M", "42E+9M", "42E-0", "0M", "+0M", "42.E-23M"]
+      "constant.numeric.long.clojure": ["123", "12321", "123N", "+123N", "-123", "0"]
+      "constant.numeric.symbol.clojure": ["##Inf", "##-Inf", "##NaN"]
 
     for scope, nums of numbers
       for num in nums

Original file line number	Diff line number	Diff line change
`@@ -104,36 +104,34 @@`
`104`	`104`	`'match': '(true\|false)'`
`105`	`105`	`'name': 'constant.language.boolean.clojure'`
`106`	`106`	`}`
	`107`	`+ {`
	`108`	`+ 'match': '(##(?:Inf\|-Inf\|NaN))'`
	`109`	`+ 'name': 'constant.numeric.symbol.clojure'`
	`110`	`+ }`
`107`	`111`	`{`
`108`	`112`	`'match': '([-+]?\\d+/\\d+)'`
`109`	`113`	`'name': 'constant.numeric.ratio.clojure'`
`110`	`114`	`}`
`111`	`115`	`{`
`112`		`- 'match': '([-+]?\\d+[rR]\\w+)'`
	`116`	`+ # Only Radixes between 2 and 36 are allowed`
	`117`	`+ 'match': '([-+]?(?:(?:3[0-6])\|(?:[12]\\d)\|[2-9])[rR][0-9A-Za-z]+N?)'`
`113`	`118`	`'name': 'constant.numeric.arbitrary-radix.clojure'`
`114`	`119`	`}`
`115`	`120`	`{`
`116`		`- 'match': '([-+]?0[xX][0-9a-fA-F]+)'`
	`121`	`+ 'match': '([-+]?0[xX][0-9a-fA-F]+N?)'`
`117`	`122`	`'name': 'constant.numeric.hexadecimal.clojure'`
`118`	`123`	`}`
`119`	`124`	`{`
`120`		`- 'match': '([-+]?0\\d+)'`
	`125`	`+ 'match': '([-+]?0[0-7]+N?)'`
`121`	`126`	`'name': 'constant.numeric.octal.clojure'`
`122`	`127`	`}`
`123`	`128`	`{`
`124`		`- 'match': '([-+]?\\d+\\.\\d+([eE][+-]?\\d+)?M)'`
`125`		`- 'name': 'constant.numeric.bigdecimal.clojure'`
`126`		`- }`
`127`		`- {`
`128`		`- 'match': '([-+]?\\d+\\.\\d+([eE][+-]?\\d+)?)'`
	`129`	`+ # The decimal separator is optional only when followed by e, E or M!`
	`130`	`+ 'match': '([-+]?[0-9]+(?:(\\.\|(?=[eEM]))[0-9]*([eE][-+]?[0-9]+)?)M?)'`
`129`	`131`	`'name': 'constant.numeric.double.clojure'`
`130`	`132`	`}`
`131`	`133`	`{`
`132`		`- 'match': '([-+]?\\d+N)'`
`133`		`- 'name': 'constant.numeric.bigint.clojure'`
`134`		`- }`
`135`		`- {`
`136`		`- 'match': '([-+]?\\d+)'`
	`134`	`+ 'match': '([-+]?\\d+N?)'`
`137`	`135`	`'name': 'constant.numeric.long.clojure'`
`138`	`136`	`}`
`139`	`137`	`{ # separating the pattern for reuse`