Commit: 41cf845db913649905de4ce650312754b5a8d301 - regiux (git)

A fast implementation of the Nix expression language

Commit MetaInfo

• Revision: 41cf845db913649905de4ce650312754b5a8d301 (tree)
• Zeit: 2024-06-14 11:59:00
• Autor: Corbin <cds@corb...>
• Commiter: Corbin

Log Message

parser: Use some sugar.

Ändern Zusammenfassung

• modified: parser.py

Diff

--- a/parser.py
+++ b/parser.py
@@ -404,23 +404,22 @@ opDict = {
     "-": "sub",
 }
 
[e-mail]("expr_op : expr_op AND expr_op")
[e-mail]("expr_op : expr_op CONCAT expr_op")
[e-mail]("expr_op : expr_op DIV expr_op")
[e-mail]("expr_op : expr_op EQ expr_op")
[e-mail]("expr_op : expr_op GE expr_op")
[e-mail]("expr_op : expr_op GEQ expr_op")
[e-mail]("expr_op : expr_op IMPL expr_op")
[e-mail]("expr_op : expr_op LE expr_op")
[e-mail]("expr_op : expr_op LEQ expr_op")
[e-mail]("expr_op : expr_op MINUS expr_op")
[e-mail]("expr_op : expr_op MUL expr_op")
[e-mail]("expr_op : expr_op NEQ expr_op")
[e-mail]("expr_op : expr_op OR_OP expr_op")
[e-mail]("expr_op : expr_op PLUS expr_op")
[e-mail]("expr_op : expr_op UPDATE expr_op")
-def exprBinary(p):
-    return ExprBinaryBox(p[0], p[2], opDict[p[1].getstr()])
[e-mail]("""expr_op : expr_op AND expr_op
+                          | expr_op CONCAT expr_op
+                          | expr_op DIV expr_op
+                          | expr_op EQ expr_op
+                          | expr_op GE expr_op
+                          | expr_op GEQ expr_op
+                          | expr_op IMPL expr_op
+                          | expr_op LE expr_op
+                          | expr_op LEQ expr_op
+                          | expr_op MINUS expr_op
+                          | expr_op MUL expr_op
+                          | expr_op NEQ expr_op
+                          | expr_op OR_OP expr_op
+                          | expr_op PLUS expr_op
+                          | expr_op UPDATE expr_op""")
+def exprBinary(p): return ExprBinaryBox(p[0], p[2], opDict[p[1].getstr()])
 
 @pg.production("expr_op : expr_op HAS attrpath")
 def exprHas(p): return HasBox(p[0], p[2])
@@ -530,5 +529,9 @@ def checkTable(table):
     # assert not table.sr_conflicts and not table.rr_conflicts
 checkTable(parser.lr_table)
 
+print "Grammar:", parser.lr_table.grammar
+for i, production in enumerate(parser.lr_table.grammar.productions):
+    print i, production
+
 # Top-level interface: Lex and parse UTF-8 text.
 def parse(expr): return parser.parse(lexer.lex(expr))