improve caveat parsing

authzed · Feb 8, 2024 · b894c02 · b894c02
1 parent e51aa00
commit b894c02
Show file tree

Hide file tree

Showing 5 changed files with 745 additions and 736 deletions.
diff --git a/grammar.js b/grammar.js
@@ -101,6 +101,6 @@ module.exports = grammar({
       optional(','),
     )),
 
-    caveat_expr: $ => $.identifier,
+    caveat_expr: _ => /[^{}](.*)/,
   },
 });
diff --git a/src/grammar.json b/src/grammar.json
@@ -561,8 +561,8 @@
       }
     },
     "caveat_expr": {
-      "type": "SYMBOL",
-      "name": "identifier"
+      "type": "PATTERN",
+      "value": "[^{}](.*)"
     }
   },
   "extras": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -84,21 +84,6 @@
       }
     }
   },
-  {
-    "type": "caveat_expr",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "identifier",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "computed_userset",
     "named": true,
@@ -471,6 +456,10 @@
     "type": "caveat",
     "named": false
   },
+  {
+    "type": "caveat_expr",
+    "named": true
+  },
   {
     "type": "cel_type_identifier",
     "named": true
@@ -495,10 +484,6 @@
     "type": "func_identifier",
     "named": true
   },
-  {
-    "type": "identifier",
-    "named": true
-  },
   {
     "type": "method_identifier",
     "named": true