Fixed parsing derefs

ftsrg · Nov 12, 2024 · 0d4e531 · 0d4e531
1 parent f639718
commit 0d4e531
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/subprojects/common/grammar/src/main/antlr/CommonTokens.g4 b/subprojects/common/grammar/src/main/antlr/CommonTokens.g4
@@ -101,9 +101,6 @@ MINUS
 	:	'-'
 	;
 
-MUL	:	'*'
-	;
-
 DIV	:	'div'
 	;
 
@@ -406,7 +403,10 @@ SIGN:	PLUS | MINUS
 DOT	:	'.'
 	;
 
-ID	:	(LETTER | UNDERSCORE) (LETTER | UNDERSCORE | '$' | DIGIT | COLON)*
+ID	:	(LETTER | UNDERSCORE) (LETTER | UNDERSCORE | '$' | '*' | DIGIT | COLON)*
+	;
+
+MUL	:	'*'
 	;
 
 UNDERSCORE

diff --git a/subprojects/common/grammar/src/test/java/hu/bme/mit/theta/grammar/dsl/ExprTest.kt b/subprojects/common/grammar/src/test/java/hu/bme/mit/theta/grammar/dsl/ExprTest.kt
@@ -65,6 +65,7 @@ class ExprTest {
     fun data(): Collection<Array<Any>> {
       val x = Var("x", Int())
       val p = Param("p", Int())
+      val casret = Var("thr1::casret*", Int())
 
       val bvLit1 = Bv(BooleanArray(4) { it % 2 == 0 })
       val bvLit2 = Bv(BooleanArray(4) { it % 2 == 1 })
@@ -286,6 +287,11 @@ class ExprTest {
           emptyMap<Symbol, Decl<*>>(),
         ),
         arrayOf(Dereference(Int(0), Int(1), Int()), "(deref 0 1 Int)", emptyMap<Symbol, Decl<*>>()),
+        arrayOf(
+          Dereference(casret.ref, Int(0), Int()),
+          "(deref thr1::casret* 0 Int)",
+          mapOf(Pair(NamedSymbol("thr1::casret*"), casret)),
+        ),
       )
     }
   }