diff options
author | Morgan Deters <mdeters@gmail.com> | 2012-10-05 22:46:27 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2012-10-05 22:46:27 +0000 |
commit | 129dadba47447148096acd216d61f93e14539cb4 (patch) | |
tree | fd0053624ee96ee84eb35d1542d1977e40830750 /src/printer | |
parent | 4c87c0794b7e954afd090cfbf441caa0b09c3ef5 (diff) |
Bug-related:
* ITE removal fixed to be context-dependent (on UserContext).
Resolves incrementality bugs 376 and 396 (which had given wrong answers).
* some bugfixes for incrementality that Dejan found (fixes bug 394)
* fix for bug in SmtEngine::getValue() where definitions weren't respected
(partially resolves bug 411, but get-model is still broken).
* change status of microwave21.ec.minimized.smt2 (it's actually unsat, but
was labeled sat); re-enable it for "make regress"
Also:
* --check-model doesn't fail if quantified assertions don't simplify away.
* fix some examples, and the Java system test, for the disappearance of the
BoolExpr class
* add copy constructor to array type enumerator (the type enumerator
framework requires copy ctors, and the automatically-generated copy ctor
was copying pointers that were then deleted, leaving dangling pointers in
the copy and causing segfaults)
* --dump=assertions now implies --dump=skolems
* --dump=assertions:pre-<PASS> and --dump=assertions:post-<PASS> now allow
you to dump before/after a particular preprocessing pass. E.g.,
--dump=assertions:pre-ite-removal or --dump=assertions:post-static-learning.
"--dump=assertions" by itself is after all preprocessing, just before CNF
conversion.
* minor fixes to dumping output
* include Model in language bindings
Minor refactoring/misc:
* fix compiler warning in src/theory/model.cpp
* remove unnecessary SmtEngine::printModel().
* mkoptions script doesn't give progress output if stdout isn't a terminal
(e.g., if it's written to a log, or piped through less(1), or whatever).
* add some type enumerator unit tests
* de-emphasize --parse-only and --preprocess-only (they aren't really "common"
options)
* fix some exception throw() specifications in SmtEngine
* minor documentation clarifications
Diffstat (limited to 'src/printer')
-rw-r--r-- | src/printer/ast/ast_printer.cpp | 7 | ||||
-rw-r--r-- | src/printer/ast/ast_printer.h | 4 | ||||
-rw-r--r-- | src/printer/cvc/cvc_printer.cpp | 20 | ||||
-rw-r--r-- | src/printer/cvc/cvc_printer.h | 3 | ||||
-rw-r--r-- | src/printer/printer.cpp | 6 | ||||
-rw-r--r-- | src/printer/printer.h | 9 | ||||
-rw-r--r-- | src/printer/smt1/smt1_printer.cpp | 9 | ||||
-rw-r--r-- | src/printer/smt1/smt1_printer.h | 4 | ||||
-rw-r--r-- | src/printer/smt2/smt2_printer.cpp | 20 | ||||
-rw-r--r-- | src/printer/smt2/smt2_printer.h | 3 |
10 files changed, 46 insertions, 39 deletions
diff --git a/src/printer/ast/ast_printer.cpp b/src/printer/ast/ast_printer.cpp index 34bf0bb6d..ddac7db46 100644 --- a/src/printer/ast/ast_printer.cpp +++ b/src/printer/ast/ast_printer.cpp @@ -187,10 +187,15 @@ void AstPrinter::toStream(std::ostream& out, const CommandStatus* s) const throw }/* AstPrinter::toStream(CommandStatus*) */ -void AstPrinter::toStream(std::ostream& out, Model* m, const Command* c) const throw() { +void AstPrinter::toStream(std::ostream& out, Model& m) const throw() { out << "Model()"; } +void AstPrinter::toStream(std::ostream& out, Model& m, const Command* c) const throw() { + // shouldn't be called; only the non-Command* version above should be + Unreachable(); +} + static void toStream(std::ostream& out, const EmptyCommand* c) throw() { out << "EmptyCommand(" << c->getName() << ")"; } diff --git a/src/printer/ast/ast_printer.h b/src/printer/ast/ast_printer.h index d5701c088..ea7cd2d16 100644 --- a/src/printer/ast/ast_printer.h +++ b/src/printer/ast/ast_printer.h @@ -31,12 +31,12 @@ namespace ast { class AstPrinter : public CVC4::Printer { void toStream(std::ostream& out, TNode n, int toDepth, bool types) const throw(); + void toStream(std::ostream& out, Model& m, const Command* c) const throw(); public: void toStream(std::ostream& out, TNode n, int toDepth, bool types, size_t dag) const throw(); void toStream(std::ostream& out, const Command* c, int toDepth, bool types, size_t dag) const throw(); void toStream(std::ostream& out, const CommandStatus* s) const throw(); - //for models - void toStream(std::ostream& out, Model* m, const Command* c) const throw(); + void toStream(std::ostream& out, Model& m) const throw(); };/* class AstPrinter */ }/* CVC4::printer::ast namespace */ diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp index 5d2ffb9db..7937e82f3 100644 --- a/src/printer/cvc/cvc_printer.cpp +++ b/src/printer/cvc/cvc_printer.cpp @@ -741,25 +741,25 @@ void CvcPrinter::toStream(std::ostream& out, const CommandStatus* s) const throw }/* CvcPrinter::toStream(CommandStatus*) */ -void CvcPrinter::toStream(std::ostream& out, Model* m, const Command* c) const throw() { - theory::TheoryModel* tm = (theory::TheoryModel*)m; +void CvcPrinter::toStream(std::ostream& out, Model& m, const Command* c) const throw() { + theory::TheoryModel& tm = (theory::TheoryModel&) m; if(dynamic_cast<const DeclareTypeCommand*>(c) != NULL) { TypeNode tn = TypeNode::fromType( ((const DeclareTypeCommand*)c)->getType() ); if( tn.isSort() ){ //print the cardinality - if( tm->d_rep_set.d_type_reps.find( tn )!=tm->d_rep_set.d_type_reps.end() ){ - out << "; cardinality of " << tn << " is " << tm->d_rep_set.d_type_reps[tn].size() << std::endl; + if( tm.d_rep_set.d_type_reps.find( tn )!=tm.d_rep_set.d_type_reps.end() ){ + out << "; cardinality of " << tn << " is " << (*tm.d_rep_set.d_type_reps.find(tn)).second.size() << std::endl; } } out << c << std::endl; if( tn.isSort() ){ //print the representatives - if( tm->d_rep_set.d_type_reps.find( tn )!=tm->d_rep_set.d_type_reps.end() ){ - for( size_t i=0; i<tm->d_rep_set.d_type_reps[tn].size(); i++ ){ - if( tm->d_rep_set.d_type_reps[tn][i].isVar() ){ - out << tm->d_rep_set.d_type_reps[tn][i] << " : " << tn << ";" << std::endl; + if( tm.d_rep_set.d_type_reps.find( tn )!=tm.d_rep_set.d_type_reps.end() ){ + for( size_t i=0; i<(*tm.d_rep_set.d_type_reps.find(tn)).second.size(); i++ ){ + if( (*tm.d_rep_set.d_type_reps.find(tn)).second[i].isVar() ){ + out << (*tm.d_rep_set.d_type_reps.find(tn)).second[i] << " : " << tn << ";" << std::endl; }else{ - out << "% rep: " << tm->d_rep_set.d_type_reps[tn][i] << std::endl; + out << "% rep: " << (*tm.d_rep_set.d_type_reps.find(tn)).second[i] << std::endl; } } } @@ -778,7 +778,7 @@ void CvcPrinter::toStream(std::ostream& out, Model* m, const Command* c) const t }else{ out << tn; } - out << " = " << tm->getValue( n ) << ";" << std::endl; + out << " = " << tm.getValue( n ) << ";" << std::endl; /* //for table format (work in progress) diff --git a/src/printer/cvc/cvc_printer.h b/src/printer/cvc/cvc_printer.h index 72564f24d..a8daebf23 100644 --- a/src/printer/cvc/cvc_printer.h +++ b/src/printer/cvc/cvc_printer.h @@ -34,12 +34,11 @@ namespace cvc { class CvcPrinter : public CVC4::Printer { void toStream(std::ostream& out, TNode n, int toDepth, bool types, bool bracket) const throw(); + void toStream(std::ostream& out, Model& m, const Command* c) const throw(); public: void toStream(std::ostream& out, TNode n, int toDepth, bool types, size_t dag) const throw(); void toStream(std::ostream& out, const Command* c, int toDepth, bool types, size_t dag) const throw(); void toStream(std::ostream& out, const CommandStatus* s) const throw(); - //for models - void toStream(std::ostream& out, Model* m, const Command* c) const throw(); };/* class CvcPrinter */ }/* CVC4::printer::cvc namespace */ diff --git a/src/printer/printer.cpp b/src/printer/printer.cpp index f20ab2901..8b4eab24f 100644 --- a/src/printer/printer.cpp +++ b/src/printer/printer.cpp @@ -127,9 +127,9 @@ void Printer::toStream(std::ostream& out, const SExpr& sexpr) const throw() { } }/* Printer::toStream(SExpr) */ -void Printer::toStream(std::ostream& out, Model* m) const throw() { - for(size_t i = 0; i < m->getNumCommands(); ++i) { - toStream(out, m, m->getCommand(i)); +void Printer::toStream(std::ostream& out, Model& m) const throw() { + for(size_t i = 0; i < m.getNumCommands(); ++i) { + toStream(out, m, m.getCommand(i)); } }/* Printer::toStream(Model) */ diff --git a/src/printer/printer.h b/src/printer/printer.h index 48b76d15a..bc99f5130 100644 --- a/src/printer/printer.h +++ b/src/printer/printer.h @@ -44,6 +44,9 @@ protected: // derived classes can construct, but no one else. Printer() throw() {} + /** write model response to command */ + virtual void toStream(std::ostream& out, Model& m, const Command* c) const throw() = 0; + public: /** Get the Printer for a given OutputLanguage */ static Printer* getPrinter(OutputLanguage lang) throw() { @@ -78,12 +81,8 @@ public: virtual void toStream(std::ostream& out, const Result& r) const throw(); /** Write a Model out to a stream with this Printer. */ - virtual void toStream(std::ostream& out, Model* m ) const throw(); + virtual void toStream(std::ostream& out, Model& m) const throw(); - //for models - - /** write model response to command */ - virtual void toStream(std::ostream& out, Model* m, const Command* c) const throw() = 0; };/* class Printer */ }/* CVC4 namespace */ diff --git a/src/printer/smt1/smt1_printer.cpp b/src/printer/smt1/smt1_printer.cpp index 553692dc5..6424e377e 100644 --- a/src/printer/smt1/smt1_printer.cpp +++ b/src/printer/smt1/smt1_printer.cpp @@ -51,8 +51,13 @@ void Smt1Printer::toStream(std::ostream& out, const SExpr& sexpr) const throw() Printer::getPrinter(language::output::LANG_SMTLIB_V2)->toStream(out, sexpr); }/* Smt1Printer::toStream() */ -void Smt1Printer::toStream(std::ostream& out, Model* m, const Command* c) const throw() { - Printer::getPrinter(language::output::LANG_SMTLIB_V2)->toStream(out, m, c); +void Smt1Printer::toStream(std::ostream& out, Model& m) const throw() { + Printer::getPrinter(language::output::LANG_SMTLIB_V2)->toStream(out, m); +} + +void Smt1Printer::toStream(std::ostream& out, Model& m, const Command* c) const throw() { + // shouldn't be called; only the non-Command* version above should be + Unreachable(); } }/* CVC4::printer::smt1 namespace */ diff --git a/src/printer/smt1/smt1_printer.h b/src/printer/smt1/smt1_printer.h index d1b36208c..39f69e8ff 100644 --- a/src/printer/smt1/smt1_printer.h +++ b/src/printer/smt1/smt1_printer.h @@ -30,13 +30,13 @@ namespace printer { namespace smt1 { class Smt1Printer : public CVC4::Printer { + void toStream(std::ostream& out, Model& m, const Command* c) const throw(); public: void toStream(std::ostream& out, TNode n, int toDepth, bool types, size_t dag) const throw(); void toStream(std::ostream& out, const Command* c, int toDepth, bool types, size_t dag) const throw(); void toStream(std::ostream& out, const CommandStatus* s) const throw(); void toStream(std::ostream& out, const SExpr& sexpr) const throw(); - //for models - void toStream(std::ostream& out, Model* m, const Command* c) const throw(); + void toStream(std::ostream& out, Model& m) const throw(); };/* class Smt1Printer */ }/* CVC4::printer::smt1 namespace */ diff --git a/src/printer/smt2/smt2_printer.cpp b/src/printer/smt2/smt2_printer.cpp index 31754cb3a..466af8676 100644 --- a/src/printer/smt2/smt2_printer.cpp +++ b/src/printer/smt2/smt2_printer.cpp @@ -532,32 +532,32 @@ void Smt2Printer::toStream(std::ostream& out, const CommandStatus* s) const thro }/* Smt2Printer::toStream(CommandStatus*) */ -void Smt2Printer::toStream(std::ostream& out, Model* m, const Command* c) const throw() { - theory::TheoryModel* tm = (theory::TheoryModel*)m; +void Smt2Printer::toStream(std::ostream& out, Model& m, const Command* c) const throw() { + theory::TheoryModel& tm = (theory::TheoryModel&) m; if(dynamic_cast<const DeclareTypeCommand*>(c) != NULL) { TypeNode tn = TypeNode::fromType( ((const DeclareTypeCommand*)c)->getType() ); if( tn.isSort() ){ //print the cardinality - if( tm->d_rep_set.d_type_reps.find( tn )!=tm->d_rep_set.d_type_reps.end() ){ - out << "; cardinality of " << tn << " is " << tm->d_rep_set.d_type_reps[tn].size() << std::endl; + if( tm.d_rep_set.d_type_reps.find( tn )!=tm.d_rep_set.d_type_reps.end() ){ + out << "; cardinality of " << tn << " is " << (*tm.d_rep_set.d_type_reps.find(tn)).second.size() << std::endl; } } out << c << std::endl; if( tn.isSort() ){ //print the representatives - if( tm->d_rep_set.d_type_reps.find( tn )!=tm->d_rep_set.d_type_reps.end() ){ - for( size_t i=0; i<tm->d_rep_set.d_type_reps[tn].size(); i++ ){ - if( tm->d_rep_set.d_type_reps[tn][i].isVar() ){ - out << "(declare-fun " << tm->d_rep_set.d_type_reps[tn][i] << " () " << tn << ")" << std::endl; + if( tm.d_rep_set.d_type_reps.find( tn )!=tm.d_rep_set.d_type_reps.end() ){ + for( size_t i=0; i<(*tm.d_rep_set.d_type_reps.find(tn)).second.size(); i++ ){ + if( (*tm.d_rep_set.d_type_reps.find(tn)).second[i].isVar() ){ + out << "(declare-fun " << (*tm.d_rep_set.d_type_reps.find(tn)).second[i] << " () " << tn << ")" << std::endl; }else{ - out << "; rep: " << tm->d_rep_set.d_type_reps[tn][i] << std::endl; + out << "; rep: " << (*tm.d_rep_set.d_type_reps.find(tn)).second[i] << std::endl; } } } } } else if(dynamic_cast<const DeclareFunctionCommand*>(c) != NULL) { Node n = Node::fromExpr( ((const DeclareFunctionCommand*)c)->getFunction() ); - Node val = tm->getValue( n ); + Node val = tm.getValue( n ); if(val.getKind() == kind::LAMBDA) { out << "(define-fun " << n << " " << val[0] << " " << n.getType().getRangeType() diff --git a/src/printer/smt2/smt2_printer.h b/src/printer/smt2/smt2_printer.h index ce48f36f3..5b3b30367 100644 --- a/src/printer/smt2/smt2_printer.h +++ b/src/printer/smt2/smt2_printer.h @@ -31,12 +31,11 @@ namespace smt2 { class Smt2Printer : public CVC4::Printer { void toStream(std::ostream& out, TNode n, int toDepth, bool types) const throw(); + void toStream(std::ostream& out, Model& m, const Command* c) const throw(); public: void toStream(std::ostream& out, TNode n, int toDepth, bool types, size_t dag) const throw(); void toStream(std::ostream& out, const Command* c, int toDepth, bool types, size_t dag) const throw(); void toStream(std::ostream& out, const CommandStatus* s) const throw(); - //for models - void toStream(std::ostream& out, Model* m, const Command* c) const throw(); void toStream(std::ostream& out, const Result& r) const throw(); };/* class Smt2Printer */ |