Did some refactoring in the execution engine.

1 files changed, 8 insertions, 1 deletions

diff --git a/Source/ExecutionEngine/ExecutionEngine.cs b/Source/ExecutionEngine/ExecutionEngine.cs
index 54edf796..dac3e06e 100644
--- a/Source/ExecutionEngine/ExecutionEngine.cs
+++ b/Source/ExecutionEngine/ExecutionEngine.cs
@@ -1172,11 +1172,16 @@ namespace Microsoft.Boogie
         }

         else

         {

+          var msg = assertError.FailingAssert.ErrorData as string;

           if (!CommandLineOptions.Clo.ForceBplErrors && assertError.FailingAssert.ErrorMessage != null)

           {

+            msg = assertError.FailingAssert.ErrorMessage;

             showBplLocation = false;

+            if (cause == "Error")

+            {

+              cause = null;

+            }

           }

-          var msg = assertError.FailingAssert.ErrorData as string;

           string bec = null;

           if (msg == null)

           {

@@ -1193,7 +1198,9 @@ namespace Microsoft.Boogie
           }

         }

       }

+

       printer.WriteErrorInformation(errorInfo, true, showBplLocation);

+

       return errorInfo;

     }