Fixed tests

ftsrg · Jul 23, 2023 · 206c4c7 · 206c4c7
1 parent 61e8e0d
commit 206c4c7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/...raph-solver/src/main/java/hu/bme/mit/theta/graphsolver/patterns/patterns/BasicEventSet.kt b/...raph-solver/src/main/java/hu/bme/mit/theta/graphsolver/patterns/patterns/BasicEventSet.kt
@@ -19,5 +19,9 @@ import hu.bme.mit.theta.graphsolver.compilers.GraphPatternCompiler
 
 class BasicEventSet(val name: String) : NodePattern() {
 
+    init {
+        patternName = name
+    }
+
     override fun <T> accept(compiler: GraphPatternCompiler<*, T>): T = compiler.compile(this)
 }
diff --git a/...raph-solver/src/main/java/hu/bme/mit/theta/graphsolver/patterns/patterns/BasicRelation.kt b/...raph-solver/src/main/java/hu/bme/mit/theta/graphsolver/patterns/patterns/BasicRelation.kt
@@ -19,5 +19,9 @@ import hu.bme.mit.theta.graphsolver.compilers.GraphPatternCompiler
 
 class BasicRelation(val name: String) : EdgePattern() {
 
+    init {
+        patternName = name
+    }
+
     override fun <T> accept(compiler: GraphPatternCompiler<*, T>): T = compiler.compile(this)
 }
diff --git a/...rojects/solver/graph-solver/src/test/java/hu/bme/mit/theta/graphsolver/GraphSolverTest.kt b/...rojects/solver/graph-solver/src/test/java/hu/bme/mit/theta/graphsolver/GraphSolverTest.kt
@@ -62,6 +62,7 @@ class GraphSolverTest<T> {
     @Test
     @Throws(IOException::class)
     fun test() {
+        compiler!!.addEvents(graphEvents!!)
         compiler!!.addFacts(graphEdges!!)
         val compiledConstraint = constraint!!.accept(compiler!!)
         solver!!.add(compiledConstraint)

diff --git a/subprojects/xcfa/cat/src/main/antlr/Cat.g4 b/subprojects/xcfa/cat/src/main/antlr/Cat.g4
@@ -8,7 +8,7 @@ name:   (QUOT? NAME+ QUOT?)
     ;
 
 scopeBody
-    :   (procCall | functionDef | procDef | definition | includeFile)+
+    :   (procCall | functionDef | procDef | definition | includeFile)*
     ;
 
 procCall