Merge pull request #50 from cydparser/num-literals

Add binary, octal and hex number literals
nickel-lang · Jun 24, 2024 · 3039ad9 · 3039ad9
2 parents 43433d8 + 24ad801
commit 3039ad9
Show file tree

Hide file tree

Showing 5 changed files with 1,566 additions and 1,368 deletions.
diff --git a/grammar.js b/grammar.js
@@ -60,9 +60,9 @@ module.exports = grammar({
     ////////////////////////////
     keyword: _ => token(/if|then|else|forall|in|let|rec|match|null|true|false|fun|import|merge|default|doc|force|optional|priority|not_exported/),
 
-    num_literal: _ => /[0-9]*\.?[0-9]+([eE][+\-]?[0-9]+)?/,
+    num_literal: _ => /([0-9]*\.?[0-9]+([eE][+\-]?[0-9]+)?)|0((b[01]+)|(o[0-7]+)|(x[0-9a-fA-F]+))/,
 
-    signed_num_literal: _ => /-?[0-9]*\.?[0-9]+([eE][+\-]?[0-9]+)?/,
+    signed_num_literal: _ => /-?(([0-9]*\.?[0-9]+([eE][+\-]?[0-9]+)?)|0((b[01]+)|(o[0-7]+)|(x[0-9a-fA-F]+)))/,
 
     // **IMPORTANT**
     // This regex should be kept in sync with the one for raw_enum_tag below.

diff --git a/src/grammar.json b/src/grammar.json
@@ -15,11 +15,11 @@
     },
     "num_literal": {
       "type": "PATTERN",
-      "value": "[0-9]*\\.?[0-9]+([eE][+\\-]?[0-9]+)?"
+      "value": "([0-9]*\\.?[0-9]+([eE][+\\-]?[0-9]+)?)|0((b[01]+)|(o[0-7]+)|(x[0-9a-fA-F]+))"
     },
     "signed_num_literal": {
       "type": "PATTERN",
-      "value": "-?[0-9]*\\.?[0-9]+([eE][+\\-]?[0-9]+)?"
+      "value": "-?(([0-9]*\\.?[0-9]+([eE][+\\-]?[0-9]+)?)|0((b[01]+)|(o[0-7]+)|(x[0-9a-fA-F]+)))"
     },
     "ident": {
       "type": "PATTERN",