@ is a character

shnarazk · May 28, 2023 · a56f2d2 · a56f2d2
1 parent 5201d4b
commit a56f2d2
Show file tree

Hide file tree

Showing 4 changed files with 788 additions and 789 deletions.
diff --git a/grammar.js b/grammar.js
@@ -176,7 +176,7 @@ module.exports = grammar({
     block: $ => seq("{", repeat($.CASE_opt), $.CASE_end, "}"),
 
     number: $          => token(choice(/¯?[∞]/, /¯π([eE]¯?\d+)?/, /¯?\d+(\.\d+)?([eE]¯?\d+)?/)),
-    character: $       => choice(/'.'/, /'\\u[0-9a-fA-F]{4}'/),
+    character: $       => choice('@', /'.'/, /'\\u[0-9a-fA-F]{4}'/),
     string: $          => token(seq('"', repeat(choice('""', /[^"]+/)), '"')),
     system_s: $        => token(seq(
       "•",
@@ -187,7 +187,6 @@ module.exports = grammar({
       '𝕨', '𝕩', '𝕗', '𝕘', '𝕤',
     ),
     symbol_sl: $       => choice(
-      '@',
       $.character, $.string, $.number
     ),
     system_F: $        => token(seq(

diff --git a/src/grammar.json b/src/grammar.json
@@ -1782,6 +1782,10 @@
     "character": {
       "type": "CHOICE",
       "members": [
+        {
+          "type": "STRING",
+          "value": "@"
+        },
         {
           "type": "PATTERN",
           "value": "'.'"
@@ -1892,10 +1896,6 @@
     "symbol_sl": {
       "type": "CHOICE",
       "members": [
-        {
-          "type": "STRING",
-          "value": "@"
-        },
         {
           "type": "SYMBOL",
           "name": "character"

diff --git a/src/node-types.json b/src/node-types.json
@@ -1037,7 +1037,7 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": false,
+      "required": true,
       "types": [
         {
           "type": "character",