Merge remote-tracking branch 'origin/topic/etyp/assert'

zeek · Nov 6, 2024 · 0800faa · 0800faa
2 parents 3c8742c + 9e8020e
commit 0800faa
Show file tree

Hide file tree

Showing 6 changed files with 92,669 additions and 89,939 deletions.
diff --git a/grammar.js b/grammar.js
@@ -172,6 +172,7 @@ module.exports = grammar({
         // Same ambiguity as above for 'const'
         prec(-1, $.preproc_directive),
         ";",
+        seq("assert", $.expr, optional($.assert_msg), ";"),
       ),
 
     stmt_list: ($) => repeat1($.stmt),
@@ -188,6 +189,8 @@ module.exports = grammar({
     case_type_list: ($) =>
       list1(seq("type", $.type, optional(seq("as", $.id))), ","),
 
+    assert_msg: ($) => seq(",", $.expr),
+
     type: ($) =>
       choice(
         "addr",

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -69,6 +69,7 @@
 
 [
  "add"
+ "assert"
  "break"
  "case"
  "const"

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json