diff options
| author |  Ken McMillan <unknown> | 2013-11-11 15:06:08 -0800 |
|---|---|---|
| committer | Ken McMillan <unknown> | 2013-11-11 15:06:08 -0800 |
| commit | 479fe0571200196552e3d415ab3b90e30083b1b2 (patch) | |
| tree | ecc2fbc7fd64268b21493d7feb3218547767355f /Source/Provers | |
| parent | 334d29e2e34647caa2defd9cd0d329e1e9f0dfd3 (diff) | |
Fixedpoint VC catch up with recent changes
Diffstat (limited to 'Source/Provers')
| -rw-r--r-- | Source/Provers/SMTLib/ProverInterface.cs | 2 | ||||
| -rw-r--r-- | Source/Provers/SMTLib/Z3.cs | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Source/Provers/SMTLib/ProverInterface.cs b/Source/Provers/SMTLib/ProverInterface.cs index c5c867d9..86779a54 100644 --- a/Source/Provers/SMTLib/ProverInterface.cs +++ b/Source/Provers/SMTLib/ProverInterface.cs @@ -560,7 +560,7 @@ namespace Microsoft.Boogie.SMTLib // Concatenate all the arguments
string modelString = resp[0].Name;
// modelString = modelString.Substring(7, modelString.Length - 8); // remove "(model " and final ")"
- var models = Model.ParseModels(new StringReader("Z3 error model: \n" + modelString), "");
+ var models = Model.ParseModels(new StringReader("Error model: \n" + modelString), "");
if (models == null || models.Count == 0)
{
HandleProverError("no model from prover: " + resp.ToString());
diff --git a/Source/Provers/SMTLib/Z3.cs b/Source/Provers/SMTLib/Z3.cs index 8dfa8371..ed8f0908 100644 --- a/Source/Provers/SMTLib/Z3.cs +++ b/Source/Provers/SMTLib/Z3.cs @@ -350,9 +350,13 @@ namespace Microsoft.Boogie.SMTLib options.AddWeakSmtOption("ARRAY_WEAK", "true");
options.AddWeakSmtOption("ARRAY_EXTENSIONAL", "false");
}
+
+ options.AddWeakSmtOption("MODEL_ON_TIMEOUT", "true");
+
}
- options.AddWeakSmtOption("MODEL_ON_TIMEOUT", "true");
+ // KLM: don't add Z3 options here. The options are different in different Z3 versions.
+ // Add options in the above condition for the appropriate version.
// legacy option handling
if (!CommandLineOptions.Clo.z3AtFlag)
|