Allow metadata to be $._form

sogaiu · Mar 17, 2023 · aaf31ad · aaf31ad
1 parent b88f3bd
commit aaf31ad
Show file tree

Hide file tree

Showing 4 changed files with 16,657 additions and 25,279 deletions.
diff --git a/grammar.js b/grammar.js
@@ -366,22 +366,12 @@ module.exports = grammar({
     meta_lit: $ =>
     seq(field('marker', "^"),
         repeat($._gap),
-        field('value', choice($.read_cond_lit,
-                              $.tagged_or_ctor_lit,
-                              $.map_lit,
-                              $.str_lit,
-                              $.kwd_lit,
-                              $.sym_lit))),
+        field('value', $._form)),
 
     old_meta_lit: $ =>
     seq(field('marker', "#^"),
         repeat($._gap),
-        field('value', choice($.read_cond_lit,
-                              $.tagged_or_ctor_lit,
-                              $.map_lit,
-                              $.str_lit,
-                              $.kwd_lit,
-                              $.sym_lit))),
+        field('value', $._form)),
 
     list_lit: $ =>
     seq(repeat($._metadata_lit),

diff --git a/src/grammar.json b/src/grammar.json
@@ -1114,33 +1114,8 @@
           "type": "FIELD",
           "name": "value",
           "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "read_cond_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "tagged_or_ctor_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "map_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "str_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "kwd_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "sym_lit"
-              }
-            ]
+            "type": "SYMBOL",
+            "name": "_form"
           }
         }
       ]
@@ -1167,33 +1142,8 @@
           "type": "FIELD",
           "name": "value",
           "content": {
-            "type": "CHOICE",
-            "members": [
-              {
-                "type": "SYMBOL",
-                "name": "read_cond_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "tagged_or_ctor_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "map_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "str_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "kwd_lit"
-              },
-              {
-                "type": "SYMBOL",
-                "name": "sym_lit"
-              }
-            ]
+            "type": "SYMBOL",
+            "name": "_form"
           }
         }
       ]

diff --git a/src/node-types.json b/src/node-types.json
@@ -940,18 +940,70 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "anon_fn_lit",
+            "named": true
+          },
+          {
+            "type": "bool_lit",
+            "named": true
+          },
+          {
+            "type": "char_lit",
+            "named": true
+          },
+          {
+            "type": "derefing_lit",
+            "named": true
+          },
+          {
+            "type": "evaling_lit",
+            "named": true
+          },
           {
             "type": "kwd_lit",
             "named": true
           },
+          {
+            "type": "list_lit",
+            "named": true
+          },
           {
             "type": "map_lit",
             "named": true
           },
+          {
+            "type": "nil_lit",
+            "named": true
+          },
+          {
+            "type": "ns_map_lit",
+            "named": true
+          },
+          {
+            "type": "num_lit",
+            "named": true
+          },
+          {
+            "type": "quoting_lit",
+            "named": true
+          },
           {
             "type": "read_cond_lit",
             "named": true
           },
+          {
+            "type": "regex_lit",
+            "named": true
+          },
+          {
+            "type": "set_lit",
+            "named": true
+          },
+          {
+            "type": "splicing_read_cond_lit",
+            "named": true
+          },
           {
             "type": "str_lit",
             "named": true
@@ -960,9 +1012,33 @@
             "type": "sym_lit",
             "named": true
           },
+          {
+            "type": "sym_val_lit",
+            "named": true
+          },
+          {
+            "type": "syn_quoting_lit",
+            "named": true
+          },
           {
             "type": "tagged_or_ctor_lit",
             "named": true
+          },
+          {
+            "type": "unquote_splicing_lit",
+            "named": true
+          },
+          {
+            "type": "unquoting_lit",
+            "named": true
+          },
+          {
+            "type": "var_quoting_lit",
+            "named": true
+          },
+          {
+            "type": "vec_lit",
+            "named": true
           }
         ]
       }
@@ -1190,18 +1266,70 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "anon_fn_lit",
+            "named": true
+          },
+          {
+            "type": "bool_lit",
+            "named": true
+          },
+          {
+            "type": "char_lit",
+            "named": true
+          },
+          {
+            "type": "derefing_lit",
+            "named": true
+          },
+          {
+            "type": "evaling_lit",
+            "named": true
+          },
           {
             "type": "kwd_lit",
             "named": true
           },
+          {
+            "type": "list_lit",
+            "named": true
+          },
           {
             "type": "map_lit",
             "named": true
           },
+          {
+            "type": "nil_lit",
+            "named": true
+          },
+          {
+            "type": "ns_map_lit",
+            "named": true
+          },
+          {
+            "type": "num_lit",
+            "named": true
+          },
+          {
+            "type": "quoting_lit",
+            "named": true
+          },
           {
             "type": "read_cond_lit",
             "named": true
           },
+          {
+            "type": "regex_lit",
+            "named": true
+          },
+          {
+            "type": "set_lit",
+            "named": true
+          },
+          {
+            "type": "splicing_read_cond_lit",
+            "named": true
+          },
           {
             "type": "str_lit",
             "named": true
@@ -1210,9 +1338,33 @@
             "type": "sym_lit",
             "named": true
           },
+          {
+            "type": "sym_val_lit",
+            "named": true
+          },
+          {
+            "type": "syn_quoting_lit",
+            "named": true
+          },
           {
             "type": "tagged_or_ctor_lit",
             "named": true
+          },
+          {
+            "type": "unquote_splicing_lit",
+            "named": true
+          },
+          {
+            "type": "unquoting_lit",
+            "named": true
+          },
+          {
+            "type": "var_quoting_lit",
+            "named": true
+          },
+          {
+            "type": "vec_lit",
+            "named": true
           }
         ]
       }