Remove edge and loc vars from defaultvalues

ftsrg · Nov 7, 2024 · 6c56d77 · 6c56d77
1 parent 6b0aff3
commit 6c56d77
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...s/xcfa/xcfa-analysis/src/main/java/hu/bme/mit/theta/xcfa/analysis/XcfaToMonolithicExpr.kt b/...s/xcfa/xcfa-analysis/src/main/java/hu/bme/mit/theta/xcfa/analysis/XcfaToMonolithicExpr.kt
@@ -108,7 +108,7 @@ fun XCFA.toMonolithicExpr(parseContext: ParseContext, initValues: Boolean = fals
 
   val defaultValues =
     if (initValues)
-      StmtUtils.getVars(trans)
+      StmtUtils.getVars(trans).filter { !it.equals(locVar) and !it.equals(edgeVar) }
         .map {
           when (it.type) {
             is IntType -> Eq(it.ref, int(0))
@@ -139,7 +139,7 @@ fun XCFA.toMonolithicExpr(parseContext: ParseContext, initValues: Boolean = fals
     transExpr = And(transUnfold.exprs),
     propExpr = Neq(locVar.ref, int(locMap[proc.errorLoc.get()]!!)),
     transOffsetIndex = transUnfold.indexing,
-    vars = (StmtUtils.getVars(trans) + listOf(locVar)).toList(),
+    vars = StmtUtils.getVars(trans).filter { !it.equals(locVar) and !it.equals(edgeVar) }.toList() + edgeVar + locVar,
     valToState = { valToState(it) },
     biValToAction = { val1, val2 -> valToAction(val1, val2) },
     ctrlVars = listOf(locVar, edgeVar),