additional model gen and SMT-LIBv2 compliance work: (get-assignment) now supported; work on Result type (biggest noticeable change is that CVC4 now outputs lowercase "sat" and "unsat"), Options class moved to src/smt, to allow for future work on runtime configuration via (set-option) command

1 files changed, 4 insertions, 4 deletions

diff --git a/src/util/Assert.h b/src/util/Assert.h
index dbbdfe9b7..5bb2e830f 100644
--- a/src/util/Assert.h
+++ b/src/util/Assert.h
@@ -163,7 +163,7 @@ public:
     va_list args;
     va_start(args, fmt);
     construct("Illegal argument detected",
-              ( std::string(argDesc) + " invalid" ).c_str(),
+              ( std::string("`") + argDesc + "' is a bad argument" ).c_str(),
               function, file, line, fmt, args);
     va_end(args);
   }
@@ -172,7 +172,7 @@ public:
                            const char* file, unsigned line) :
     AssertionException() {
     construct("Illegal argument detected",
-              ( std::string(argDesc) + " invalid" ).c_str(),
+              ( std::string("`") + argDesc + "' is a bad argument" ).c_str(),
               function, file, line);
   }
 
@@ -183,7 +183,7 @@ public:
     va_list args;
     va_start(args, fmt);
     construct("Illegal argument detected",
-              ( std::string(argDesc) + " invalid; expected " +
+              ( std::string("`") + argDesc + "' is a bad argument; expected " +
                 condStr + " to hold" ).c_str(),
               function, file, line, fmt, args);
     va_end(args);
@@ -194,7 +194,7 @@ public:
                            unsigned line) :
     AssertionException() {
     construct("Illegal argument detected",
-              ( std::string(argDesc) + " invalid; expected " +
+              ( std::string("`") + argDesc + "' is a bad argument; expected " +
                 condStr + " to hold" ).c_str(),
               function, file, line);
   }