Merge pull request #10 from hatoo/subsume

add :subsume
hatoo · Aug 11, 2024 · 96b8dd6 · 96b8dd6
2 parents 9a6af65 + b91202c
commit 96b8dd6
Show file tree

Hide file tree

Showing 4 changed files with 4,457 additions and 4,029 deletions.
diff --git a/tree-sitter-egglog/grammar.js b/tree-sitter-egglog/grammar.js
@@ -93,6 +93,7 @@ module.exports = grammar({
           "rewrite",
           $.expr,
           $.expr,
+          optional(":subsume"),
           optional(seq(":when", list($, $.fact))),
           optional(seq(":ruleset", $.ident)),
           $.rparen
@@ -193,6 +194,7 @@ module.exports = grammar({
           $.rparen,
           $.rparen
         ),
+        seq($.lparen, "subsume", $.lparen, $.ident, repeat($.expr), $.rparen, $.rparen),
         seq($.lparen, "union", $.expr, $.expr, $.rparen),
         seq($.lparen, "panic", $.string, $.rparen),
         seq($.lparen, "extract", $.expr, $.rparen),

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