From c5e2fecb87aab434665fe585cc23694f5c1f5d4b Mon Sep 17 00:00:00 2001 From: mondokm Date: Wed, 6 Nov 2024 16:05:43 +0100 Subject: [PATCH] Change var ordering --- .../kotlin/hu/bme/mit/theta/cfa/analysis/CfaToMonolithicExpr.kt | 2 +- .../java/hu/bme/mit/theta/xcfa/analysis/XcfaToMonolithicExpr.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/cfa/cfa-analysis/src/main/kotlin/hu/bme/mit/theta/cfa/analysis/CfaToMonolithicExpr.kt b/subprojects/cfa/cfa-analysis/src/main/kotlin/hu/bme/mit/theta/cfa/analysis/CfaToMonolithicExpr.kt index 41385ceed0..616386abee 100644 --- a/subprojects/cfa/cfa-analysis/src/main/kotlin/hu/bme/mit/theta/cfa/analysis/CfaToMonolithicExpr.kt +++ b/subprojects/cfa/cfa-analysis/src/main/kotlin/hu/bme/mit/theta/cfa/analysis/CfaToMonolithicExpr.kt @@ -92,7 +92,7 @@ fun CFA.toMonolithicExpr(): MonolithicExpr { transExpr, propExpr, offsetIndex, - vars = listOf(locVar) + this.vars.toList(), + vars = this.vars.toList() + listOf(locVar), ) } diff --git a/subprojects/xcfa/xcfa-analysis/src/main/java/hu/bme/mit/theta/xcfa/analysis/XcfaToMonolithicExpr.kt b/subprojects/xcfa/xcfa-analysis/src/main/java/hu/bme/mit/theta/xcfa/analysis/XcfaToMonolithicExpr.kt index 152b52f286..bab76e48ed 100644 --- a/subprojects/xcfa/xcfa-analysis/src/main/java/hu/bme/mit/theta/xcfa/analysis/XcfaToMonolithicExpr.kt +++ b/subprojects/xcfa/xcfa-analysis/src/main/java/hu/bme/mit/theta/xcfa/analysis/XcfaToMonolithicExpr.kt @@ -123,7 +123,7 @@ fun XCFA.toMonolithicExpr(parseContext: ParseContext): MonolithicExpr { transExpr = And(transUnfold.exprs), propExpr = Neq(locVar.ref, int(map[proc.errorLoc.get()]!!)), transOffsetIndex = transUnfold.indexing, - vars = listOf(locVar) + this.vars.map { it.wrappedVar }.toList(), + vars = this.vars.map { it.wrappedVar }.toList() + listOf(locVar), ) }