Fix missing error detection if extraneous input is passed to RDLCompi…

…ler.expr()
SystemRDL · Jul 19, 2022 · bda90ef · bda90ef
1 parent c88b9e3
commit bda90ef
Show file tree

Hide file tree

Showing 21 changed files with 2,433 additions and 2,269 deletions.
diff --git a/systemrdl/compiler.py b/systemrdl/compiler.py
@@ -434,8 +434,8 @@ def eval(self, expression: str) -> rdltypes.RDLValue:
 
         parsed_tree = sa_systemrdl.parse(
             input_stream,
-            "expr",
-            messages.RdlSaErrorListener(self.msg)
+            "eval_expr_root",
+            messages.RdlSaErrorListener(msg_handler)
         )
 
         visitor = ExprVisitor(self)

diff --git a/systemrdl/core/BaseVisitor.py b/systemrdl/core/BaseVisitor.py
@@ -102,3 +102,6 @@ def visitUdp_data_type(self, ctx: SystemRDLParser.Udp_data_typeContext) -> Any:
 
     def visitUdp_comp_type(self, ctx: SystemRDLParser.Udp_comp_typeContext) -> Any:
         return self.passthru_kw_token(ctx)
+
+    def visitEval_expr_root(self, ctx:SystemRDLParser.Eval_expr_rootContext) -> Any:
+        return self.visit(ctx.expr()) # type: ignore
diff --git a/systemrdl/parser/SystemRDL.g4 b/systemrdl/parser/SystemRDL.g4
@@ -2,6 +2,8 @@ grammar SystemRDL;
 
 root: (root_elem ';')* EOF;
 
+eval_expr_root: expr EOF;
+
 root_elem : component_def
           | enum_def
           | udp_def

diff --git a/systemrdl/parser/SystemRDL.interp b/systemrdl/parser/SystemRDL.interp
diff --git a/systemrdl/parser/SystemRDLParser.py b/systemrdl/parser/SystemRDLParser.py