diff --git a/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java b/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java index 7e95f090c8f507e2881cf3ae70aa2d085918b858..a06dfd34c8ab9a70f16b2f30dd4d6dc0154aca31 100644 --- a/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java +++ b/src/main/java/avatartranslator/modelchecker/AvatarModelChecker.java @@ -41,6 +41,7 @@ package avatartranslator.modelchecker; import avatartranslator.*; import avatartranslator.intboolsolver.AvatarIBSExpressions; +import avatartranslator.intboolsolver.AvatarIBSolver; import myutil.BoolExpressionEvaluator; import myutil.Conversion; import myutil.IntExpressionEvaluator; @@ -926,6 +927,9 @@ public class AvatarModelChecker implements Runnable, myutil.Graph { spec.setAttributeOptRatio(compressionFactor); spec.generateAllExpressionSolvers(); + // Reset parser + AvatarIBSolver.clearAttributes(); + prepareTransitions(); prepareBlocks(); diff --git a/src/main/java/avatartranslator/toexecutable/AVATAR2CPOSIX.java b/src/main/java/avatartranslator/toexecutable/AVATAR2CPOSIX.java index e0f1f8c279c7bd8f92bf241ac4855163118bc5c9..fb256804e38d6b30c4fb02d2df26b6c821e67673 100755 --- a/src/main/java/avatartranslator/toexecutable/AVATAR2CPOSIX.java +++ b/src/main/java/avatartranslator/toexecutable/AVATAR2CPOSIX.java @@ -44,6 +44,7 @@ import java.util.List; import java.util.Vector; import avatartranslator.*; +import avatartranslator.intboolsolver.AvatarIBSolver; import common.SpecConfigTTool; import myutil.Conversion; import myutil.FileException; @@ -162,6 +163,9 @@ public class AVATAR2CPOSIX { avspec.removeLibraryFunctionCalls(); avspec.removeTimers(); + // Reset parser + AvatarIBSolver.clearAttributes(); + //TraceManager.addDev("AVATAR2CPOSIX avspec=" + avspec); diff --git a/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java b/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java index 6dd9171ebefbbbacaa3d51ac10aed5262eece530..0e6d5bba0815b6847829e4ea1cc487b7a8de4da4 100755 --- a/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java +++ b/src/main/java/avatartranslator/toproverif/AVATAR2ProVerif.java @@ -39,6 +39,7 @@ package avatartranslator.toproverif; import avatartranslator.*; +import avatartranslator.intboolsolver.AvatarIBSolver; import common.ConfigurationTTool; import myutil.FileException; import myutil.FileUtils; @@ -450,6 +451,9 @@ public class AVATAR2ProVerif implements AvatarTranslator { this.avspec.removeTimers(); + // Reset parser + AvatarIBSolver.clearAttributes(); + this.dummyDataCounter = 0; List<AvatarAttribute> allKnowledge = this.makeStartingProcess(); diff --git a/src/main/java/avatartranslator/tosysmlv2/AVATAR2SysMLV2.java b/src/main/java/avatartranslator/tosysmlv2/AVATAR2SysMLV2.java index 22f948363f58f7acb9d7e005ccaf8e8b68601979..1e5e6b0b997d9445a26d685460a5e9828d92292b 100644 --- a/src/main/java/avatartranslator/tosysmlv2/AVATAR2SysMLV2.java +++ b/src/main/java/avatartranslator/tosysmlv2/AVATAR2SysMLV2.java @@ -47,6 +47,7 @@ import java.util.Scanner; import java.util.Vector; import avatartranslator.*; +import avatartranslator.intboolsolver.AvatarIBSolver; import common.SpecConfigTTool; import myutil.Conversion; import myutil.FileException; @@ -165,6 +166,8 @@ public class AVATAR2SysMLV2 { avspec.removeCompositeStates(); avspec.removeLibraryFunctionCalls(); avspec.removeTimers(); + // Reset parser + AvatarIBSolver.clearAttributes(); //TraceManager.addDev("AVATAR2CPOSIX avspec=" + avspec); diff --git a/src/main/java/avatartranslator/totpn/AVATAR2TPN.java b/src/main/java/avatartranslator/totpn/AVATAR2TPN.java index a7574f70e6ddb169c524f216bf3630860ca17459..d3a26b67b8d1eee4b0237266887fa8ab211e3f84 100755 --- a/src/main/java/avatartranslator/totpn/AVATAR2TPN.java +++ b/src/main/java/avatartranslator/totpn/AVATAR2TPN.java @@ -42,6 +42,7 @@ package avatartranslator.totpn; import avatartranslator.*; +import avatartranslator.intboolsolver.AvatarIBSolver; import myutil.TraceManager; import tpndescription.Place; import tpndescription.TPN; @@ -104,6 +105,9 @@ public class AVATAR2TPN { avspec.removeLibraryFunctionCalls (); avspec.removeTimers(); + // Reset parser + AvatarIBSolver.clearAttributes(); + makeBlocks(); //TraceManager.addDev("-> tpn:" + tpn.toString()); diff --git a/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java b/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java index 55dab417efc195c5e99f6b20ed93cd7bed95849a..7a76a72de034a152c5c41839ccb689a0329cf802 100755 --- a/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java +++ b/src/main/java/avatartranslator/touppaal/AVATAR2UPPAAL.java @@ -39,6 +39,7 @@ package avatartranslator.touppaal; import avatartranslator.*; +import avatartranslator.intboolsolver.AvatarIBSolver; import common.SpecConfigTTool; import myutil.Conversion; import myutil.FileException; @@ -164,6 +165,9 @@ public class AVATAR2UPPAAL { avspec.removeTimers(); //avspec.removeElseGuards(); + // Reset parser + AvatarIBSolver.clearAttributes(); + //avspec.removeFIFOs(2); avspec.makeRobustness();