From 4fd22055d23fa1c11e51d6fe48538e84c6a3f118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Wed, 15 Jun 2022 16:15:26 +0200 Subject: [PATCH 01/76] parser: Some cleanup [WiP] --- src/api/Interpret.cc | 393 +++++++++---------- src/api/Interpret.h | 26 +- src/api/MainSolver.cc | 7 +- src/options/SMTConfig.cc | 273 +++++-------- src/options/SMTConfig.h | 566 +++++++++++---------------- src/parsers/smt2new/smt2newlexer.ll | 78 ++-- src/parsers/smt2new/smt2newparser.yy | 397 +++++++------------ src/proof/InterpolationContext.cc | 14 +- src/proof/InterpolationContext.h | 12 +- src/tsolvers/egraph/UFInterpolator.h | 6 +- src/tsolvers/lasolver/LASolver.cc | 10 +- 11 files changed, 747 insertions(+), 1035 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index aea515bd5..8a798a89c 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -39,12 +39,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Class defining interpreter ***********************************************************/ -Interpret::~Interpret() { - for (int i = 0; i < term_names.size(); ++i) { - free(term_names[i]); - } -} - PTRef Interpret::getParsedFormula() { @@ -52,77 +46,60 @@ Interpret::getParsedFormula() return root; } -void Interpret::setInfo(ASTNode& n) { - assert(n.getType() == UATTR_T || n.getType() == PATTR_T); +void Interpret::setInfo(ASTNode const & n) { + assert(n.getType() == ASTType::UATTR_T || n.getType() == ASTType::PATTR_T); - char* name = NULL; - if (n.getValue() == NULL) { - ASTNode& an = **(n.children->begin()); - assert(an.getType() == UATTR_T || an.getType() == PATTR_T); - name = strdup(an.getValue()); + std::string name; + if (n.getValue().empty()) { + ASTNode const & an = n.children[0]; + assert(an.getType() == ASTType::UATTR_T || an.getType() == ASTType::PATTR_T); + name = an.getValue(); } else // Normal option - name = strdup(n.getValue()); + name = n.getValue(); Info value(n); - config.setInfo(name, value); - free(name); + config.setInfo(std::move(name), value); } -void Interpret::getInfo(ASTNode& n) { - assert(n.getType() == INFO_T); - - const char* name; - - if (n.getValue() != NULL) - name = n.getValue(); - else { - assert(n.children != NULL); - name = (**(n.children->begin())).getValue(); - } +void Interpret::getInfo(ASTNode const & n) { + assert(n.getType() == ASTType::INFO_T); + assert(n.getValue().empty() or not n.children.empty()); + std::string const & name = n.getValue().empty() ? "" : n.children[0].getValue(); const Info& value = config.getInfo(name); if (value.isEmpty()) - notify_formatted(true, "no value for info %s", name); + notify_formatted(true, "no value for info %s", name.c_str()); else { auto val_str = value.toString(); - notify_formatted(false, "%s %s", name, val_str.c_str()); + notify_formatted(false, "%s %s", name.c_str(), val_str.c_str()); } } -void Interpret::setOption(ASTNode& n) { - assert(n.getType() == OPTION_T); - char* name = NULL; - - if (n.getValue() == NULL) { - // Attribute - ASTNode& an = **(n.children->begin()); - assert(an.getType() == UATTR_T || an.getType() == PATTR_T); - name = strdup(an.getValue()); - } - else // Normal option - name = strdup(n.getValue()); +void Interpret::setOption(ASTNode const & n) { + assert(n.getType() == ASTType::OPTION_T); + assert(not n.getValue().empty() or not n.children.empty()); + std::string const & name = n.getValue().empty() ? n.children[0].getValue() : n.getValue(); SMTOption value(n); const char* msg = "ok"; bool rval = config.setOption(name, value, msg); if (rval == false) - notify_formatted(true, "set-option failed for %s: %s", name, msg); - free(name); + notify_formatted(true, "set-option failed for %s: %s", name.c_str(), msg); } -void Interpret::getOption(ASTNode& n) { - assert(n.getType() == UATTR_T || n.getType() == PATTR_T ); +void Interpret::getOption(ASTNode const & n) { + assert(n.getType() == ASTType::UATTR_T || n.getType() == ASTType::PATTR_T ); - assert(n.getValue() != NULL); - const char* name = n.getValue(); + assert(not n.getValue().empty()); + std::string const & name = n.getValue(); const SMTOption& value = config.getOption(name); if (value.isEmpty()) - notify_formatted(true, "No value for attr %s", name); + notify_formatted(true, "No value for attr %s", name.c_str()); else { auto str_val = value.toString(); notify_formatted(false, "%s",str_val.c_str()); @@ -137,20 +114,20 @@ using opensmt::Logic_t; using opensmt::getLogicFromString; using namespace osmttokens; -void Interpret::interp(ASTNode& n) { - assert(n.getType() == CMD_T); +void Interpret::interp(ASTNode const & n) { + assert(n.getType() == ASTType::CMD_T); const smt2token cmd = n.getToken(); try { switch (cmd.x) { case t_setlogic: { - ASTNode &logic_n = **(n.children->begin()); - const char *logic_name = logic_n.getValue(); + ASTNode const & logic_n = *n.children.begin(); + std::string const & logic_name = logic_n.getValue(); if (isInitialized()) { notify_formatted(true, "logic has already been set to %s", main_solver->getLogic().getName().data()); } else { auto logic_type = getLogicFromString(logic_name); if (logic_type == Logic_t::UNDEF) { - notify_formatted(true, "unknown logic %s", logic_name); + notify_formatted(true, "unknown logic %s", logic_name.c_str()); break; } initializeLogic(logic_type); @@ -161,37 +138,35 @@ void Interpret::interp(ASTNode& n) { break; } case t_setinfo: { - setInfo(**(n.children->begin())); + setInfo(n.children[0]); notify_success(); break; } case t_getinfo: { - getInfo(**(n.children->begin())); + getInfo(n.children[0]); break; } case t_setoption: { - setOption(**(n.children->begin())); + setOption(n.children[0]); notify_success(); break; } case t_getoption: { - getOption(**(n.children->begin())); + getOption(n.children[0]); break; } case t_declaresort: { if (isInitialized()) { - assert(n.children and n.children->size() == 2); - auto it = n.children->begin(); - ASTNode & symbolNode = **it; - assert(symbolNode.getType() == SYM_T or symbolNode.getType() == QSYM_T); - ++it; - ASTNode & numNode = **it; - assert(numNode.getType() == NUM_T); - int arity = atoi(numNode.getValue()); // MB: TODO: take care of out-of-range input + assert(n.children.size() == 2); + ASTNode const & symbolNode = n.children[0]; + assert(symbolNode.getType() == ASTType::SYM_T or symbolNode.getType() == ASTType::QSYM_T); + ASTNode const & numNode = n.children[1]; + assert(numNode.getType() == ASTType::NUM_T); + int arity = std::stoi(numNode.getValue()); // MB: TODO: take care of out-of-range input SortSymbol symbol(symbolNode.getValue(), arity); SSymRef ssref; if (logic->peekSortSymbol(symbol, ssref)) { - notify_formatted(true, "sort %s already declared", symbolNode.getValue()); + notify_formatted(true, "sort %s already declared", symbolNode.getValue().c_str()); } else { logic->declareSortSymbol(std::move(symbol)); notify_success(); @@ -218,7 +193,7 @@ void Interpret::interp(ASTNode& n) { case t_assert: { if (isInitialized()) { sstat status; - ASTNode &asrt = **(n.children->begin()); + ASTNode const &asrt = n.children[0]; LetRecords letRecords; PTRef tr = parseTerm(asrt, letRecords); if (tr == PTRef_Undef) @@ -323,14 +298,14 @@ void Interpret::interp(ASTNode& n) { if (status == s_Error) notify_formatted(true, "write-state"); } else { - writeState((**(n.children->begin())).getValue()); + writeState(n.children[0].getValue()); } } break; } case t_echo: { - const char *str = (**(n.children->begin())).getValue(); - notify_formatted(false, "%s", str); + std::string const & str = n.children[0].getValue(); + notify_formatted(false, "%s", str.c_str()); break; } case t_push: { @@ -338,7 +313,7 @@ void Interpret::interp(ASTNode& n) { notify_formatted(true, "Illegal command before set-logic: push"); } else { try { - int num = std::stoi((**(n.children->begin())).getValue()); + int num = std::stoi(n.children[0].getValue()); push(num); } catch (std::out_of_range const & e) { notify_formatted(true, "Illegal push command: %s", e.what()); @@ -351,8 +326,7 @@ void Interpret::interp(ASTNode& n) { notify_formatted(true, "Illegal command before set-logic: pop"); } else { try { - std::string str((**(n.children->begin())).getValue()); - int num = std::stoi(str); + int num = std::stoi(n.children[0].getValue()); pop(num); } catch (std::out_of_range const &ex) { notify_formatted(true, "Illegal pop command: %s", ex.what()); @@ -375,23 +349,23 @@ void Interpret::interp(ASTNode& n) { } -bool Interpret::addLetFrame(const vec & names, vec const& args, LetRecords& letRecords) { +bool Interpret::addLetFrame(std::vector const & names, vec const& args, LetRecords& letRecords) { assert(names.size() == args.size()); if (names.size() > 1) { // check that they are pairwise distinct; - std::unordered_set> namesAsSet(names.begin(), names.end()); - if (namesAsSet.size() != names.size_()) { + std::unordered_set namesAsSet(names.begin(), names.end()); + if (namesAsSet.size() != names.size()) { comment_formatted("Overloading let variables makes no sense"); return false; } } for (int i = 0; i < names.size(); ++i) { - const char* name = names[i]; - if (logic->hasSym(name) && logic->getSym(logic->symNameToRef(name)[0]).noScoping()) { - comment_formatted("Names marked as no scoping cannot be overloaded with let variables: %s", name); + std::string const & name = names[i]; + if (logic->hasSym(name.c_str()) && logic->getSym(logic->symNameToRef(name.c_str())[0]).noScoping()) { + comment_formatted("Names marked as no scoping cannot be overloaded with let variables: %s", name.c_str()); return false; } - letRecords.addBinding(name, args[i]); + letRecords.addBinding(name.c_str(), args[i]); } return true; } @@ -424,39 +398,37 @@ PTRef Interpret::resolveTerm(const char* s, vec&& args, SRef sortRef, Sym PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { ASTType t = term.getType(); - if (t == TERM_T) { - const char* name = (**(term.children->begin())).getValue(); + if (t == ASTType::TERM_T) { + std::string const & name = term.children[0].getValue(); // comment_formatted("Processing term %s", name); PTRef tr = PTRef_Undef; try { - tr = logic->mkConst(name); + tr = logic->mkConst(name.c_str()); } catch (OsmtApiException const & e) { - comment_formatted("While processing %s: %s", name, e.what()); + comment_formatted("While processing %s: %s", name.c_str(), e.what()); } return tr; } - else if (t == QID_T) { - if ((**(term.children->begin())).getType() == AS_T) { - auto const & as_node = **(term.children->begin()); - ASTNode const * symbolNode = (*as_node.children)[0]; - bool isQuoted = symbolNode->getType() == QSYM_T; - const char * name = (*as_node.children)[0]->getValue(); - ASTNode const & sortNode = *(*as_node.children)[1]; - assert(name != nullptr); - PTRef tr = resolveQualifiedIdentifier(name, sortNode, isQuoted); + else if (t == ASTType::QID_T) { + if (term.children[0].getType() == ASTType::AS_T) { + ASTNode const & as_node = term.children[0]; + ASTNode const & symbolNode = as_node.children[0]; + bool isQuoted = symbolNode.getType() == ASTType::QSYM_T; + std::string const & name = as_node.children[0].getValue(); + ASTNode const & sortNode = as_node.children[1]; + assert(not name.empty()); + PTRef tr = resolveQualifiedIdentifier(name.c_str(), sortNode, isQuoted); return tr; } else { - ASTNode const * symbolNode = (*(term.children->begin())); - char const * name = symbolNode->getValue(); - bool isQuoted = symbolNode->getType() == QSYM_T; - assert(name != nullptr); - PTRef tr = letNameResolve(name, letRecords); + ASTNode const & symbolNode = term.children[0]; + std::string const & name = symbolNode.getValue(); + bool isQuoted = symbolNode.getType() == ASTType::QSYM_T; + PTRef tr = letNameResolve(name.c_str(), letRecords); if (tr != PTRef_Undef) { return tr; - } - try { - tr = resolveTerm(name, {}, SRef_Undef, isQuoted ? SymbolMatcher::Uninterpreted : SymbolMatcher::Any); + } try { + tr = resolveTerm(name.c_str(), {}, SRef_Undef, isQuoted ? SymbolMatcher::Uninterpreted : SymbolMatcher::Any); } catch (OsmtApiException & e) { reportError(e.what()); } @@ -464,63 +436,63 @@ PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { } } - else if ( t == LQID_T ) { + else if ( t == ASTType::LQID_T ) { // Multi-argument term - auto node_iter = term.children->begin(); + assert(term.children.size() > 1); + auto const & astArgs = opensmt::span(&term.children[1], term.children.size()-1); + std::string const & name = term.children[0].getValue(); vec args; - const char* name = (**node_iter).getValue(); node_iter++; - // Parse the arguments - for (; node_iter != term.children->end(); node_iter++) { - PTRef arg_term = parseTerm(**node_iter, letRecords); - if (arg_term == PTRef_Undef) + for (auto const & arg : astArgs) { + PTRef arg_tr = parseTerm(arg, letRecords); + if (arg_tr == PTRef_Undef) { return PTRef_Undef; - else - args.push(arg_term); + } else { + args.push(arg_tr); + } } + assert(args.size() > 0); PTRef tr = PTRef_Undef; try { - tr = resolveTerm(name, std::move(args)); + tr = resolveTerm(name.c_str(), std::move(args)); } catch (ArithDivisionByZeroException &ex) { reportError(ex.what()); } catch (OsmtApiException &e) { reportError(e.what()); } return tr; - } - - else if (t == LET_T) { - auto ch = term.children->begin(); - auto vbl = (**ch).children->begin(); + } else if (t == ASTType::LET_T) { + assert(term.children.size() == 2); + std::vector const & varList = term.children[0].children; + ASTNode const & letBoundedTerm = term.children[1]; vec tmp_args; - vec names; + std::vector names; + // use RAII idiom to guard the scope of new LetFrame (and ensure the cleaup of names) class Guard { LetRecords& rec; - vec& names; + std::vector &names; public: - Guard(LetRecords& rec, vec& names): rec(rec), names(names) { rec.pushFrame(); } - ~Guard() { rec.popFrame(); for (int i = 0; i < names.size(); i++) { free(names[i]); }} + Guard(LetRecords& rec, std::vector & names): rec(rec), names(names) { rec.pushFrame(); } + ~Guard() { rec.popFrame(); } } scopeGuard(letRecords, names); // First read the term declarations in the let statement - while (vbl != (**ch).children->end()) { - PTRef let_tr = parseTerm(**((**vbl).children->begin()), letRecords); + for (auto const & varListEl : varList) { + PTRef let_tr = parseTerm(varListEl.children[0], letRecords); if (let_tr == PTRef_Undef) return PTRef_Undef; tmp_args.push(let_tr); - char* name = strdup((**vbl).getValue()); - names.push(name); - vbl++; + names.push_back(varListEl.getValue()); } + // Only then insert them to the table bool success = addLetFrame(names, tmp_args, letRecords); if (not success) { comment_formatted("Let name addition failed"); return PTRef_Undef; } - ch++; // This is now constructed with the let declarations context in let_branch - PTRef tr = parseTerm(**(ch), letRecords); + PTRef tr = parseTerm(letBoundedTerm, letRecords); if (tr == PTRef_Undef) { comment_formatted("Failed in parsing the let scoped term"); return PTRef_Undef; @@ -528,34 +500,34 @@ PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { return tr; } - else if (t == BANG_T) { - assert(term.children->size() == 2); - auto ch = term.children->begin(); - ASTNode& named_term = **ch; - ASTNode& attr_l = **(++ ch); - assert(attr_l.getType() == GATTRL_T); - assert(attr_l.children->size() == 1); - ASTNode& name_attr = **(attr_l.children->begin()); + else if (t == ASTType::BANG_T) { + assert(term.children.size() == 2); + + ASTNode const & named_term = term.children[0]; + ASTNode const & attr_l = term.children[1]; + assert(attr_l.getType() == ASTType::GATTRL_T); + assert(attr_l.children.size() == 1); + ASTNode const & name_attr = attr_l.children[0]; PTRef tr = parseTerm(named_term, letRecords); if (tr == PTRef_Undef) return tr; - if (strcmp(name_attr.getValue(), ":named") == 0) { - ASTNode& sym = **(name_attr.children->begin()); - assert(sym.getType() == SYM_T or sym.getType() == QSYM_T); - if (nameToTerm.has(sym.getValue())) { - notify_formatted(true, "name %s already exists", sym.getValue()); + if (name_attr.getValue() == ":named") { + ASTNode const & sym = name_attr.children[0]; + assert(sym.getType() == ASTType::SYM_T or sym.getType() == ASTType::QSYM_T); + if (nameToTerm.has(sym.getValue().c_str())) { + notify_formatted(true, "name %s already exists", sym.getValue().c_str()); return PTRef_Undef; } - char* name = strdup(sym.getValue()); + std::string name = sym.getValue(); // MB: term_names becomes the owner of the string and is responsible for deleting - term_names.push(name); - nameToTerm.insert(name, tr); + term_names.push_back(name); + nameToTerm.insert(name.c_str(), tr); if (!termToNames.has(tr)) { vec v; termToNames.insert(tr, v); } - termToNames[tr].push(name); + termToNames[tr].push(name.c_str()); } return tr; } @@ -591,10 +563,9 @@ sstat Interpret::checkSat() { if (res == s_Undef) { const SMTOption& o_dump_state = config.getOption(":dump-state"); const SpType o_split = config.sat_split_type(); - char* name = config.dump_state(); + std::string name = config.dump_state(); if (!o_dump_state.isEmpty() && o_split == spt_none) writeState(name); - free(name); } return res; @@ -649,8 +620,8 @@ bool Interpret::getAssignment() { std::stringstream ss; ss << '('; for (int i = 0; i < term_names.size(); i++) { - const char* name = term_names[i]; - PTRef tr = nameToTerm[name]; + std::string const & name = term_names[i]; + PTRef tr = nameToTerm[name.c_str()]; lbool val = main_solver->getTermValue(tr); ss << '(' << name << ' ' << (val == l_True ? "true" : (val == l_False ? "false" : "unknown")) << ')' << (i < term_names.size() - 1 ? " " : ""); @@ -661,13 +632,12 @@ bool Interpret::getAssignment() { return true; } -void Interpret::getValue(const std::vector* terms) +void Interpret::getValue(std::vector const & terms) { auto model = main_solver->getModel(); Logic& logic = main_solver->getLogic(); std::vector> values; - for (auto term_it = terms->begin(); term_it != terms->end(); ++term_it) { - const ASTNode& term = **term_it; + for (auto const & term : terms) { LetRecords tmp; PTRef tr = parseTerm(term, tmp); if (tr != PTRef_Undef) { @@ -675,7 +645,7 @@ void Interpret::getValue(const std::vector* terms) auto pt_str = logic.printTerm(tr); comment_formatted("Found the term %s", pt_str.c_str()); } else - comment_formatted("Error parsing the term %s", (**(term.children->begin())).getValue()); + comment_formatted("Error parsing the term %s", term.children[0].getValue().c_str()); } printf("("); for (auto const & valPair : values) { @@ -818,12 +788,12 @@ std::string Interpret::printDefinitionSmtlib(TemplateFunction const & templateFu return ss.str(); } -void Interpret::writeState(const char* filename) +void Interpret::writeState(std::string const & filename) { char* msg; bool rval; - rval = main_solver->writeSolverState_smtlib2(filename, &msg); + rval = main_solver->writeSolverState_smtlib2(filename.c_str(), &msg); if (!rval) { notify_formatted("%s", msg); @@ -832,13 +802,12 @@ void Interpret::writeState(const char* filename) bool Interpret::declareFun(ASTNode const & n) // (const char* fname, const vec& args) { - auto it = n.children->begin(); - ASTNode const & name_node = **(it++); - ASTNode const & args_node = **(it++); - ASTNode const & ret_node = **(it++); - assert(it == n.children->end()); + assert(n.children.size() == 3); + ASTNode const & name_node = n.children[0]; + ASTNode const & args_node = n.children[1]; + ASTNode const & ret_node = n.children[2]; - const char* fname = name_node.getValue(); + std::string const & fname = name_node.getValue(); vec args; @@ -846,16 +815,16 @@ bool Interpret::declareFun(ASTNode const & n) // (const char* fname, const vecdeclareFun(fname, rsort, args2); if (rval == SymRef_Undef) { - comment_formatted("Error while declare-fun %s", fname); + comment_formatted("Error while declare-fun %s", fname.c_str()); return false; } user_declarations.push(rval); return true; } -bool Interpret::declareConst(ASTNode& n) //(const char* fname, const SRef ret_sort) +bool Interpret::declareConst(ASTNode const & n) //(const char* fname, const SRef ret_sort) { - assert(n.children and n.children->size() == 3); - auto it = n.children->begin(); - ASTNode const & name_node = **(it++); - it++; // args_node - ASTNode const & ret_node = **(it++); - const char* fname = name_node.getValue(); + assert(n.children.size() == 3); + ASTNode const & name_node = n.children[0]; + // n.children[1] is the args node, which is empty + ASTNode const & ret_node = n.children[2]; + + std::string const & fname = name_node.getValue(); SRef ret_sort = sortFromASTNode(ret_node); if (ret_sort == SRef_Undef) { - notify_formatted(true, "Failed to declare constant %s", fname); - notify_formatted(true, "Unknown return sort %s of %s", sortSymbolFromASTNode(ret_node).name.c_str(), fname); + notify_formatted(true, "Failed to declare constant %s", fname.c_str()); + notify_formatted(true, "Unknown return sort %s of %s", sortSymbolFromASTNode(ret_node).name.c_str(), fname.c_str()); return false; } SymRef rval = logic->declareFun(fname, ret_sort, {}); if (rval == SymRef_Undef) { - comment_formatted("Error while declare-const %s", fname); + comment_formatted("Error while declare-const %s", fname.c_str()); return false; } user_declarations.push(rval); @@ -903,26 +872,25 @@ bool Interpret::declareConst(ASTNode& n) //(const char* fname, const SRef ret_so bool Interpret::defineFun(const ASTNode& n) { - auto it = n.children->begin(); - ASTNode const & name_node = **(it++); - ASTNode const & args_node = **(it++); - ASTNode const & ret_node = **(it++); - ASTNode const & term_node = **(it++); - assert(it == n.children->end()); + assert(n.children.size() == 4); + + ASTNode const & name_node = n.children[0]; + ASTNode const & args_node = n.children[1]; + ASTNode const & ret_node = n.children[2]; + ASTNode const & term_node = n.children[3]; - const char* fname = name_node.getValue(); + std::string const & fname = name_node.getValue(); // Get the argument sorts vec arg_sorts; vec arg_trs; - for (auto childNodePtr : *args_node.children) { - ASTNode const & childNode = *childNodePtr; - assert(childNode.children->size() == 1); + for (auto const & childNode : args_node.children) { + assert(childNode.children.size() == 1); std::string varName = childNode.getValue(); - ASTNode const & sortNode = **(childNode.children->begin()); + ASTNode const & sortNode = childNode.children[0]; SRef sortRef = sortFromASTNode(sortNode); if (sortRef == SRef_Undef) { - notify_formatted(true, "Undefined sort %s in function %s", sortSymbolFromASTNode(sortNode).name.c_str(), fname); + notify_formatted(true, "Undefined sort %s in function %s", sortSymbolFromASTNode(sortNode).name.c_str(), fname.c_str()); return false; } arg_sorts.push(sortRef); @@ -933,7 +901,7 @@ bool Interpret::defineFun(const ASTNode& n) // The return sort SRef ret_sort = sortFromASTNode(ret_node); if (ret_sort == SRef_Undef) { - notify_formatted(true, "Unknown return sort %s of %s", sortSymbolFromASTNode(ret_node).name.c_str(), fname); + notify_formatted(true, "Unknown return sort %s of %s", sortSymbolFromASTNode(ret_node).name.c_str(), fname.c_str()); return false; } sstat status; @@ -1042,11 +1010,9 @@ void Interpret::notify_success() { } void Interpret::execute(const ASTNode* r) { - auto i = r->children->begin(); - for (; i != r->children->end() && !f_exit; i++) { - interp(**i); - delete *i; - *i = nullptr; + for (auto const & command : r->children) { + if (f_exit) break; + interp(command); } } @@ -1188,47 +1154,49 @@ int Interpret::interpPipe() { SortSymbol Interpret::sortSymbolFromASTNode(ASTNode const & node) { auto type = node.getType(); - if (type == SYM_T or type == QSYM_T) { + if (type == ASTType::SYM_T or type == ASTType::QSYM_T) { return {node.getValue(), 0}; } else { - assert(type == LID_T and node.children and not node.children->empty()); - ASTNode const & name = **(node.children->begin()); - return {name.getValue(), static_cast(node.children->size() - 1)}; + assert(type == ASTType::LID_T and not node.children.empty()); + ASTNode const & name = node.children[0]; + return {name.getValue(), static_cast(node.children.size() - 1)}; } } SRef Interpret::sortFromASTNode(ASTNode const & node) const { auto type = node.getType(); - if (type == SYM_T or type == QSYM_T) { + if (type == ASTType::SYM_T or type == ASTType::QSYM_T) { SortSymbol symbol(node.getValue(), 0); SSymRef symRef; bool known = logic->peekSortSymbol(symbol, symRef); if (not known) { return SRef_Undef; } return logic->getSort(symRef, {}); } else { - assert(type == LID_T and node.children and not node.children->empty()); - ASTNode const & name = **(node.children->begin()); - SortSymbol symbol(name.getValue(), node.children->size() - 1); + assert(type == ASTType::LID_T and not node.children.empty()); + ASTNode const & name = node.children[0]; + SortSymbol symbol(name.getValue(), node.children.size() - 1); SSymRef symRef; bool known = logic->peekSortSymbol(symbol, symRef); if (not known) { return SRef_Undef; } vec args; - for (auto it = node.children->begin() + 1; it != node.children->end(); ++it) { - SRef argSortRef = sortFromASTNode(**it); + auto astArgs = opensmt::span(&node.children[1], node.children.size()-1); + for (auto const & astArg : astArgs) { + SRef argSortRef = sortFromASTNode(astArg); if (argSortRef == SRef_Undef) { return SRef_Undef; } args.push(argSortRef); } return logic->getSort(symRef, std::move(args)); } - assert(type == LID_T and node.children and not node.children->empty()); - ASTNode const & name = **(node.children->begin()); - SortSymbol symbol(name.getValue(), node.children->size() - 1); + assert(type == ASTType::LID_T and not node.children.empty()); + ASTNode const & name = node.children[0]; + SortSymbol symbol(name.getValue(), node.children.size() - 1); SSymRef symRef; bool known = logic->peekSortSymbol(symbol, symRef); if (not known) { return SRef_Undef; } vec args; - for (auto it = node.children->begin() + 1; it != node.children->end(); ++it) { - SRef argSortRef = sortFromASTNode(**it); + auto astSortArgs = opensmt::span(&node.children[1], node.children.size()-1); + for (auto const & astSortArg : astSortArgs) { + SRef argSortRef = sortFromASTNode(astSortArg); if (argSortRef == SRef_Undef) { return SRef_Undef; } args.push(argSortRef); } @@ -1237,7 +1205,7 @@ SRef Interpret::sortFromASTNode(ASTNode const & node) const { void Interpret::getInterpolants(const ASTNode& n) { - auto exps = *n.children; + auto const & exps = n.children; vec grouping; // Consists of PTRefs that we want to group LetRecords letRecords; letRecords.pushFrame(); @@ -1245,8 +1213,7 @@ void Interpret::getInterpolants(const ASTNode& n) letRecords.addBinding(key, nameToTerm[key]); } - for (auto e : exps) { - ASTNode& c = *e; + for (auto const & c : exps) { PTRef tr = parseTerm(c, letRecords); // printf("Itp'ing a term %s\n", logic->pp(tr)); grouping.push(tr); @@ -1325,8 +1292,8 @@ void Interpret::initializeLogic(opensmt::Logic_t logicType) { logic.reset(opensmt::LogicFactory::getInstance(logicType)); } -std::unique_ptr Interpret::createMainSolver(const char* logic_name) { - return std::make_unique(*logic, config, std::string(logic_name) + " solver"); +std::unique_ptr Interpret::createMainSolver(std::string const & logic_name) { + return std::make_unique(*logic, config, logic_name + " solver"); } diff --git a/src/api/Interpret.h b/src/api/Interpret.h index 05d3b2ad2..6a3d524cb 100644 --- a/src/api/Interpret.h +++ b/src/api/Interpret.h @@ -137,7 +137,7 @@ class Interpret { // Named terms for getting variable values MapWithKeys> nameToTerm; VecMap > termToNames; - vec term_names; // For (! :named ) constructs. if Itp is enabled, this maps a + std::vector term_names; // For (! :named ) constructs. if Itp is enabled, this maps a // partition to it name. vec assertions; vec user_declarations; @@ -148,16 +148,16 @@ class Interpret { SRef sortFromASTNode(ASTNode const & n) const; static SortSymbol sortSymbolFromASTNode(ASTNode const & node); - void setInfo(ASTNode& n); - void getInfo(ASTNode& n); - void setOption(ASTNode& n); - void getOption(ASTNode& n); - void writeState(const char* fname); + void setInfo(ASTNode const & n); + void getInfo(ASTNode const & n); + void setOption(ASTNode const & n); + void getOption(ASTNode const & n); + void writeState(std::string const & fname); bool declareFun(ASTNode const & n); //(const char* fname, const vec& args); - bool declareConst(ASTNode& n); //(const char* fname, const SRef ret_sort); - bool defineFun(const ASTNode& n); + bool declareConst(ASTNode const & n); //(const char* fname, const SRef ret_sort); + bool defineFun(ASTNode const & n); virtual sstat checkSat(); - void getValue(const std::vector* term); + void getValue(std::vector const & term); void getModel(); std::string printDefinitionSmtlib(PTRef tr, PTRef val); std::string printDefinitionSmtlib(const TemplateFunction &templateFun) const; @@ -170,17 +170,17 @@ class Interpret { virtual void exit(); void getInterpolants(const ASTNode& n); - void interp (ASTNode& n); + void interp (ASTNode const & n); void notify_formatted(bool error, const char* s, ...); void notify_success(); void comment_formatted(const char* s, ...) const; - bool addLetFrame(const vec & names, vec const& args, LetRecords& letRecords); + bool addLetFrame(std::vector const & names, vec const& args, LetRecords& letRecords); PTRef letNameResolve(const char* s, const LetRecords& letRecords) const; PTRef resolveQualifiedIdentifier(const char * name, ASTNode const & sort, bool isQuoted); - virtual std::unique_ptr createMainSolver(const char* logic_name); + virtual std::unique_ptr createMainSolver(std::string const & logic_name); public: @@ -189,8 +189,6 @@ class Interpret { , f_exit (false) { } - ~Interpret(); - int interpFile(FILE* in); int interpFile(char *content); int interpPipe(); diff --git a/src/api/MainSolver.cc b/src/api/MainSolver.cc index ceb3754fd..e1efac304 100644 --- a/src/api/MainSolver.cc +++ b/src/api/MainSolver.cc @@ -245,12 +245,12 @@ bool MainSolver::writeSolverState_smtlib2(const char* file, char** msg) const void MainSolver::printFramesAsQuery() const { - char* base_name = config.dump_query_name(); - if (base_name == NULL) + auto base_name = config.dump_query_name(); + if (base_name.empty()) getTheory().printFramesAsQuery(frames.getFrameReferences(), std::cout); else { char* s_file_name; - int chars_written = asprintf(&s_file_name, "%s-%d.smt2", base_name, check_called); + int chars_written = asprintf(&s_file_name, "%s-%d.smt2", base_name.c_str(), check_called); (void)chars_written; std::ofstream stream; stream.open(s_file_name); @@ -258,7 +258,6 @@ void MainSolver::printFramesAsQuery() const stream.close(); free(s_file_name); } - free(base_name); } sstat MainSolver::check() diff --git a/src/options/SMTConfig.cc b/src/options/SMTConfig.cc index 3952b3194..30485ffc9 100644 --- a/src/options/SMTConfig.cc +++ b/src/options/SMTConfig.cc @@ -30,55 +30,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -void ASTNode::print(std::ostream& o, int indent) { - for (int i = 0; i < indent; i++) - printf(" "); - o << "" << std::endl; - if (children == NULL) return; - for (auto i = children->begin(); i != children->end(); i++) - (*i)->print(o, indent+1); -} - -const char* ASTNode::typestr[] = { - "command" , "command-list" // CMD - , "symbol" , "symbol-list" // SYM - , "number" , "number_list" // NUM - , "sort" , "sort-list" // SORT - , "sorted-var" , "sorted-var-list" // SV - , "user-attr" , "user-attr-list" // UATTR - , "predef-attr" , "predef-attr-list" // PATTR - , "gen-attr" , "gen-attr-list" // GATTR - , "spec-const" , "spec-const-list" // SPECC - , "s-expr" , "s-expr-list" // SEXPR - , "identifier" , "identifier-list" // ID - , "long-identifier" , "long-identifier-list" // LID - , "decimal" , "decimal-list" // DEC - , "hex" , "hex-list" // HEX - , "binary" , "binary-list" // BIN - , "string" , "string-list" // STR - , "as" , "as-list" // AS - , "var-binding" , "var-binding-list" // VARB - , "term" , "term-list" // TERM - , "qualified-id" , "qualified-id-list" // QID - , "long-qual-id" , "long-qual-id-list" // LQID - , "let" , "let-list" // LET - , "forall" , "forall-list" // FORALL - , "exists" , "exists-list" // EXISTS - , "!" , "!-list" // BANG - , "sort-sym-decl" , "sort-sym-decl-list" // SSYMD - , "fun-sym-decl" , "fun-sym-decl-list" // FSYMD - , "par-fun-sym-decl", "par-fun-sym-decl-list" // PFSYMD - , "pf-2nd" , "pf-2nd-list" // PFID - , "theory-attr" , "theory-attr-list" // TATTR - , "theory-decl" , "theory-decl-list" // TDECL - , "logic-attr" , "logic-attr-list" // LATTR - , "logic" , "logic-list" // LOGIC - , "bool" , "bool-list" // BOOL - , "option" , "option-list" // OPTION - , "info-flag" , "info-flag-list" // INFO -}; - - /********************************************************************* * Generic configuration class, used for both set-info and set-option *********************************************************************/ @@ -89,61 +40,60 @@ ConfValue::ConfValue(const char* s) { } ConfValue::ConfValue(const ASTNode& s_expr_n) { - if (s_expr_n.getType() == SEXPRL_T) { + if (s_expr_n.getType() == ASTType::SEXPRL_T) { type = O_LIST; configs = new std::list; - for (auto i = s_expr_n.children->begin(); i != s_expr_n.children->end(); i++) - configs->push_back(new ConfValue(**i)); - } - else if (s_expr_n.getType() == SYM_T) { + for (auto const & i : s_expr_n.children) { + configs->push_back(new ConfValue(i)); + } + } else if (s_expr_n.getType() == ASTType::SYM_T) { type = O_SYM; - strval = strdup(s_expr_n.getValue()); - } - else if (s_expr_n.getType() == SPECC_T) { - ASTNode& spn = **(s_expr_n.children->begin()); - if (spn.getType() == NUM_T) { + strval = s_expr_n.getValue(); + } else if (s_expr_n.getType() == ASTType::SPECC_T) { + assert(s_expr_n.children.size() > 0); + ASTNode const & spn = s_expr_n.children[0]; + if (spn.getType() == ASTType::NUM_T) { type = O_NUM; - numval = atoi(spn.getValue()); - } - else if (spn.getType() == DEC_T) { + numval = std::stoi(spn.getValue()); + } else if (spn.getType() == ASTType::DEC_T) { type = O_DEC; - char* end; - decval = strtod(spn.getValue(), &end); - assert(end != NULL); - } - else if (spn.getType() == HEX_T) { + decval = std::stod(spn.getValue()); + } else if (spn.getType() == ASTType::HEX_T) { type = O_HEX; std::string tmp(spn.getValue()); tmp.erase(0,2); char* end; unumval = strtoul(tmp.c_str(), &end, 16); - assert(end != NULL); + assert(end); } - else if (spn.getType() == BIN_T) { + else if (spn.getType() == ASTType::BIN_T) { type = O_BIN; std::string tmp(spn.getValue()); tmp.erase(0,2); char* end; unumval = strtoul(tmp.c_str(), &end, 2); - assert(end != NULL); + assert(end); } - else if (spn.getType() == STR_T) { + else if (spn.getType() == ASTType::STR_T) { type = O_STR; - strval = strdup(spn.getValue()); + strval = spn.getValue(); } - else assert(false); - } - else if (s_expr_n.getType() == UATTR_T) { + else { + assert(false); + } + } else if (s_expr_n.getType() == ASTType::UATTR_T) { type = O_ATTR; - strval = strdup(s_expr_n.getValue()); + strval = s_expr_n.getValue(); + } + else { + assert(false); //Not implemented } - else assert(false); //Not implemented } ConfValue::ConfValue(const ConfValue& other) { type = other.type; if (type == O_NUM) numval = other.numval; - else if (type == O_STR) strval = strdup(other.strval); + else if (type == O_STR) strval = other.strval; else if (type == O_DEC) decval = other.decval; else if (type == O_LIST) { configs = new std::list; @@ -151,13 +101,13 @@ ConfValue::ConfValue(const ConfValue& other) { configs->push_back(new ConfValue(*value)); } else if (type == O_SYM) - strval = strdup(other.strval); + strval = other.strval; else if (type == O_HEX) unumval = other.unumval; else if (type == O_BIN) unumval = other.unumval; else if (type == O_ATTR) - strval = strdup(other.strval); + strval = other.strval; else if (type == O_BOOL) numval = other.numval; else if (type == O_EMPTY) @@ -169,7 +119,7 @@ ConfValue& ConfValue::operator=(const ConfValue& other) { type = other.type; if (type == O_NUM) numval = other.numval; - else if (type == O_STR) strval = strdup(other.strval); + else if (type == O_STR) strval = other.strval; else if (type == O_DEC) decval = other.decval; else if (type == O_LIST) { configs = new std::list; @@ -177,13 +127,13 @@ ConfValue& ConfValue::operator=(const ConfValue& other) configs->push_back(new ConfValue(*value)); } else if (type == O_SYM) - strval = strdup(other.strval); + strval = other.strval; else if (type == O_HEX) unumval = other.unumval; else if (type == O_BIN) unumval = other.unumval; else if (type == O_ATTR) - strval = strdup(other.strval); + strval = other.strval; else if (type == O_BOOL) numval = other.numval; else if (type == O_EMPTY) @@ -192,23 +142,13 @@ ConfValue& ConfValue::operator=(const ConfValue& other) return *this; } -ConfValue::~ConfValue() -{ - if (type == O_STR && strval != NULL) { - free(strval); - strval = NULL; - } - else if (type == O_EMPTY) - free(strval); - else if (type == O_LIST) { - for (auto * value : *configs) +ConfValue::~ConfValue() { + if (type == O_LIST) { + for (auto * value : *configs) { delete value; + } delete configs; } - else if (type == O_SYM) - free(strval); - else if (type == O_ATTR) - free(strval); } std::string ConfValue::toString() const { @@ -255,20 +195,19 @@ std::string ConfValue::toString() const { ***********************************************************/ Info::Info(ASTNode const & n) { - assert(n.getType() == UATTR_T or n.getType() == PATTR_T); - if (n.children == NULL) { + assert(n.getType() == ASTType::UATTR_T or n.getType() == ASTType::PATTR_T); + if (n.children.empty()) { value.type = O_EMPTY; return; - } - else { + } else { // child is attribute_value - ASTNode const & child = **(n.children->begin()); + ASTNode const & child = n.children[0]; - if (child.getType() == SPECC_T or child.getType() == SEXPRL_T) { + if (child.getType() == ASTType::SPECC_T or child.getType() == ASTType::SEXPRL_T) { value = ConfValue(child); } - else if (child.getType() == SYM_T or child.getType() == QSYM_T) { - value.strval = strdup(child.getValue()); + else if (child.getType() == ASTType::SYM_T or child.getType() == ASTType::QSYM_T) { + value.strval = child.getValue(); value.type = O_STR; } else assert(false); @@ -285,55 +224,52 @@ Info::Info(const Info& other) ***********************************************************/ SMTOption::SMTOption(ASTNode const & n) { - assert(n.children); + assert(not n.children.empty()); - ASTNode const & child = **(n.children->begin()); + ASTNode const & child = n.children[0]; - if (child.getType() == BOOL_T) { + if (child.getType() == ASTType::BOOL_T) { value.type = O_BOOL; - value.numval = strcmp(child.getValue(), "true") == 0 ? 1 : 0; + value.numval = child.getValue() == "true" ? 1 : 0; return; } - if (child.getType() == STR_T) { + if (child.getType() == ASTType::STR_T) { value.type = O_STR; - value.strval = strdup(child.getValue()); + value.strval = child.getValue(); return; } - if (child.getType() == NUM_T) { + if (child.getType() == ASTType::NUM_T) { value.type = O_NUM; - value.numval = atoi(child.getValue()); + value.numval = std::stoi(child.getValue()); return; } - if (child.getType() == DEC_T) { + if (child.getType() == ASTType::DEC_T) { value.type = O_DEC; - sscanf(child.getValue(), "%lf", &value.decval); + value.decval = std::stod(child.getValue()); } - assert(child.getType() == UATTR_T or child.getType() == PATTR_T); + assert(child.getType() == ASTType::UATTR_T or child.getType() == ASTType::PATTR_T); // The option is an attribute - if (not child.children) { + if (child.children.empty()) { value.type = O_EMPTY; return; - } - else { + } else { // n is now attribute_value - ASTNode const & attributeValue = **(child.children->begin()); + ASTNode const & attributeValue = child.children[0]; - if (attributeValue.getType() == SPECC_T or attributeValue.getType() == SEXPRL_T) { + if (attributeValue.getType() == ASTType::SPECC_T or attributeValue.getType() == ASTType::SEXPRL_T) { value = ConfValue(attributeValue); } - else if (attributeValue.getType() == SYM_T) { - if (strcmp(attributeValue.getValue(), "true") == 0) { + else if (attributeValue.getType() == ASTType::SYM_T) { + if (attributeValue.getValue() == "true") { value.type = O_BOOL; value.numval = 1; - } - else if (strcmp(attributeValue.getValue(), "false") == 0) { + } else if (attributeValue.getValue() == "false") { value.type = O_BOOL; value.numval = 0; - } - else { - value.strval = strdup(attributeValue.getValue()); + } else { + value.strval = attributeValue.getValue(); value.type = O_STR; } return; @@ -345,7 +281,7 @@ SMTOption::SMTOption(ASTNode const & n) { //--------------------------------------------------------------------------------- // SMTConfig -bool SMTConfig::setOption(const char* name, const SMTOption& value, const char*& msg) { +bool SMTConfig::setOption(std::string const & name, const SMTOption& value, const char*& msg) { msg = "ok"; if (usedForInitialization && isPreInitializationOption(name)) { msg = "Option cannot be changed at this point"; @@ -353,11 +289,11 @@ bool SMTConfig::setOption(const char* name, const SMTOption& value, const char*& } // Special options: // stats_out - if (strcmp(name, o_stats_out) == 0) { + if (name == o_stats_out) { if (value.getValue().type != O_STR) { msg = s_err_not_str; return false; } - if (!optionTable.has(name)) + if (optionTable.find(name) == optionTable.end()) stats_out.open(value.getValue().strval, std::ios_base::out); - else if (strcmp(optionTable[name]->getValue().strval, value.getValue().strval) != 0) { + else if (optionTable[name]->getValue().strval != value.getValue().strval) { if (stats_out.is_open()) { stats_out.close(); stats_out.open(value.getValue().strval, std::ios_base::out); @@ -367,79 +303,80 @@ bool SMTConfig::setOption(const char* name, const SMTOption& value, const char*& } // produce stats - if (strcmp(name, o_produce_stats) == 0) { + if (name == o_produce_stats) { if (value.getValue().type != O_BOOL) { msg = s_err_not_bool; return false; } if (value.getValue().numval == 1) { // Gets set to true - if (!optionTable.has(o_stats_out)) { - if (!optionTable.has(o_produce_stats) || optionTable[o_produce_stats]->getValue().numval == 0) { + if (optionTable.find(o_stats_out) == optionTable.end()) { + if (optionTable.find(o_produce_stats) == optionTable.end() || optionTable[o_produce_stats]->getValue().numval == 0) { // Insert the default value insertOption(o_stats_out, new SMTOption("/dev/stdout")); - } - else if (optionTable.has(o_produce_stats) && optionTable[o_produce_stats]->getValue().numval == 1) + } else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats]->getValue().numval == 1) { assert(false); + } } else { } // No action required if (!stats_out.is_open()) stats_out.open(optionTable[o_stats_out]->getValue().strval, std::ios_base::out); } - else if (optionTable.has(o_produce_stats) && optionTable[o_produce_stats]->getValue().numval == 1) { + else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats]->getValue().numval == 1) { // gets set to false and was previously true - if (optionTable.has(o_stats_out)) { - if (optionTable[o_stats_out]->getValue().numval == 0) assert(false); + if (optionTable.find(o_stats_out) != optionTable.end()) { + if (optionTable.at(o_stats_out)->getValue().numval == 0) assert(false); else if (stats_out.is_open()) stats_out.close(); } } } - if (strcmp(name, o_random_seed) == 0) { + if (name == o_random_seed) { if (value.getValue().type != O_NUM) { msg = s_err_not_num; return false; } int seed = value.getValue().numval; if (seed == 0) { msg = s_err_seed_zero; return false; } } - if (strcmp(name, o_sat_split_type) == 0) { + if (name == o_sat_split_type) { if (value.getValue().type != O_STR) { msg = s_err_not_str; return false; } - const char* val = value.getValue().strval; - if (strcmp(val, spts_lookahead) != 0 && - strcmp(val, spts_scatter) != 0 && - strcmp(val, spts_none) != 0) - { msg = s_err_unknown_split; return false; } + std::string val = value.getValue().strval; + if (val != spts_lookahead && val != spts_scatter && val != spts_none) { + msg = s_err_unknown_split; + return false; + } } - if (strcmp(name, o_sat_split_units) == 0) { + if (name == o_sat_split_units) { if (value.getValue().type != O_STR) { msg = s_err_not_str; return false; } - const char* val = value.getValue().strval; - if (strcmp(val, spts_time) != 0 && - strcmp(val, spts_search_counter) != 0) - { msg = s_err_unknown_units; return false; } + std::string val = value.getValue().strval; + if (val != spts_time && val != spts_search_counter) { + msg = s_err_unknown_units; + return false; + } + } + auto itr = optionTable.find(name); + if (itr != optionTable.end()) { + optionTable.erase(itr); } - if (optionTable.has(name)) - optionTable.remove(name); insertOption(name, new SMTOption(value)); return true; } -const SMTOption& SMTConfig::getOption(const char* name) const { - if (optionTable.has(name)) - return *optionTable[name]; +const SMTOption& SMTConfig::getOption(std::string const & name) const { + auto itr = optionTable.find(name); + if (itr != optionTable.end()) + return *itr->second; else return option_Empty; } -bool SMTConfig::setInfo(const char* name_, const Info& value) { - if (infoTable.has(name_)) - infoTable.remove(name_); - Info* value_new = new Info(value); - char* name = strdup(name_); - infos.push(value_new); - info_names.push(name); - infoTable.insert(name, value_new); +bool SMTConfig::setInfo(std::string && name_, const Info& value) { + if (infoTable.find(name_) != infoTable.end()) + infoTable.erase(infoTable.find(name_)); + infos.emplace_back(Info(value)); + infoTable.insert({name_, &infos.back()}); return true; } -const Info& SMTConfig::getInfo(const char* name) const { - if (infoTable.has(name)) - return *infoTable[name]; +const Info& SMTConfig::getInfo(std::string const & name) const { + if (infoTable.find(name) != infoTable.end()) + return *infoTable.at(name); else return info_Empty; } diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index 3869fae58..87c1af255 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -38,7 +38,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -enum ASTType { +enum class ASTType { CMD_T , CMDL_T , SYM_T , SYML_T , QSYM_T , QSYML_T @@ -77,35 +77,28 @@ enum ASTType { , OPTION_T , OPTIONL_T , INFO_T , INFOL_T , CONST_T , CONSTL_T + , UNDEF_T }; class ASTNode { private: - ASTType type; - osmttokens::smt2token tok; - char* val; - static const char* typestr[]; + ASTType type; + osmttokens::smt2token tok; + std::string val; public: - std::vector< ASTNode* >*children; - ASTNode(ASTType t, osmttokens::smt2token tok) : type(t), tok(tok), val(NULL), children(NULL) {} - ASTNode(ASTType t, char* v) : type(t), tok({osmttokens::t_none}), val(v), children(NULL) {} + std::vector children; + + ASTNode(ASTType t, osmttokens::smt2token tok = {osmttokens::t_none}, std::string && v = "", std::vector && children = {}) + : type(t), tok(tok), val(std::move(v)), children(std::move(children)) {} + ASTNode() : ASTNode(ASTType::UNDEF_T) {} ASTNode(ASTNode const &) = delete; + ASTNode(ASTNode &&) = default; ASTNode & operator=(ASTNode const &) = delete; - ~ASTNode() { - if (children) { - for (auto ci = children->begin(); ci != children->end(); ci++) { - delete *ci; - }; - delete children; - } - free(val); - } - void print(std::ostream& o, int indent); - inline const char *typeToStr() const { return typestr[type]; } - inline ASTType getType() const { return type; } - inline const char *getValue() const { return val; } - inline const osmttokens::smt2token getToken() const { return tok; } + void print(std::ostream& o, int indent) const; + ASTType getType() const { return type; } + std::string const & getValue() const { return val; } + const osmttokens::smt2token getToken() const { return tok; } }; @@ -114,7 +107,7 @@ enum ConfType { O_EMPTY, O_STR, O_SYM, O_NUM, O_DEC, O_HEX, O_BIN, O_LIST, O_ATT class ConfValue { public: ConfType type; - union { char* strval; int numval; double decval; uint32_t unumval; std::list* configs; }; + union { std::string strval; int numval; double decval; uint32_t unumval; std::list* configs; }; ConfValue() : type(O_EMPTY), strval(NULL) {}; ConfValue(const ASTNode& s_expr_n); ConfValue(int i) : type(O_NUM), numval(i) {}; @@ -158,22 +151,14 @@ typedef struct SpPref { int t; } SpPref; typedef struct SpFormat { int t; } SpFormat; -struct ItpAlgorithm { int x; bool operator==(const ItpAlgorithm& o) const { return x == o.x; }}; -static const struct ItpAlgorithm itp_alg_mcmillan = { 0 }; -static const struct ItpAlgorithm itp_alg_pudlak = { 1 }; -static const struct ItpAlgorithm itp_alg_mcmillanp = { 2 }; -static const struct ItpAlgorithm itp_alg_ps = { 3 }; -static const struct ItpAlgorithm itp_alg_psw = { 4 }; -static const struct ItpAlgorithm itp_alg_pss = { 5 }; -static const struct ItpAlgorithm itp_euf_alg_strong = { 0 }; -static const struct ItpAlgorithm itp_euf_alg_weak = { 2 }; -static const struct ItpAlgorithm itp_euf_alg_random = { 3 }; -static const struct ItpAlgorithm itp_lra_alg_strong = { 0 }; -static const struct ItpAlgorithm itp_lra_alg_weak = { 2 }; -static const struct ItpAlgorithm itp_lra_alg_factor = { 3 }; -static const struct ItpAlgorithm itp_lra_alg_decomposing_strong = {4 }; -static const struct ItpAlgorithm itp_lra_alg_decomposing_weak = {5 }; -static const char *itp_lra_factor_0 = "1/2"; +enum class ItpAlgorithm { + itp_alg_mcmillan, itp_alg_pudlak, itp_alg_mcmillanp, + itp_alg_ps, itp_alg_psw, itp_alg_pss, itp_euf_alg_strong, + itp_euf_alg_weak, itp_euf_alg_random, itp_lra_alg_strong, + itp_lra_alg_weak, itp_lra_alg_factor, itp_lra_alg_decomposing_strong, + itp_lra_alg_decomposing_weak}; + +static const std::string itp_lra_factor_0 = "1/2"; inline bool operator==(const SpType& s1, const SpType& s2) { return s1.t == s2.t; } inline bool operator!=(const SpType& s1, const SpType& s2) { return s1.t != s2.t; } @@ -324,92 +309,58 @@ struct SMTConfig Info info_Empty; SMTOption option_Empty; - vec options; - vec option_names; - vec infos; - vec info_names; - Map > infoTable; - Map > optionTable; + std::vector options; + std::vector option_names; + std::vector infos; + std::unordered_map infoTable; + std::unordered_map optionTable; bool usedForInitialization = false; // Some options can be changed only before this config is used for initialization of MainSolver - bool isPreInitializationOption(const char* o_name) { - return strcmp(o_name, o_produce_inter) == 0 || strcmp(o_name, o_produce_proofs) == 0 - || strcmp(o_name, o_sat_pure_lookahead) == 0 || strcmp(o_name, o_sat_lookahead_split) == 0 - || strcmp(o_name, o_sat_scatter_split) == 0 - || strcmp(o_name, o_ghost_vars) == 0; + bool isPreInitializationOption(std::string const & o_name) { + return o_name == o_produce_inter or o_name == o_produce_proofs + or o_name == o_sat_pure_lookahead or o_name == o_sat_lookahead_split + or o_name == o_sat_scatter_split or o_name == o_ghost_vars; } - void insertOption(const char* o_name, SMTOption* o) { - options.push(o); - if (optionTable.has(o_name)) optionTable[o_name] = o; + void insertOption(std::string const & o_name, SMTOption* o) { + options.push_back(o); + if (optionTable.find(o_name) != optionTable.end()) optionTable[o_name] = o; else { - char* my_name = strdup(o_name); - option_names.push(my_name); - optionTable.insert(my_name, o); + option_names.push_back(o_name); + optionTable.insert({o_name, o}); } } - char* append_output_dir(const char* name) const + std::string append_output_dir(std::string const & name) const { - const char* path = output_dir(); + std::string path = output_dir(); // If output_dir() is not defined (or is empty), just return (copy of) name - if (strlen(path) == 0) - return strdup(name); - // Otherwise, use name but prepend output_dir. - char* tmp_name = strdup(name); - char* base = basename(tmp_name); - int full_length = strlen(base)+1+strlen(output_dir()); - char *full_str = (char*)malloc(full_length+1); - char* ptr = full_str; - for (unsigned int i = 0; i < strlen(path); i++) { - *ptr = path[i]; - ptr++; - } - (*ptr) = '/'; - ptr++; - for (unsigned int i = 0; i < strlen(base); i++) { - *ptr = base[i]; - ptr++; + if (path.empty()) { + return name; + } else { + return path + '/' + name; } - *ptr = '\0'; - free(tmp_name); - return full_str; } // // For standard executable // public: - SMTConfig(int argc, char* argv[]) : rocset(false), docset(false) { - initializeConfig( ); - // Parse command-line options - parseCMDLine( argc, argv ); - } // // For API // - SMTConfig () : rocset(false), docset(false) { + SMTConfig () { initializeConfig( ); } - ~SMTConfig ( ) - { - if ( produceStats() ) stats_out.close( ); - if ( rocset ) out.close( ); - if ( docset ) err.close( ); - for (int i = 0; i < options.size(); i++) - delete options[i]; - for (int i = 0; i < option_names.size(); i++) - free(option_names[i]); - for (int i = 0; i < infos.size(); i++) - delete infos[i]; - for (int i = 0; i < info_names.size(); i++) - free(info_names[i]); + ~SMTConfig () { + for (auto i : options) + delete i; } - bool setOption(const char* name, const SMTOption& value, const char*& msg); - const SMTOption& getOption(const char* name) const; + bool setOption(std::string const & name, const SMTOption& value, const char*& msg); + const SMTOption& getOption(std::string const & name) const; - bool setInfo (const char* name, const Info& value); - const Info& getInfo (const char* name) const; + bool setInfo (std::string && name, const Info& value); + const Info& getInfo (std::string const & name) const; void initializeConfig ( ); @@ -418,21 +369,18 @@ struct SMTConfig void printHelp ( ); void printConfig ( std::ostream & out ); - inline std::ostream & getStatsOut ( ) { assert( optionTable.has(o_produce_stats) ); return stats_out; } - inline std::ostream & getRegularOut ( ) { return rocset ? out : std::cout; } - inline std::ostream & getDiagnosticOut( ) { return docset ? err : std::cerr; } - inline int getRandomSeed ( ) const { return optionTable.has(o_random_seed) ? optionTable[o_random_seed]->getValue().numval : 91648253; } + inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed)->getValue().numval : 91648253; } inline void setProduceModels( ) { insertOption(o_produce_models, new SMTOption(1)); } inline bool setRandomSeed(int seed) { insertOption(o_random_seed, new SMTOption(seed)); return true; } void setUsedForInitiliazation() { usedForInitialization = true; } inline bool produceProof( ) { - return optionTable.has(o_produce_proofs) ? optionTable[o_produce_proofs]->getValue().numval > 0 : false; + return optionTable.find(o_produce_proofs) != optionTable.end() ? optionTable[o_produce_proofs]->getValue().numval > 0 : false; } void setTimeQueries() { insertOption(o_time_queries, new SMTOption(1)); } - bool timeQueries() { return optionTable.has(o_time_queries) ? optionTable[o_time_queries]->getValue().numval : false; } + bool timeQueries() { return optionTable.find(o_time_queries) != optionTable.end() ? optionTable[o_time_queries]->getValue().numval : false; } // Set reduction params inline void setReduction(int r) { insertOption(o_proof_reduce, new SMTOption(r)); } @@ -442,11 +390,11 @@ struct SMTConfig // Set interpolation algorithms inline void setBooleanInterpolationAlgorithm( ItpAlgorithm i ) { - insertOption(o_itp_bool_alg, new SMTOption(i.x)); } + insertOption(o_itp_bool_alg, new SMTOption(static_cast(i))); } - inline void setEUFInterpolationAlgorithm( ItpAlgorithm i ) { insertOption(o_itp_euf_alg, new SMTOption(i.x)); } + inline void setEUFInterpolationAlgorithm( ItpAlgorithm i ) { insertOption(o_itp_euf_alg, new SMTOption(static_cast(i))); } - inline void setLRAInterpolationAlgorithm( ItpAlgorithm i ) { insertOption(o_itp_lra_alg, new SMTOption(i.x)); } + inline void setLRAInterpolationAlgorithm( ItpAlgorithm i ) { insertOption(o_itp_lra_alg, new SMTOption(static_cast(i))); } inline void setLRAStrengthFactor(const char *factor) { insertOption(o_itp_lra_factor, new SMTOption(factor)); } @@ -454,230 +402,196 @@ struct SMTConfig // Get interpolation algorithms inline ItpAlgorithm getBooleanInterpolationAlgorithm() const { - if (optionTable.has(o_itp_bool_alg)) { return { optionTable[o_itp_bool_alg]->getValue().numval }; } - else { return itp_alg_mcmillan; }} - + return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg)->getValue().numval) + : ItpAlgorithm::itp_alg_mcmillan; + } inline ItpAlgorithm getEUFInterpolationAlgorithm() const { - if (optionTable.has(o_itp_euf_alg)) { return { optionTable[o_itp_euf_alg]->getValue().numval }; } - else { return itp_euf_alg_strong; }} + return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg)->getValue().numval) + : ItpAlgorithm::itp_euf_alg_strong; + } inline ItpAlgorithm getLRAInterpolationAlgorithm() const { - if (optionTable.has(o_itp_lra_alg)) { return { optionTable[o_itp_lra_alg]->getValue().numval }; } - else { return itp_lra_alg_strong; }} - - inline const char* getLRAStrengthFactor() const { - if (optionTable.has(o_itp_lra_factor)) { return optionTable[o_itp_lra_factor]->getValue().strval; } - else { return itp_lra_factor_0; } + return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg)->getValue().numval) + : ItpAlgorithm::itp_lra_alg_strong; } - inline const char* getInstanceName() const { - if (optionTable.has(o_inst_name)) { return optionTable[o_inst_name]->getValue().strval; } - else { return "unknown"; } + inline std::string getLRAStrengthFactor() const { + return optionTable.find(o_itp_lra_factor) != optionTable.end() ? optionTable.at( + o_itp_lra_factor)->getValue().strval : itp_lra_factor_0; } - inline void setRegularOutputChannel( const char * attr ) - { - if ( strcmp( attr, "stdout" ) != 0 && !rocset ) - { - out.open( attr ); - if( !out ) - throw std::ifstream::failure("can't open " + std::string(attr)); - rocset = true; - } - } - inline void setDiagnosticOutputChannel( const char * attr ) - { - if ( strcmp( attr, "stderr" ) != 0 && !rocset ) - { - err.open( attr ); - if( !err ) - throw std::ifstream::failure("can't open " + std::string(attr)); - rocset = true; - } + inline std::string getInstanceName() const { + return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name)->getValue().strval : "unknown"; } lbool status; // Status of the benchmark // int incremental; // Incremental solving int isIncremental() const - { return optionTable.has(o_incremental) ? - optionTable[o_incremental]->getValue().numval == 1: true; } + { return optionTable.find(o_incremental) != optionTable.end() ? + optionTable.at(o_incremental)->getValue().numval == 1: true; } int produce_models() const { - return optionTable.has(o_produce_models) ? - optionTable[o_produce_models]->getValue().numval : + return optionTable.find(o_produce_models) != optionTable.end() ? + optionTable.at(o_produce_models)->getValue().numval : 1; } int produceStats() const - { return optionTable.has(o_produce_stats) ? - optionTable[o_produce_stats]->getValue().numval == 1: false; } - std::string getStatsOut() const - { return optionTable.has(o_stats_out) ? - optionTable[o_stats_out]->getValue().strval: "/dev/stdout"; } + { return optionTable.find(o_produce_stats) != optionTable.end() ? + optionTable.at(o_produce_stats)->getValue().numval == 1: false; } + std::string getStatsOut() const { + return optionTable.find(o_stats_out) != optionTable.end() ? optionTable.at(o_stats_out)->getValue().strval : "/dev/stdout"; + } int sat_grow() const - { return optionTable.has(o_grow) ? - optionTable[o_grow]->getValue().numval : 0; } + { return optionTable.find(o_grow) != optionTable.end() ? + optionTable.at(o_grow)->getValue().numval : 0; } int sat_clause_lim() const - { return optionTable.has(o_clause_lim) ? - optionTable[o_clause_lim]->getValue().numval : 20; } + { return optionTable.find(o_clause_lim) != optionTable.end() ? + optionTable.at(o_clause_lim)->getValue().numval : 20; } int sat_subsumption_lim() const - { return optionTable.has(o_subsumption_lim) ? - optionTable[o_subsumption_lim]->getValue().numval : 1000; } + { return optionTable.find(o_subsumption_lim) != optionTable.end() ? + optionTable.at(o_subsumption_lim)->getValue().numval : 1000; } double sat_simp_garbage_frac() const - { return optionTable.has(o_simp_garbage_frac) ? - optionTable[o_simp_garbage_frac]->getValue().decval : 0.5; } + { return optionTable.find(o_simp_garbage_frac) != optionTable.end() ? + optionTable.at(o_simp_garbage_frac)->getValue().decval : 0.5; } int sat_use_asymm() const - { return optionTable.has(o_use_asymm) ? - optionTable[o_use_asymm]->getValue().numval == 1: false; } + { return optionTable.find(o_use_asymm) != optionTable.end() ? + optionTable.at(o_use_asymm)->getValue().numval == 1: false; } int sat_use_rcheck() const - { return optionTable.has(o_use_rcheck) ? - optionTable[o_use_rcheck]->getValue().numval == 1: false; } + { return optionTable.find(o_use_rcheck) != optionTable.end() ? + optionTable.at(o_use_rcheck)->getValue().numval == 1: false; } int sat_use_elim() const - { return optionTable.has(o_use_elim) ? - optionTable[o_use_elim]->getValue().numval == 1: true; } + { return optionTable.find(o_use_elim) != optionTable.end() ? + optionTable.at(o_use_elim)->getValue().numval == 1: true; } double sat_var_decay() const - { return optionTable.has(o_var_decay) ? - optionTable[o_var_decay]->getValue().decval : 1 / 0.95; } + { return optionTable.find(o_var_decay) != optionTable.end() ? + optionTable.at(o_var_decay)->getValue().decval : 1 / 0.95; } double sat_clause_decay() const - { return optionTable.has(o_clause_decay) ? - optionTable[o_clause_decay]->getValue().decval : 1 / 0.999; } + { return optionTable.find(o_clause_decay) != optionTable.end() ? + optionTable.at(o_clause_decay)->getValue().decval : 1 / 0.999; } double sat_random_var_freq() const - { return optionTable.has(o_random_var_freq) ? - optionTable[o_random_var_freq]->getValue().decval : 0.02; } + { return optionTable.find(o_random_var_freq) != optionTable.end() ? + optionTable.at(o_random_var_freq)->getValue().decval : 0.02; } int sat_random_seed() const - { return optionTable.has(o_random_seed) ? - optionTable[o_random_seed]->getValue().decval : 91648253; } + { return optionTable.find(o_random_seed) != optionTable.end() ? + optionTable.at(o_random_seed)->getValue().decval : 91648253; } int sat_luby_restart() const - { return optionTable.has(o_luby_restart) ? - optionTable[o_luby_restart]->getValue().numval > 0 : 1; } + { return optionTable.find(o_luby_restart) != optionTable.end() ? + optionTable.at(o_luby_restart)->getValue().numval > 0 : 1; } int sat_ccmin_mode() const - { return optionTable.has(o_ccmin_mode) ? - optionTable[o_ccmin_mode]->getValue().numval : 2; } + { return optionTable.find(o_ccmin_mode) != optionTable.end() ? + optionTable.at(o_ccmin_mode)->getValue().numval : 2; } int sat_rnd_pol() const - { return optionTable.has(o_rnd_pol) ? - optionTable[o_rnd_pol]->getValue().numval > 0 : 0; } + { return optionTable.find(o_rnd_pol) != optionTable.end() ? + optionTable.at(o_rnd_pol)->getValue().numval > 0 : 0; } int sat_rnd_init_act() const - { return optionTable.has(o_rnd_init_act) ? - optionTable[o_rnd_init_act]->getValue().numval > 0 : 0; } + { return optionTable.find(o_rnd_init_act) != optionTable.end() ? + optionTable.at(o_rnd_init_act)->getValue().numval > 0 : 0; } double sat_garbage_frac() const - { return optionTable.has(o_garbage_frac) ? - optionTable[o_garbage_frac]->getValue().decval : 0.20; } + { return optionTable.find(o_garbage_frac) != optionTable.end() ? + optionTable.at(o_garbage_frac)->getValue().decval : 0.20; } int sat_restart_first() const - { return optionTable.has(o_restart_first) ? - optionTable[o_restart_first]->getValue().numval : 100; } + { return optionTable.find(o_restart_first) != optionTable.end() ? + optionTable.at(o_restart_first)->getValue().numval : 100; } double sat_restart_inc() const - { return optionTable.has(o_restart_inc) ? - optionTable[o_restart_inc]->getValue().numval : 1.1; } + { return optionTable.find(o_restart_inc) != optionTable.end() ? + optionTable.at(o_restart_inc)->getValue().numval : 1.1; } int proof_interpolant_cnf() const - { return optionTable.has(o_interpolant_cnf) ? - optionTable[o_interpolant_cnf]->getValue().numval : 0; } + { return optionTable.find(o_interpolant_cnf) != optionTable.end() ? + optionTable.at(o_interpolant_cnf)->getValue().numval : 0; } int certify_inter() const - { return optionTable.has(o_certify_inter) ? - optionTable[o_certify_inter]->getValue().numval : 0; } + { return optionTable.find(o_certify_inter) != optionTable.end() ? + optionTable.at(o_certify_inter)->getValue().numval : 0; } bool produce_inter() const - { return optionTable.has(o_produce_inter) ? - optionTable[o_produce_inter]->getValue().numval > 0 : false; } + { return optionTable.find(o_produce_inter) != optionTable.end() ? + optionTable.at(o_produce_inter)->getValue().numval > 0 : false; } int simplify_inter() const - { return optionTable.has(o_simplify_inter) ? - optionTable[o_simplify_inter]->getValue().numval : 0; } + { return optionTable.find(o_simplify_inter) != optionTable.end() ? + optionTable.at(o_simplify_inter)->getValue().numval : 0; } int proof_struct_hash() const - { return optionTable.has(o_proof_struct_hash) ? - optionTable[o_proof_struct_hash]->getValue().numval : 1; } + { return optionTable.find(o_proof_struct_hash) != optionTable.end() ? + optionTable.at(o_proof_struct_hash)->getValue().numval : 1; } int proof_num_graph_traversals() const - { return optionTable.has(o_proof_num_graph_traversals) ? - optionTable[o_proof_num_graph_traversals]->getValue().numval : 3; } + { return optionTable.find(o_proof_num_graph_traversals) != optionTable.end() ? + optionTable.at(o_proof_num_graph_traversals)->getValue().numval : 3; } int proof_red_trans() const - { return optionTable.has(o_proof_red_trans) ? - optionTable[o_proof_red_trans]->getValue().numval : 2; } + { return optionTable.find(o_proof_red_trans) != optionTable.end() ? + optionTable.at(o_proof_red_trans)->getValue().numval : 2; } int proof_rec_piv() const - { return optionTable.has(o_proof_rec_piv) ? - optionTable[o_proof_rec_piv]->getValue().numval : 1; } + { return optionTable.find(o_proof_rec_piv) != optionTable.end() ? + optionTable.at(o_proof_rec_piv)->getValue().numval : 1; } int proof_push_units() const - { return optionTable.has(o_proof_push_units) ? - optionTable[o_proof_push_units]->getValue().numval : 1; } + { return optionTable.find(o_proof_push_units) != optionTable.end() ? + optionTable.at(o_proof_push_units)->getValue().numval : 1; } int proof_transf_trav() const - { return optionTable.has(o_proof_transf_trav) ? - optionTable[o_proof_transf_trav]->getValue().numval : 1; } + { return optionTable.find(o_proof_transf_trav) != optionTable.end() ? + optionTable.at(o_proof_transf_trav)->getValue().numval : 1; } int proof_check() const - { return optionTable.has(o_proof_check) ? - optionTable[o_proof_check]->getValue().numval : 0; } + { return optionTable.find(o_proof_check) != optionTable.end() ? + optionTable.at(o_proof_check)->getValue().numval : 0; } int proof_multiple_inter() const - { return optionTable.has(o_proof_multiple_inter) ? - optionTable[o_proof_multiple_inter]->getValue().numval : 0; } + { return optionTable.find(o_proof_multiple_inter) != optionTable.end() ? + optionTable.at(o_proof_multiple_inter)->getValue().numval : 0; } int proof_alternative_inter() const - { return optionTable.has(o_proof_alternative_inter) ? - optionTable[o_proof_alternative_inter]->getValue().numval : 0; } + { return optionTable.find(o_proof_alternative_inter) != optionTable.end() ? + optionTable.at(o_proof_alternative_inter)->getValue().numval : 0; } int proof_reduce() const - { return optionTable.has(o_proof_reduce) ? - optionTable[o_proof_reduce]->getValue().numval : 0; } + { return optionTable.find(o_proof_reduce) != optionTable.end() ? + optionTable.at(o_proof_reduce)->getValue().numval : 0; } int itp_bool_alg() const - { return optionTable.has(o_itp_bool_alg) ? - optionTable[o_itp_bool_alg]->getValue().numval : 0; } + { return optionTable.find(o_itp_bool_alg) != optionTable.end() ? + optionTable.at(o_itp_bool_alg)->getValue().numval : 0; } int itp_euf_alg() const - { return optionTable.has(o_itp_euf_alg) ? - optionTable[o_itp_euf_alg]->getValue().numval : 0; } + { return optionTable.find(o_itp_euf_alg) != optionTable.end() ? + optionTable.at(o_itp_euf_alg)->getValue().numval : 0; } int itp_lra_alg() const - { return optionTable.has(o_itp_lra_alg) ? - optionTable[o_itp_lra_alg]->getValue().numval : 0; } + { return optionTable.find(o_itp_lra_alg) != optionTable.end() ? + optionTable.at(o_itp_lra_alg)->getValue().numval : 0; } int sat_dump_rnd_inter() const - { return optionTable.has(o_sat_dump_rnd_inter) ? - optionTable[o_sat_dump_rnd_inter]->getValue().numval : 2; } + { return optionTable.find(o_sat_dump_rnd_inter) != optionTable.end() ? + optionTable.at(o_sat_dump_rnd_inter)->getValue().numval : 2; } bool declarations_are_global() const { - return optionTable.has(o_global_declarations) ? optionTable[o_global_declarations]->getValue().numval > 0 : false; + return optionTable.find(o_global_declarations) != optionTable.end() ? optionTable.at(o_global_declarations)->getValue().numval > 0 : false; } SpUnit sat_resource_units() const { - if (optionTable.has(o_sat_resource_units)) { - const char* type = optionTable[o_sat_resource_units]->getValue().strval; - if (strcmp(type, spts_search_counter) == 0) + if (optionTable.find(o_sat_resource_units) != optionTable.end()) { + std::string type = optionTable.at(o_sat_resource_units)->getValue().strval; + if (type == spts_search_counter) { return SpUnit::search_counter; - else if (strcmp(type, spts_time) == 0) + } else if (type == spts_time) { return SpUnit::time; + } } return SpUnit::search_counter; } bool respect_logic_partitioning_hints() const - { return optionTable.has(o_respect_logic_partitioning_hints) ? - optionTable[o_respect_logic_partitioning_hints]->getValue().numval : 0; } + { return optionTable.find(o_respect_logic_partitioning_hints) != optionTable.end() ? + optionTable.at(o_respect_logic_partitioning_hints)->getValue().numval : 0; } double sat_resource_limit() const - { return optionTable.has(o_sat_resource_limit) ? - optionTable[o_sat_resource_limit]->getValue().getDoubleVal() : -1; } + { return optionTable.find(o_sat_resource_limit) != optionTable.end() ? + optionTable.at(o_sat_resource_limit)->getValue().getDoubleVal() : -1; } - char* dump_state() const - { - char* n; - if (optionTable.has(o_dump_state)) - n = strdup(optionTable[o_dump_state]->getValue().strval); - else { - const char* name = getInstanceName(); - int name_length = strlen(name)-strlen(".smt2"); - n = (char*)malloc(name_length+1); - for (int i = 0; i < name_length; i++) - n[i] = name[i]; - n[name_length] = '\0'; - } - char* name = append_output_dir(n); - free(n); - return name; - } - const char* output_dir() const - { - if (optionTable.has(o_output_dir)) - return optionTable[o_output_dir]->getValue().strval; - else - return ""; - } + std::string dump_state() const { + if (optionTable.find(o_dump_state) != optionTable.end()) { + return append_output_dir(optionTable.at(o_dump_state)->getValue().strval); + } else { + std::string name = getInstanceName(); + return name.substr(0, name.size() - strlen(".smt2")); + } + } + std::string output_dir() const { + return optionTable.find(o_output_dir) != optionTable.end() ? optionTable.at(o_output_dir)->getValue().strval : ""; + } int dump_only() const - { return optionTable.has(o_dump_only) ? - optionTable[o_dump_only]->getValue().numval : 0; } + { return optionTable.find(o_dump_only) != optionTable.end() ? optionTable.at(o_dump_only)->getValue().numval : 0; } bool dump_query() const - { return optionTable.has(o_dump_query) ? - optionTable[o_dump_query]->getValue().numval : 0; } + { return optionTable.find(o_dump_query) != optionTable.end() ? optionTable.at(o_dump_query)->getValue().numval : 0; } void set_dump_query_name(const char* dump_query_name) { - if (optionTable.has(o_dump_query_name)) { + if (optionTable.find(o_dump_query_name) != optionTable.end()) { delete optionTable[o_dump_query_name]; optionTable[o_dump_query_name] = new SMTOption(strdup(dump_query_name)); } @@ -686,26 +600,17 @@ struct SMTConfig } - char* dump_query_name() const - { - char* n; - if (optionTable.has(o_dump_query_name)) - n = strdup(optionTable[o_dump_query_name]->getValue().strval); - else { - return NULL; - } - char* name = append_output_dir(n); - free(n); - return name; - } + std::string dump_query_name() const { + return optionTable.find(o_dump_query_name) != optionTable.end() ? append_output_dir(optionTable.at(o_dump_query_name)->getValue().strval) : ""; + } int sat_dump_learnts() const - { return optionTable.has(o_sat_dump_learnts) ? - optionTable[o_sat_dump_learnts]->getValue().numval : 0; } + { return optionTable.find(o_sat_dump_learnts) != optionTable.end() ? + optionTable.at(o_sat_dump_learnts)->getValue().numval : 0; } bool sat_split_test_cube_and_conquer() const - { return optionTable.has(o_sat_split_test_cube_and_conquer) ? - optionTable[o_sat_split_test_cube_and_conquer]->getValue().numval : 0; } + { return optionTable.find(o_sat_split_test_cube_and_conquer) != optionTable.end() ? + optionTable.at(o_sat_split_test_cube_and_conquer)->getValue().numval : 0; } SpType sat_split_type() const { if (sat_lookahead_split()) { @@ -718,109 +623,110 @@ struct SMTConfig } SpUnit sat_split_units() const { - if (optionTable.has(o_sat_split_units)) { - const char* type = optionTable[o_sat_split_units]->getValue().strval; - if (strcmp(type, spts_search_counter) == 0) + if (optionTable.find(o_sat_split_units) != optionTable.end()) { + std::string type = optionTable.at(o_sat_split_units)->getValue().strval; + if (type == spts_search_counter) { return SpUnit::search_counter; - else if (strcmp(type, spts_time) == 0) + } else if (type == spts_time) { return SpUnit::time; + } } return SpUnit::search_counter; } double sat_split_inittune() const { - return optionTable.has(o_sat_split_inittune) ? - optionTable[o_sat_split_inittune]->getValue().getDoubleVal() : + return optionTable.find(o_sat_split_inittune) != optionTable.end() ? + optionTable.at(o_sat_split_inittune)->getValue().getDoubleVal() : -1; } double sat_split_midtune() const { - return optionTable.has(o_sat_split_midtune) ? - optionTable[o_sat_split_midtune]->getValue().getDoubleVal() : + return optionTable.find(o_sat_split_midtune) != optionTable.end() ? + optionTable.at(o_sat_split_midtune)->getValue().getDoubleVal() : -1; } int sat_split_num() const { - return optionTable.has(o_sat_split_num) ? - optionTable[o_sat_split_num]->getValue().numval : + return optionTable.find(o_sat_split_num) != optionTable.end() ? + optionTable.at(o_sat_split_num)->getValue().numval : 2; } int sat_split_fixvars() const { - return optionTable.has(o_sat_split_fix_vars) ? - optionTable[o_sat_split_fix_vars]->getValue().numval : + return optionTable.find(o_sat_split_fix_vars) != optionTable.end() ? + optionTable.at(o_sat_split_fix_vars)->getValue().numval : -1; } int sat_split_asap() const { - return optionTable.has(o_sat_split_asap) ? - optionTable[o_sat_split_asap]->getValue().numval : + return optionTable.find(o_sat_split_asap) != optionTable.end() ? + optionTable.at(o_sat_split_asap)->getValue().numval : 0; } int sat_lookahead_split() const { - return optionTable.has(o_sat_lookahead_split) ? - optionTable[o_sat_lookahead_split]->getValue().numval : + return optionTable.find(o_sat_lookahead_split) != optionTable.end() ? + optionTable.at(o_sat_lookahead_split)->getValue().numval : 0; } int sat_scatter_split() const { - return optionTable.has(o_sat_scatter_split) ? - optionTable[o_sat_scatter_split]->getValue().numval : + return optionTable.find(o_sat_scatter_split) != optionTable.end() ? + optionTable.at(o_sat_scatter_split)->getValue().numval : 0; } int sat_pure_lookahead() const { - return optionTable.has(o_sat_pure_lookahead) ? - optionTable[o_sat_pure_lookahead]->getValue().numval : + return optionTable.find(o_sat_pure_lookahead) != optionTable.end() ? + optionTable.at(o_sat_pure_lookahead)->getValue().numval : 0; } int lookahead_score_deep() const { - return optionTable.has(o_lookahead_score_deep) ? - optionTable[o_lookahead_score_deep]->getValue().numval : + return optionTable.find(o_lookahead_score_deep) != optionTable.end() ? + optionTable.at(o_lookahead_score_deep)->getValue().numval : 0; } int randomize_lookahead() const { - return optionTable.has(o_sat_split_randomize_lookahead) ? - optionTable[o_sat_split_randomize_lookahead]->getValue().numval : + return optionTable.find(o_sat_split_randomize_lookahead) != optionTable.end() ? + optionTable.at(o_sat_split_randomize_lookahead)->getValue().numval : 0; } int randomize_lookahead_bufsz() const { - return optionTable.has(o_sat_split_randomize_lookahead_buf) ? - optionTable[o_sat_split_randomize_lookahead_buf]->getValue().numval : + return optionTable.find(o_sat_split_randomize_lookahead_buf) != optionTable.end() ? + optionTable.at(o_sat_split_randomize_lookahead_buf)->getValue().numval : 1; } int remove_symmetries() const - { return optionTable.has(o_sat_remove_symmetries) ? - optionTable[o_sat_remove_symmetries]->getValue().numval : 0; } + { return optionTable.find(o_sat_remove_symmetries) != optionTable.end() ? + optionTable.at(o_sat_remove_symmetries)->getValue().numval : 0; } int dryrun() const - { return optionTable.has(o_dryrun) ? - optionTable[o_dryrun]->getValue().numval : 0; } + { return optionTable.find(o_dryrun) != optionTable.end() ? + optionTable.at(o_dryrun)->getValue().numval : 0; } void set_dryrun(bool b) { insertOption(o_dryrun, new SMTOption(b)); } SpPref sat_split_preference() const { - if (optionTable.has(o_sat_split_preference)) { - const char* type = optionTable[o_sat_split_preference]->getValue().strval; - if (strcmp(type, spprefs_tterm) == 0) return sppref_tterm; - if (strcmp(type, spprefs_blind) == 0) return sppref_blind; - if (strcmp(type, spprefs_bterm) == 0) return sppref_bterm; - if (strcmp(type, spprefs_rand) == 0) return sppref_rand; - if (strcmp(type, spprefs_noteq) == 0) return sppref_noteq; - if (strcmp(type, spprefs_eq) == 0) return sppref_eq; - if (strcmp(type, spprefs_tterm_neq) == 0) return sppref_tterm_neq; + if (optionTable.find(o_sat_split_preference) != optionTable.end()) { + std::string type = optionTable.at(o_sat_split_preference)->getValue().strval; + if (type == spprefs_tterm) return sppref_tterm; + if (type == spprefs_blind) return sppref_blind; + if (type == spprefs_bterm) return sppref_bterm; + if (type == spprefs_rand) return sppref_rand; + if (type == spprefs_noteq) return sppref_noteq; + if (type == spprefs_eq) return sppref_eq; + if (type == spprefs_tterm_neq) return sppref_tterm_neq; } - return sppref_blind; + return sppref_blind; } bool use_ghost_vars() const { - if (optionTable.has(o_ghost_vars)) { - return optionTable[o_ghost_vars]->getValue().numval != 0; + if (optionTable.find(o_ghost_vars) != optionTable.end()) { + return optionTable.at(o_ghost_vars)->getValue().numval != 0; } return false; } int do_substitutions() const - { return optionTable.has(o_do_substitutions) ? - optionTable[o_do_substitutions]->getValue().numval : 1; } + { return optionTable.find(o_do_substitutions) != optionTable.end()? + optionTable.at(o_do_substitutions)->getValue().numval : 1; } bool use_theory_polarity_suggestion() const { return sat_theory_polarity_suggestion != 0; } int sat_solver_limit() const - { return optionTable.has(o_sat_solver_limit) ? - optionTable[o_sat_solver_limit]->getValue().numval : 0; } + { return optionTable.find(o_sat_solver_limit) != optionTable.end() ? + optionTable.at(o_sat_solver_limit)->getValue().numval : 0; } bool sat_split_mode() const { - if (optionTable.has(o_sat_split_mode)) { - return optionTable[o_sat_split_mode]->getValue().numval != 0; + if (optionTable.find(o_sat_split_mode) != optionTable.end()) { + return optionTable.at(o_sat_split_mode)->getValue().numval != 0; } return false; } @@ -841,12 +747,12 @@ struct SMTConfig { return optionTable.has(o_verbosity) ? optionTable[o_verbosity]->getValue().numval : 2; } #else - { return optionTable.has(o_verbosity) ? - optionTable[o_verbosity]->getValue().numval : 0; } + { return optionTable.find(o_verbosity) != optionTable.end() ? + optionTable.at(o_verbosity)->getValue().numval : 0; } #endif int printSuccess() const - { return optionTable.has(":print-success") ? - optionTable[":print-success"]->getValue().numval == 1: false; } + { return optionTable.find(":print-success") != optionTable.end() ? + optionTable.at(":print-success")->getValue().numval == 1: false; } int certification_level; // Level of certification char certifying_solver[256]; // Executable used for certification diff --git a/src/parsers/smt2new/smt2newlexer.ll b/src/parsers/smt2new/smt2newlexer.ll index bcbc7851f..46e0a626c 100644 --- a/src/parsers/smt2new/smt2newlexer.ll +++ b/src/parsers/smt2new/smt2newlexer.ll @@ -100,43 +100,43 @@ using namespace osmttokens; "simplify" { yyget_lval(yyscanner)->tok = { t_simplify }; return TK_SIMPLIFY; } "echo" { yyget_lval(yyscanner)->tok = { t_echo }; return TK_ECHO; } -":sorts" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_SORTS; } -":funs" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_FUNS; } -":sorts-description" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_SORTSDESCRIPTION; } -":funs-description" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_FUNSDESCRIPTION; } -":definition" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_DEFINITION; } -":values" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_VALUES; } -":notes" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_NOTES; } -":theories" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_THEORIES; } -":extensions" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_EXTENSIONS; } -":print-success" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRINTSUCCESS; } -":expand-definitions" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_EXPANDDEFINITIONS; } -":interactive-mode" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_INTERACTIVEMODE; } -":produce-proofs" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRODUCEPROOFS; } -":produce-unsat-cores" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRODUCEUNSATCORES; } -":produce-models" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRODUCEMODELS; } -":produce-assignments" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRODUCEASSIGNMENTS; } -":regular-output-channel" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_REGULAROUTPUTCHANNEL; } -":diagnostic-output-channel" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_DIAGNOSTICOUTPUTCHANNEL; } -":random-seed" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_RANDOMSEED; } -":verbosity" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_VERBOSITY; } -":error-behavior" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_ERRORBEHAVIOR; } -":name" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_NAME; } -":named" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_NAMED; } -":authors" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_AUTHORS; } -":version" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_VERSION; } -":status" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_STATUS; } -":reason-unknown" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_REASONUNKNOWN; } -":all-statistics" { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_ALLSTATISTICS; } - - -0|-?[1-9][0-9]*(\/[1-9][0-9]*)? { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_NUM; } --?[0-9]+\.0*[0-9]+ { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_DEC; } -#x[0-9a-fA-F]+ { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_HEX; } -#b[01]+ { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_BIN; } - -[a-zA-Z~!@\$\%\^&\*\-\+=\<\>\.\?\/'_][a-zA-Z0-9~!@\$\%\^&\*_\-\+=\<\>\.\?\/']* { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_SYM; } -\:[a-zA-Z0-9~!@\$\%\^&\*_\-\+=\<\>\.\?\/]+ { yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_KEY; } +":sorts" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_SORTS; } +":funs" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_FUNS; } +":sorts-description" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_SORTSDESCRIPTION; } +":funs-description" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_FUNSDESCRIPTION; } +":definition" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_DEFINITION; } +":values" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_VALUES; } +":notes" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_NOTES; } +":theories" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_THEORIES; } +":extensions" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_EXTENSIONS; } +":print-success" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_PRINTSUCCESS; } +":expand-definitions" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_EXPANDDEFINITIONS; } +":interactive-mode" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_INTERACTIVEMODE; } +":produce-proofs" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_PRODUCEPROOFS; } +":produce-unsat-cores" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_PRODUCEUNSATCORES; } +":produce-models" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_PRODUCEMODELS; } +":produce-assignments" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_PRODUCEASSIGNMENTS; } +":regular-output-channel" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_REGULAROUTPUTCHANNEL; } +":diagnostic-output-channel" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_DIAGNOSTICOUTPUTCHANNEL; } +":random-seed" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_RANDOMSEED; } +":verbosity" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_VERBOSITY; } +":error-behavior" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_ERRORBEHAVIOR; } +":name" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_NAME; } +":named" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_NAMED; } +":authors" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_AUTHORS; } +":version" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_VERSION; } +":status" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_STATUS; } +":reason-unknown" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_REASONUNKNOWN; } +":all-statistics" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_ALLSTATISTICS; } + + +0|-?[1-9][0-9]*(\/[1-9][0-9]*)? { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_NUM; } +-?[0-9]+\.0*[0-9]+ { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_DEC; } +#x[0-9a-fA-F]+ { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_HEX; } +#b[01]+ { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_BIN; } + +[a-zA-Z~!@\$\%\^&\*\-\+=\<\>\.\?\/'_][a-zA-Z0-9~!@\$\%\^&\*_\-\+=\<\>\.\?\/']* { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_SYM; } +\:[a-zA-Z0-9~!@\$\%\^&\*_\-\+=\<\>\.\?\/]+ { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_KEY; } [()] { return *yyget_text(yyscanner); } @@ -149,7 +149,7 @@ using namespace osmttokens; \\\" { yyextra->insertBuf('"'); } \\\\ { yyextra->insertBuf('\\'); } [^\\\n\"] { yyextra->insertBuf(yyget_text(yyscanner)[0]); } - \" { yylval->str = strdup(yyextra->getBuf()); yyextra->clearBuf(); + \" { yylval->str = new std::string(yyextra->getBuf()); yyextra->clearBuf(); yy_pop_state(yyscanner); return TK_STR; } } @@ -160,7 +160,7 @@ using namespace osmttokens; [\t] { yyextra->insertBuf('\t'); } \n { yyextra->insertBuf('\n'); } [^ \t\n\\\|] { yyextra->insertBuf(yyget_text(yyscanner)[0]); } - \| { yylval->str = strdup(yyextra->getBuf()); yyextra->clearBuf(); + \| { yylval->str = new std::string(yyextra->getBuf()); yyextra->clearBuf(); yy_pop_state(yyscanner); return TK_QSYM; } \\ { printf("Syntax error at line %d near %s, \\ not allowed inside | ... |\n", yyget_lineno(yyscanner), yyget_text(yyscanner)); exit(1); } } diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index b9dd3bd6d..77600336f 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -64,16 +64,14 @@ void smt2newerror( YYLTYPE* locp, Smt2newContext* context, const char * s ) %union { - char * str; + std::string * str; ASTNode * snode; - std::vector< ASTNode * > * snode_list; + std::vector * snode_list; osmttokens::smt2token tok; } %destructor { free($$); } %destructor { delete $$; } -%destructor { if ($$) { for (auto node : *$$) { delete node; } delete $$; }} - %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO @@ -93,255 +91,215 @@ void smt2newerror( YYLTYPE* locp, Smt2newContext* context, const char * s ) %% -script: command_list { ASTNode *n = new ASTNode(CMDL_T, strdup("main-script")); n->children = $1; context->insertRoot(n); }; +script: command_list { ASTNode *n = new ASTNode(ASTType::CMDL_T, {osmttokens::t_none}, "main-script", std::move(*$1)); context->insertRoot(n); }; symbol: TK_SYM - { $$ = new ASTNode(SYM_T, $1); } + { $$ = new ASTNode(ASTType::SYM_T, {osmttokens::t_none}, std::move(*$1)); } | TK_QSYM - { $$ = new ASTNode(QSYM_T, $1); } + { $$ = new ASTNode(ASTType::QSYM_T, {osmttokens::t_none}, std::move(*$1)); } ; command_list: - { $$ = new std::vector(); } + { $$ = new std::vector(); } | command_list command - { (*$1).push_back($2); $$ = $1; } + { (*$1).push_back(std::move(*$2)); $$ = $1; } ; command: '(' TK_SETLOGIC symbol ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); } | '(' TK_SETOPTION option ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); } | '(' TK_SETINFO attribute ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); } | '(' TK_DECLARESORT symbol TK_NUM ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); - $$->children->push_back(new ASTNode(NUM_T, $4)); + $$ = new ASTNode(ASTType::CMD_T, + $2, + "", + std::vector{std::move(*$3), + ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$4))}); } | '(' TK_DEFINESORT symbol '(' symbol_list ')' sort ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); - - ASTNode* syml = new ASTNode(SYML_T, NULL); - syml->children = $5; - $$->children->push_back(syml); - - $$->children->push_back($7); + $$ = new ASTNode(ASTType::CMD_T, $2, "", + std::vector{ + std::move(*$3), + ASTNode(ASTType::SYML_T, {osmttokens::t_none}, "", std::move(*$5)), + std::move(*$7)}); } | '(' TK_DECLAREFUN symbol '(' sort_list ')' sort ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); - - ASTNode* sortl = new ASTNode(SORTL_T, NULL); - sortl->children = $5; - $$->children->push_back(sortl); - - $$->children->push_back($7); + $$ = new ASTNode(ASTType::CMD_T, $2, "", + std::vector{std::move(*$3), + ASTNode(ASTType::SORTL_T, {osmttokens::t_none}, "", std::move(*$5)), + std::move(*$7)}); } | '(' TK_DECLARECONST const_val sort ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); - - ASTNode* sortl = new ASTNode(SORTL_T, NULL); - sortl->children = new std::vector(); - $$->children->push_back(sortl); - - $$->children->push_back($4); + // todo: drop the second child? + $$ = new ASTNode(ASTType::CMD_T, $2, "", + std::vector{std::move(*$3), ASTNode(ASTType::SORTL_T), std::move(*$4)}); } | '(' TK_DEFINEFUN symbol '(' sorted_var_list ')' sort term ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); - - ASTNode* svl = new ASTNode(SVL_T, NULL); - svl->children = $5; - $$->children->push_back(svl); - - $$->children->push_back($7); - $$->children->push_back($8); + $$ = new ASTNode(ASTType::CMD_T, $2, "", + std::vector{std::move(*$3), + ASTNode(ASTType::SVL_T, {osmttokens::t_none}, "", std::move(*$5)), + std::move(*$7), + std::move(*$8)}); } | '(' TK_PUSH TK_NUM ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(NUM_T, $3)); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$3))}); } | '(' TK_POP TK_NUM ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(NUM_T, $3)); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$3))}); } | '(' TK_ASSERT term ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); } | '(' TK_CHECKSAT ')' { - $$ = new ASTNode(CMD_T, $2); + $$ = new ASTNode(ASTType::CMD_T, $2); } | '(' TK_GETASSERTIONS ')' { - $$ = new ASTNode(CMD_T, $2); + $$ = new ASTNode(ASTType::CMD_T, $2); } | '(' TK_GETPROOF ')' { - $$ = new ASTNode(CMD_T, $2); + $$ = new ASTNode(ASTType::CMD_T, $2); } | '(' TK_GETITPS term_list ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = $3; + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::move(*$3)); } | '(' TK_WRSTATE TK_STR ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(UATTR_T, $3)); + // todo: consider inserting the TK_STR to the string? + // todo: TK_{WR,RD}STATE and TK_WRFUNS is not implemented and is not part of the standard + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); } | '(' TK_RDSTATE TK_STR ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(UATTR_T, $3)); + // todo: consider inserting the TK_STR to the string? + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); } | '(' TK_WRFUNS TK_STR ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(UATTR_T, $3)); + // todo: consider inserting the TK_STR to the string? + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); } | '(' TK_GETUNSATCORE ')' { - $$ = new ASTNode(CMD_T, $2); + $$ = new ASTNode(ASTType::CMD_T, $2); } | '(' TK_GETVALUE '(' term term_list ')' ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = $5; - $$->children->insert($$->children->begin(), $4); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$5)}); + $$->children.insert($$->children.begin(), std::move(*$4)); } | '(' TK_GETMODEL ')' { - $$ = new ASTNode(CMD_T, $2); + $$ = new ASTNode(ASTType::CMD_T, $2); } | '(' TK_GETASSIGNMENT ')' { - $$ = new ASTNode(CMD_T, $2); + $$ = new ASTNode(ASTType::CMD_T, $2); } | '(' TK_GETOPTION TK_KEY ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(UATTR_T, $3)); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); } | '(' TK_GETOPTION predef_key ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(PATTR_T, $3)); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::PATTR_T, {osmttokens::t_none}, std::move(*$3))}); } | '(' TK_GETINFO info_flag ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back($3); + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); } | '(' TK_SIMPLIFY ')' { - $$ = new ASTNode(CMD_T, $2); + $$ = new ASTNode(ASTType::CMD_T, $2); } | '(' TK_EXIT ')' - { $$ = new ASTNode(CMD_T, $2); } + { $$ = new ASTNode(ASTType::CMD_T, $2); } | '(' TK_ECHO TK_STR ')' { - $$ = new ASTNode(CMD_T, $2); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(UATTR_T, $3)); + // todo: consider using ASTNode's string instead of vector + $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); } ; attribute_list: - { $$ = new std::vector(); } + { $$ = new std::vector(); } | attribute_list attribute - { $1->push_back($2); $$ = $1; } + { $1->push_back(std::move(*$2)); $$ = $1; } ; attribute: TK_KEY - { $$ = new ASTNode(UATTR_T, $1); } + { $$ = new ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$1)); } | TK_KEY attribute_value - { $$ = new ASTNode(UATTR_T, $1); $$->children = new std::vector(); $$->children->push_back($2); } + { $$ = new ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } | predef_key - { $$ = new ASTNode(PATTR_T, $1); } + { $$ = new ASTNode(ASTType::PATTR_T, {osmttokens::t_none}, std::move(*$1)); } | predef_key attribute_value - { $$ = new ASTNode(PATTR_T, $1); $$->children = new std::vector(); $$->children->push_back($2); } + { $$ = new ASTNode(ASTType::PATTR_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } ; attribute_value: spec_const - { $$ = new ASTNode(SPECC_T, NULL); $$->children = new std::vector(); $$->children->push_back($1); } + { $$ = new ASTNode(ASTType::SPECC_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); } | symbol { $$ = $1; } | '(' s_expr_list ')' { - $$ = new ASTNode(SEXPRL_T, NULL); - $$->children = $2; + $$ = new ASTNode(ASTType::SEXPRL_T, {osmttokens::t_none}, "", std::vector{std::move(*$2)}); } ; identifier: symbol { $$ = $1; } | '(' '_' symbol numeral_list ')' - { $$ = $3; $$->children = $4; } + { + $$ = $3; + for (auto & el : *$4) { + $$->children.emplace_back(std::move(el)); + } + } ; sort: identifier { $$ = $1; } | '(' identifier sort sort_list ')' { - $$ = new ASTNode(LID_T, NULL); - $$->children = $4; - $$->children->insert($$->children->begin(), $3); - $$->children->insert($$->children->begin(), $2); + $$ = new ASTNode(ASTType::LID_T, {osmttokens::t_none}, "", std::vector{std::move(*$2), std::move(*$3)}); + for (auto & c : *$4) { + $$->children.push_back(std::move(c)); + } } ; sort_list: sort_list sort - { $1->push_back($2); $$ = $1; } + { $1->push_back(std::move(*$2)); $$ = $1; } | - { $$ = new std::vector(); } + { $$ = new std::vector(); } ; s_expr: spec_const { - $$ = new ASTNode(SPECC_T, NULL); - $$->children = new std::vector(); - $$->children->push_back($1); + $$ = new ASTNode(ASTType::SPECC_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); } | symbol { @@ -349,37 +307,36 @@ s_expr: spec_const } | TK_KEY { - $$ = new ASTNode(UATTR_T, $1); + $$ = new ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$1)); } | '(' s_expr_list ')' { - $$ = new ASTNode(SEXPRL_T, NULL); - $$->children = $2; + $$ = new ASTNode(ASTType::SEXPRL_T, {osmttokens::t_none}, "", std::move(*$2)); } ; s_expr_list: { - $$ = new std::vector(); + $$ = new std::vector(); } | s_expr_list s_expr { - $1->push_back($2); + $1->push_back(std::move(*$2)); $$ = $1; } ; spec_const: TK_NUM - { $$ = new ASTNode(NUM_T, $1); } + { $$ = new ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$1)); } | TK_DEC - { $$ = new ASTNode(DEC_T, $1); } + { $$ = new ASTNode(ASTType::DEC_T, {osmttokens::t_none}, std::move(*$1)); } | TK_HEX - { $$ = new ASTNode(HEX_T, $1); } + { $$ = new ASTNode(ASTType::HEX_T, {osmttokens::t_none}, std::move(*$1)); } | TK_BIN - { $$ = new ASTNode(BIN_T, $1); } + { $$ = new ASTNode(ASTType::BIN_T, {osmttokens::t_none}, std::move(*$1)); } | TK_STR - { $$ = new ASTNode(STR_T, $1); } + { $$ = new ASTNode(ASTType::STR_T, {osmttokens::t_none}, std::move(*$1)); } ; const_val: symbol @@ -389,114 +346,90 @@ const_val: symbol ; numeral_list: numeral_list TK_NUM - { $1->push_back(new ASTNode(NUM_T, $2)); $$ = $1; } + { $1->push_back(ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$2))); $$ = $1; } | TK_NUM - { $$ = new std::vector(); $$->push_back(new ASTNode(NUM_T, $1)); } + { $$ = new std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$1))}; } ; qual_identifier: identifier { $$ = $1; } | '(' TK_AS identifier sort ')' { - $$ = new ASTNode(AS_T, NULL); - $$->children = new std::vector(); - $$->children->push_back($3); - $$->children->push_back($4); + $$ = new ASTNode(ASTType::AS_T, {osmttokens::t_none}, "", std::vector{std::move(*$3), std::move(*$4)}); } ; -var_binding_list: - { $$ = new std::vector(); } +var_binding_list: var_binding + { $$ = new std::vector{std::move(*$1)}; } | var_binding_list var_binding - { $1->push_back($2); $$ = $1; } + { $1->push_back(std::move(*$2)); $$ = $1; } ; var_binding: '(' symbol term ')' - { $$ = new ASTNode(VARB_T, strdup($2->getValue())); delete $2; $$->children = new std::vector(); $$->children->push_back($3); } + { $$ = new ASTNode(ASTType::VARB_T, {osmttokens::t_none}, std::string($2->getValue()), std::vector{std::move(*$3)}); } ; sorted_var_list: - { $$ = new std::vector(); } + { $$ = new std::vector(); } | sorted_var_list sorted_var - { $1->push_back($2); $$ = $1; } + { $1->push_back(std::move(*$2)); $$ = $1; } ; sorted_var: '(' symbol sort ')' - { $$ = new ASTNode(SV_T, strdup($2->getValue())); delete $2; $$->children = new std::vector(); $$->children->push_back($3); } + { $$ = new ASTNode(ASTType::SV_T, {osmttokens::t_none}, std::string($2->getValue()), std::vector{std::move(*$3)}); } term_list: - { $$ = new std::vector(); } + { $$ = new std::vector(); } | term_list term - { $1->push_back($2); $$ = $1; } + { $1->push_back(std::move(*$2)); $$ = $1; } ; term: spec_const - { $$ = new ASTNode(TERM_T, NULL); $$->children = new std::vector(); $$->children->push_back($1); } + { $$ = new ASTNode(ASTType::TERM_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); } | qual_identifier - { $$ = new ASTNode(QID_T, NULL); $$->children = new std::vector(); $$->children->push_back($1); } + { $$ = new ASTNode(ASTType::QID_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); } | '(' qual_identifier term term_list ')' { - $$ = new ASTNode(LQID_T, NULL); - $$->children = $4; - $$->children->insert($$->children->begin(), $3); - $$->children->insert($$->children->begin(), $2); - } - | '(' TK_LET '(' var_binding var_binding_list ')' term ')' - { - $$ = new ASTNode(LET_T, NULL); - $$->children = new std::vector(); - $5->insert($5->begin(), $4); - ASTNode* vbl = new ASTNode(VARBL_T, NULL); - vbl->children = $5; - $$->children->push_back(vbl); - $$->children->push_back($7); - } - | '(' TK_FORALL '(' sorted_var sorted_var_list ')' term ')' - { - $$ = new ASTNode(FORALL_T, NULL); - $$->children = new std::vector(); - $5->insert($5->begin(), $4); - ASTNode* svl = new ASTNode(SVL_T, NULL); - svl->children = $5; - $$->children->push_back(svl); - $$->children->push_back($7); - } - | '(' TK_EXISTS '(' sorted_var sorted_var_list ')' term ')' - { - $$ = new ASTNode(EXISTS_T, NULL); - $$->children = new std::vector(); - $5->insert($5->begin(), $4); - ASTNode* svl = new ASTNode(SVL_T, NULL); - svl->children = $5; - $$->children->push_back(svl); - $$->children->push_back($7); - } - | '(' '!' term attribute attribute_list ')' - { - $$ = new ASTNode(BANG_T, NULL); - $$->children = new std::vector(); - $$->children->push_back($3); - ASTNode *atrs = new ASTNode(GATTRL_T, NULL); - $5->insert($5->begin(), $4); - atrs->children = $5; - $$->children->push_back(atrs); + $$ = new ASTNode(ASTType::LQID_T, {osmttokens::t_none}, "", std::vector{std::move(*$2), std::move(*$3)}); + for (auto & c : (*$4)) { + $$->children.push_back(std::move(c)); + } + } + | '(' TK_LET '(' var_binding_list ')' term ')' + { + $$ = new ASTNode(ASTType::LET_T, {osmttokens::t_none}, "", {ASTNode(ASTType::VARBL_T, {osmttokens::t_none}, "", std::move(*$4)), std::move(*$6)}); + } + | '(' TK_FORALL '(' sorted_var_list ')' term ')' + { + // todo: AST traversal must ensure that sorted_var_list is non-empty + $$ = new ASTNode(ASTType::FORALL_T, {osmttokens::t_none}, "", {ASTNode(ASTType::SVL_T, {osmttokens::t_none}, "", std::move(*$4)), std::move(*$6)}); + } + | '(' TK_EXISTS '(' sorted_var_list ')' term ')' + { + // todo: AST traversal must ensure that sorted_var_list is non-empty + $$ = new ASTNode(ASTType::EXISTS_T, {osmttokens::t_none}, "", {ASTNode(ASTType::SVL_T, {osmttokens::t_none}, "", std::move(*$4)), std::move(*$6)}); + } + | '(' '!' term attribute_list ')' + { + // todo: AST traversal must ensure that attribute_list is non-empty + $$ = new ASTNode(ASTType::BANG_T, {osmttokens::t_none}, "", {std::move(*$3), ASTNode(ASTType::GATTRL_T, {osmttokens::t_none}, "", std::move(*$4))}); } ; symbol_list: - { $$ = new std::vector(); } + { $$ = new std::vector(); } | symbol_list symbol - { $1->push_back($2); $$ = $1; } + { $1->push_back(*$2); $$ = $1; } ; b_value: symbol { - const char * str = $1->getValue(); - if (strcmp(str, "true") == 0 or strcmp(str, "false") == 0) { - $$ = new ASTNode(BOOL_T, strdup($1->getValue())); delete $1; + std::string const & str = $1->getValue(); + if (str == "true" or str == "false") { + $$ = new ASTNode(ASTType::BOOL_T, {osmttokens::t_none}, std::string(str)); delete $1; } else { - printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", str); + printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", str.c_str()); delete $1; YYERROR; } @@ -505,75 +438,51 @@ b_value: symbol option: KW_PRINTSUCCESS b_value { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back($2); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } | KW_EXPANDDEFINITIONS b_value { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back($2); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } | KW_INTERACTIVEMODE b_value { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back($2); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } | KW_PRODUCEPROOFS b_value { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back($2); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } | KW_PRODUCEUNSATCORES b_value { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back($2); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } | KW_PRODUCEMODELS b_value { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back($2); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } | KW_PRODUCEASSIGNMENTS b_value { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back($2); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } | KW_REGULAROUTPUTCHANNEL TK_STR { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(STR_T, $2)); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{ASTNode(ASTType::STR_T, {osmttokens::t_none}, std::move(*$2))}); } | KW_DIAGNOSTICOUTPUTCHANNEL TK_STR { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(STR_T, $2)); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{ASTNode(ASTType::STR_T, {osmttokens::t_none}, std::move(*$2))}); } | KW_RANDOMSEED TK_NUM { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(NUM_T, $2)); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$2))}); } | KW_VERBOSITY TK_NUM { - $$ = new ASTNode(OPTION_T, $1); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(NUM_T, $2)); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$2))}); } | attribute { - $$ = new ASTNode(OPTION_T, NULL); - $$->children = new std::vector(); - $$->children->push_back($1); + $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); } ; @@ -636,25 +545,21 @@ predef_key: KW_SORTS ; info_flag: KW_ERRORBEHAVIOR - { $$ = new ASTNode(INFO_T, $1); } + { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } | KW_NAME - { $$ = new ASTNode(INFO_T, $1); } + { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } | KW_AUTHORS - { $$ = new ASTNode(INFO_T, $1); } + { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } | KW_VERSION - { $$ = new ASTNode(INFO_T, $1); } + { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } | KW_STATUS - { $$ = new ASTNode(INFO_T, $1); } + { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } | KW_REASONUNKNOWN - { $$ = new ASTNode(INFO_T, $1); } + { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } | KW_ALLSTATISTICS - { $$ = new ASTNode(INFO_T, $1); } + { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } | TK_KEY - { - $$ = new ASTNode(INFO_T, NULL); - $$->children = new std::vector(); - $$->children->push_back(new ASTNode(GATTR_T, $1)); - } + { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, "", std::vector{ASTNode(ASTType::GATTR_T, {osmttokens::t_none}, std::move(*$1))}); } ; %% diff --git a/src/proof/InterpolationContext.cc b/src/proof/InterpolationContext.cc index 37a257b03..48da52e52 100644 --- a/src/proof/InterpolationContext.cc +++ b/src/proof/InterpolationContext.cc @@ -189,17 +189,17 @@ class SingleInterpolationComputationContext { void checkInterAlgo() const; - bool usingMcMillanInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_mcmillan; } + bool usingMcMillanInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_mcmillan; } - bool usingPudlakInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_pudlak; } + bool usingPudlakInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_pudlak; } - bool usingMcMillanPrimeInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_mcmillanp; } + bool usingMcMillanPrimeInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_mcmillanp; } - bool usingPSInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_ps; } + bool usingPSInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_ps; } - bool usingPSWInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_psw; } + bool usingPSWInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_psw; } - bool usingPSSInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_pss; } + bool usingPSSInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_pss; } int verbose() const { return config.verbosity(); } @@ -211,7 +211,7 @@ class SingleInterpolationComputationContext { bool needProofStatistics() const { ItpAlgorithm ia = config.getBooleanInterpolationAlgorithm(); - return ((ia == itp_alg_ps) or (ia == itp_alg_psw) or (ia == itp_alg_pss)); + return ((ia == ItpAlgorithm::itp_alg_ps) or (ia == ItpAlgorithm::itp_alg_psw) or (ia == ItpAlgorithm::itp_alg_pss)); } bool verifyPartialInterpolant(ProofNode const &); diff --git a/src/proof/InterpolationContext.h b/src/proof/InterpolationContext.h index 5a93940ca..6d7dec0d2 100644 --- a/src/proof/InterpolationContext.h +++ b/src/proof/InterpolationContext.h @@ -55,19 +55,19 @@ class InterpolationContext { int verbose() const { return config.verbosity(); } - bool usingMcMillanInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_mcmillan; } + bool usingMcMillanInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_mcmillan; } - bool usingPudlakInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_pudlak; } + bool usingPudlakInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_pudlak; } bool usingMcMillanPrimeInterpolation() const { - return config.getBooleanInterpolationAlgorithm() == itp_alg_mcmillanp; + return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_mcmillanp; } - bool usingPSInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_ps; } + bool usingPSInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_ps; } - bool usingPSWInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_psw; } + bool usingPSWInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_psw; } - bool usingPSSInterpolation() const { return config.getBooleanInterpolationAlgorithm() == itp_alg_pss; } + bool usingPSSInterpolation() const { return config.getBooleanInterpolationAlgorithm() == ItpAlgorithm::itp_alg_pss; } bool enabledInterpVerif() const { return (config.certify_inter() >= 1); } }; diff --git a/src/tsolvers/egraph/UFInterpolator.h b/src/tsolvers/egraph/UFInterpolator.h index a0ac00741..63fe6ca61 100644 --- a/src/tsolvers/egraph/UFInterpolator.h +++ b/src/tsolvers/egraph/UFInterpolator.h @@ -151,9 +151,9 @@ class UFInterpolator : public TheoryInterpolator { icolor_t resolveABColor() const; - bool usingStrong() const { return config.getEUFInterpolationAlgorithm() == itp_euf_alg_strong; } - bool usingWeak() const { return config.getEUFInterpolationAlgorithm() == itp_euf_alg_weak; } - bool usingRandom() const { return config.getEUFInterpolationAlgorithm() == itp_euf_alg_random; } + bool usingStrong() const { return config.getEUFInterpolationAlgorithm() == ItpAlgorithm::itp_euf_alg_strong; } + bool usingWeak() const { return config.getEUFInterpolationAlgorithm() == ItpAlgorithm::itp_euf_alg_weak; } + bool usingRandom() const { return config.getEUFInterpolationAlgorithm() == ItpAlgorithm::itp_euf_alg_random; } bool getSubpaths(const path_t &, path_t &, path_t &, path_t &); diff --git a/src/tsolvers/lasolver/LASolver.cc b/src/tsolvers/lasolver/LASolver.cc index 503c19c60..a29f521e4 100644 --- a/src/tsolvers/lasolver/LASolver.cc +++ b/src/tsolvers/lasolver/LASolver.cc @@ -806,11 +806,11 @@ bool LASolver::isModelInteger(LVRef v) const PTRef LASolver::interpolateUsingEngine(FarkasInterpolator & interpolator) const { auto itpAlgorithm = config.getLRAInterpolationAlgorithm(); - if (itpAlgorithm == itp_lra_alg_strong) { return interpolator.getFarkasInterpolant(); } - else if (itpAlgorithm == itp_lra_alg_weak) { return interpolator.getDualFarkasInterpolant(); } - else if (itpAlgorithm == itp_lra_alg_factor) { return interpolator.getFlexibleInterpolant(opensmt::Real(config.getLRAStrengthFactor())); } - else if (itpAlgorithm == itp_lra_alg_decomposing_strong) { return interpolator.getDecomposedInterpolant(); } - else if (itpAlgorithm == itp_lra_alg_decomposing_weak) { return interpolator.getDualDecomposedInterpolant(); } + if (itpAlgorithm == ItpAlgorithm::itp_lra_alg_strong) { return interpolator.getFarkasInterpolant(); } + else if (itpAlgorithm == ItpAlgorithm::itp_lra_alg_weak) { return interpolator.getDualFarkasInterpolant(); } + else if (itpAlgorithm == ItpAlgorithm::itp_lra_alg_factor) { return interpolator.getFlexibleInterpolant(opensmt::Real(config.getLRAStrengthFactor().c_str())); } + else if (itpAlgorithm == ItpAlgorithm::itp_lra_alg_decomposing_strong) { return interpolator.getDecomposedInterpolant(); } + else if (itpAlgorithm == ItpAlgorithm::itp_lra_alg_decomposing_weak) { return interpolator.getDualDecomposedInterpolant(); } else { assert(false); // Incorrect value in config return interpolator.getFarkasInterpolant(); From 3f51d77bc04b4f14ec74ca617d5e1d13fbc10f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 27 Jun 2022 08:41:39 +0200 Subject: [PATCH 02/76] parser: cleanup and changes [WiP] --- src/api/Interpret.cc | 204 +++++------ src/api/Interpret.h | 17 +- src/options/SMTConfig.cc | 179 ++++----- src/options/SMTConfig.h | 265 +++++++------- src/parsers/smt2new/smt2newcontext.h | 17 +- src/parsers/smt2new/smt2newparser.yy | 346 ++++++++++++------ test/unit/test_LIAInterpolation.cc | 4 +- .../unit/test_ResolutionProofInterpolation.cc | 10 +- test/unit/test_UFInterpolation.cc | 12 +- 9 files changed, 570 insertions(+), 484 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 8a798a89c..48d1d8600 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -50,23 +50,21 @@ void Interpret::setInfo(ASTNode const & n) { assert(n.getType() == ASTType::UATTR_T || n.getType() == ASTType::PATTR_T); std::string name; - if (n.getValue().empty()) { - ASTNode const & an = n.children[0]; + if (n.hasValue()) { + ASTNode const & an = *(*n.children)[0]; assert(an.getType() == ASTType::UATTR_T || an.getType() == ASTType::PATTR_T); name = an.getValue(); } else // Normal option name = n.getValue(); - Info value(n); - - config.setInfo(std::move(name), value); + config.setInfo(std::move(name), Info(n)); } void Interpret::getInfo(ASTNode const & n) { assert(n.getType() == ASTType::INFO_T); - assert(n.getValue().empty() or not n.children.empty()); - std::string const & name = n.getValue().empty() ? "" : n.children[0].getValue(); + assert(n.hasValue() or n.children->size() == 1); + std::string const & name = n.hasValue() ? (*(*n.children)[0]).getValue() : n.getValue(); const Info& value = config.getInfo(name); @@ -80,8 +78,8 @@ void Interpret::getInfo(ASTNode const & n) { void Interpret::setOption(ASTNode const & n) { assert(n.getType() == ASTType::OPTION_T); - assert(not n.getValue().empty() or not n.children.empty()); - std::string const & name = n.getValue().empty() ? n.children[0].getValue() : n.getValue(); + assert(not n.hasValue() or not n.children->empty()); + std::string const & name = not n.hasValue() ? (*n.children)[0]->getValue() : n.getValue(); SMTOption value(n); const char* msg = "ok"; @@ -93,7 +91,7 @@ void Interpret::setOption(ASTNode const & n) { void Interpret::getOption(ASTNode const & n) { assert(n.getType() == ASTType::UATTR_T || n.getType() == ASTType::PATTR_T ); - assert(not n.getValue().empty()); + assert(n.hasValue()); std::string const & name = n.getValue(); const SMTOption& value = config.getOption(name); @@ -120,7 +118,7 @@ void Interpret::interp(ASTNode const & n) { try { switch (cmd.x) { case t_setlogic: { - ASTNode const & logic_n = *n.children.begin(); + ASTNode const & logic_n = *(*n.children)[0]; std::string const & logic_name = logic_n.getValue(); if (isInitialized()) { notify_formatted(true, "logic has already been set to %s", main_solver->getLogic().getName().data()); @@ -137,30 +135,26 @@ void Interpret::interp(ASTNode const & n) { } break; } - case t_setinfo: { - setInfo(n.children[0]); + case t_setinfo: + case t_setoption : { + setInfo(*(*n.children)[0]); notify_success(); break; } case t_getinfo: { - getInfo(n.children[0]); - break; - } - case t_setoption: { - setOption(n.children[0]); - notify_success(); + getInfo(*(*n.children)[0]); break; } case t_getoption: { - getOption(n.children[0]); + getOption(*(*n.children)[0]); break; } case t_declaresort: { if (isInitialized()) { - assert(n.children.size() == 2); - ASTNode const & symbolNode = n.children[0]; + assert(n.children->size() == 2); + ASTNode const & symbolNode = *(*n.children)[0]; assert(symbolNode.getType() == ASTType::SYM_T or symbolNode.getType() == ASTType::QSYM_T); - ASTNode const & numNode = n.children[1]; + ASTNode const & numNode = *(*n.children)[1]; assert(numNode.getType() == ASTType::NUM_T); int arity = std::stoi(numNode.getValue()); // MB: TODO: take care of out-of-range input SortSymbol symbol(symbolNode.getValue(), arity); @@ -193,7 +187,7 @@ void Interpret::interp(ASTNode const & n) { case t_assert: { if (isInitialized()) { sstat status; - ASTNode const &asrt = n.children[0]; + ASTNode const &asrt = *(*n.children)[0]; LetRecords letRecords; PTRef tr = parseTerm(asrt, letRecords); if (tr == PTRef_Undef) @@ -274,7 +268,7 @@ void Interpret::interp(ASTNode const & n) { } else if (main_solver->getStatus() != s_True) { notify_formatted(true, "Command get-value called, but solver is not in SAT state"); } else { - getValue(n.children); + getValue(*n.children); } break; } @@ -298,13 +292,13 @@ void Interpret::interp(ASTNode const & n) { if (status == s_Error) notify_formatted(true, "write-state"); } else { - writeState(n.children[0].getValue()); + writeState((*n.children)[0]->getValue()); } } break; } case t_echo: { - std::string const & str = n.children[0].getValue(); + std::string const & str = (*n.children)[0]->getValue(); notify_formatted(false, "%s", str.c_str()); break; } @@ -313,7 +307,7 @@ void Interpret::interp(ASTNode const & n) { notify_formatted(true, "Illegal command before set-logic: push"); } else { try { - int num = std::stoi(n.children[0].getValue()); + int num = std::stoi((*n.children)[0]->getValue()); push(num); } catch (std::out_of_range const & e) { notify_formatted(true, "Illegal push command: %s", e.what()); @@ -326,7 +320,7 @@ void Interpret::interp(ASTNode const & n) { notify_formatted(true, "Illegal command before set-logic: pop"); } else { try { - int num = std::stoi(n.children[0].getValue()); + int num = std::stoi((*n.children)[0]->getValue()); pop(num); } catch (std::out_of_range const &ex) { notify_formatted(true, "Illegal pop command: %s", ex.what()); @@ -350,7 +344,7 @@ void Interpret::interp(ASTNode const & n) { bool Interpret::addLetFrame(std::vector const & names, vec const& args, LetRecords& letRecords) { - assert(names.size() == args.size()); + assert(names.size() == args.size_()); if (names.size() > 1) { // check that they are pairwise distinct; std::unordered_set namesAsSet(names.begin(), names.end()); @@ -359,7 +353,7 @@ bool Interpret::addLetFrame(std::vector const & names, vec c return false; } } - for (int i = 0; i < names.size(); ++i) { + for (unsigned int i = 0; i < names.size(); ++i) { std::string const & name = names[i]; if (logic->hasSym(name.c_str()) && logic->getSym(logic->symNameToRef(name.c_str())[0]).noScoping()) { comment_formatted("Names marked as no scoping cannot be overloaded with let variables: %s", name.c_str()); @@ -399,7 +393,7 @@ PTRef Interpret::resolveTerm(const char* s, vec&& args, SRef sortRef, Sym PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { ASTType t = term.getType(); if (t == ASTType::TERM_T) { - std::string const & name = term.children[0].getValue(); + std::string const & name = (*term.children)[0]->getValue(); // comment_formatted("Processing term %s", name); PTRef tr = PTRef_Undef; try { @@ -411,17 +405,17 @@ PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { } else if (t == ASTType::QID_T) { - if (term.children[0].getType() == ASTType::AS_T) { - ASTNode const & as_node = term.children[0]; - ASTNode const & symbolNode = as_node.children[0]; + if ((*term.children)[0]->getType() == ASTType::AS_T) { + ASTNode const & as_node = *(*term.children)[0]; + ASTNode const & symbolNode = *(*as_node.children)[0]; bool isQuoted = symbolNode.getType() == ASTType::QSYM_T; - std::string const & name = as_node.children[0].getValue(); - ASTNode const & sortNode = as_node.children[1]; + std::string const & name = (*as_node.children)[0]->getValue(); + ASTNode const & sortNode = *(*as_node.children)[1]; assert(not name.empty()); PTRef tr = resolveQualifiedIdentifier(name.c_str(), sortNode, isQuoted); return tr; } else { - ASTNode const & symbolNode = term.children[0]; + ASTNode const & symbolNode = *(*term.children)[0]; std::string const & name = symbolNode.getValue(); bool isQuoted = symbolNode.getType() == ASTType::QSYM_T; PTRef tr = letNameResolve(name.c_str(), letRecords); @@ -438,12 +432,12 @@ PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { else if ( t == ASTType::LQID_T ) { // Multi-argument term - assert(term.children.size() > 1); - auto const & astArgs = opensmt::span(&term.children[1], term.children.size()-1); - std::string const & name = term.children[0].getValue(); + assert(term.children->size() > 1); + auto const & astArgs = opensmt::span(&(*term.children)[1], term.children->size()-1); + std::string const & name = (*term.children)[0]->getValue(); vec args; for (auto const & arg : astArgs) { - PTRef arg_tr = parseTerm(arg, letRecords); + PTRef arg_tr = parseTerm(*arg, letRecords); if (arg_tr == PTRef_Undef) { return PTRef_Undef; } else { @@ -463,26 +457,25 @@ PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { } return tr; } else if (t == ASTType::LET_T) { - assert(term.children.size() == 2); - std::vector const & varList = term.children[0].children; - ASTNode const & letBoundedTerm = term.children[1]; + assert(term.children->size() == 2); + std::vector> const & varList = *(*term.children)[0]->children; + ASTNode const & letBoundedTerm = *(*term.children)[1]; vec tmp_args; std::vector names; // use RAII idiom to guard the scope of new LetFrame (and ensure the cleaup of names) class Guard { LetRecords& rec; - std::vector &names; public: - Guard(LetRecords& rec, std::vector & names): rec(rec), names(names) { rec.pushFrame(); } + Guard(LetRecords& rec): rec(rec) { rec.pushFrame(); } ~Guard() { rec.popFrame(); } - } scopeGuard(letRecords, names); + } scopeGuard(letRecords); // First read the term declarations in the let statement for (auto const & varListEl : varList) { - PTRef let_tr = parseTerm(varListEl.children[0], letRecords); + PTRef let_tr = parseTerm(*(*(*varListEl).children)[0], letRecords); if (let_tr == PTRef_Undef) return PTRef_Undef; tmp_args.push(let_tr); - names.push_back(varListEl.getValue()); + names.push_back(varListEl->getValue()); } // Only then insert them to the table @@ -501,33 +494,28 @@ PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { } else if (t == ASTType::BANG_T) { - assert(term.children.size() == 2); + assert(term.children->size() == 2); - ASTNode const & named_term = term.children[0]; - ASTNode const & attr_l = term.children[1]; + ASTNode const & named_term = *(*term.children)[0]; + ASTNode const & attr_l = *(*term.children)[1]; assert(attr_l.getType() == ASTType::GATTRL_T); - assert(attr_l.children.size() == 1); - ASTNode const & name_attr = attr_l.children[0]; + assert(attr_l.children->size() == 1); + ASTNode const & name_attr = *(*attr_l.children)[0]; PTRef tr = parseTerm(named_term, letRecords); if (tr == PTRef_Undef) return tr; if (name_attr.getValue() == ":named") { - ASTNode const & sym = name_attr.children[0]; + ASTNode const & sym = *(*name_attr.children)[0]; assert(sym.getType() == ASTType::SYM_T or sym.getType() == ASTType::QSYM_T); - if (nameToTerm.has(sym.getValue().c_str())) { + if (nameToTerm.find(sym.getValue()) != nameToTerm.end()) { notify_formatted(true, "name %s already exists", sym.getValue().c_str()); return PTRef_Undef; } std::string name = sym.getValue(); // MB: term_names becomes the owner of the string and is responsible for deleting term_names.push_back(name); - nameToTerm.insert(name.c_str(), tr); - if (!termToNames.has(tr)) { - vec v; - termToNames.insert(tr, v); - } - termToNames[tr].push(name.c_str()); + nameToTerm.insert({name, tr}); } return tr; } @@ -619,7 +607,7 @@ bool Interpret::getAssignment() { } std::stringstream ss; ss << '('; - for (int i = 0; i < term_names.size(); i++) { + for (unsigned int i = 0; i < term_names.size(); i++) { std::string const & name = term_names[i]; PTRef tr = nameToTerm[name.c_str()]; lbool val = main_solver->getTermValue(tr); @@ -632,20 +620,20 @@ bool Interpret::getAssignment() { return true; } -void Interpret::getValue(std::vector const & terms) +void Interpret::getValue(std::vector> const & terms) { auto model = main_solver->getModel(); Logic& logic = main_solver->getLogic(); std::vector> values; for (auto const & term : terms) { LetRecords tmp; - PTRef tr = parseTerm(term, tmp); + PTRef tr = parseTerm(*term, tmp); if (tr != PTRef_Undef) { values.emplace_back(opensmt::pair{tr, model->evaluate(tr)}); auto pt_str = logic.printTerm(tr); comment_formatted("Found the term %s", pt_str.c_str()); } else - comment_formatted("Error parsing the term %s", term.children[0].getValue().c_str()); + comment_formatted("Error parsing the term %s", (*term->children)[0]->getValue().c_str()); } printf("("); for (auto const & valPair : values) { @@ -802,10 +790,10 @@ void Interpret::writeState(std::string const & filename) bool Interpret::declareFun(ASTNode const & n) // (const char* fname, const vec& args) { - assert(n.children.size() == 3); - ASTNode const & name_node = n.children[0]; - ASTNode const & args_node = n.children[1]; - ASTNode const & ret_node = n.children[2]; + assert(n.children->size() == 3); + ASTNode const & name_node = *(*n.children)[0]; + ASTNode const & args_node = *(*n.children)[1]; + ASTNode const & ret_node = *(*n.children)[2]; std::string const & fname = name_node.getValue(); @@ -819,12 +807,12 @@ bool Interpret::declareFun(ASTNode const & n) // (const char* fname, const vecsize() == 3); + ASTNode const & name_node = *(*n.children)[0]; // n.children[1] is the args node, which is empty - ASTNode const & ret_node = n.children[2]; + ASTNode const & ret_node = *(*n.children)[2]; std::string const & fname = name_node.getValue(); SRef ret_sort = sortFromASTNode(ret_node); @@ -872,22 +860,22 @@ bool Interpret::declareConst(ASTNode const & n) //(const char* fname, const SRef bool Interpret::defineFun(const ASTNode& n) { - assert(n.children.size() == 4); + assert(n.children->size() == 4); - ASTNode const & name_node = n.children[0]; - ASTNode const & args_node = n.children[1]; - ASTNode const & ret_node = n.children[2]; - ASTNode const & term_node = n.children[3]; + ASTNode const & name_node = *(*n.children)[0]; + ASTNode const & args_node = *(*n.children)[1]; + ASTNode const & ret_node = *(*n.children)[2]; + ASTNode const & term_node = *(*n.children)[3]; std::string const & fname = name_node.getValue(); // Get the argument sorts vec arg_sorts; vec arg_trs; - for (auto const & childNode : args_node.children) { - assert(childNode.children.size() == 1); - std::string varName = childNode.getValue(); - ASTNode const & sortNode = childNode.children[0]; + for (auto const & childNode : *(args_node.children)) { + assert(childNode->children->size() == 1); + std::string varName = childNode->getValue(); + ASTNode const & sortNode = *(*childNode->children)[0]; SRef sortRef = sortFromASTNode(sortNode); if (sortRef == SRef_Undef) { notify_formatted(true, "Undefined sort %s in function %s", sortSymbolFromASTNode(sortNode).name.c_str(), fname.c_str()); @@ -1009,10 +997,10 @@ void Interpret::notify_success() { } } -void Interpret::execute(const ASTNode* r) { - for (auto const & command : r->children) { +void Interpret::execute(ASTNode const & r) { + for (auto const & command : *r.children) { if (f_exit) break; - interp(command); + interp(*command); } } @@ -1022,7 +1010,7 @@ int Interpret::interpFile(FILE* in) { if (rval != 0) return rval; - const ASTNode* r = context.getRoot(); + const ASTNode & r = context.getRoot(); execute(r); return rval; } @@ -1032,7 +1020,7 @@ int Interpret::interpFile(char *content){ int rval = smt2newparse(&context); if (rval != 0) return rval; - const ASTNode* r = context.getRoot(); + ASTNode const & r = context.getRoot(); execute(r); return rval; } @@ -1135,7 +1123,7 @@ int Interpret::interpPipe() { if (rval != 0) notify_formatted(true, "scanner"); else { - const ASTNode* r = context.getRoot(); + ASTNode const & r = context.getRoot(); execute(r); done = f_exit; } @@ -1157,9 +1145,9 @@ SortSymbol Interpret::sortSymbolFromASTNode(ASTNode const & node) { if (type == ASTType::SYM_T or type == ASTType::QSYM_T) { return {node.getValue(), 0}; } else { - assert(type == ASTType::LID_T and not node.children.empty()); - ASTNode const & name = node.children[0]; - return {name.getValue(), static_cast(node.children.size() - 1)}; + assert(type == ASTType::LID_T and not node.children->empty()); + ASTNode const & name = *(*node.children)[0]; + return {name.getValue(), static_cast(node.children->size() - 1)}; } } @@ -1172,31 +1160,31 @@ SRef Interpret::sortFromASTNode(ASTNode const & node) const { if (not known) { return SRef_Undef; } return logic->getSort(symRef, {}); } else { - assert(type == ASTType::LID_T and not node.children.empty()); - ASTNode const & name = node.children[0]; - SortSymbol symbol(name.getValue(), node.children.size() - 1); + assert(type == ASTType::LID_T and not node.children->empty()); + ASTNode const & name = *(*node.children)[0]; + SortSymbol symbol(name.getValue(), node.children->size() - 1); SSymRef symRef; bool known = logic->peekSortSymbol(symbol, symRef); if (not known) { return SRef_Undef; } vec args; - auto astArgs = opensmt::span(&node.children[1], node.children.size()-1); + auto astArgs = opensmt::span(&(*node.children)[1], node.children->size()-1); for (auto const & astArg : astArgs) { - SRef argSortRef = sortFromASTNode(astArg); + SRef argSortRef = sortFromASTNode(*astArg); if (argSortRef == SRef_Undef) { return SRef_Undef; } args.push(argSortRef); } return logic->getSort(symRef, std::move(args)); } - assert(type == ASTType::LID_T and not node.children.empty()); - ASTNode const & name = node.children[0]; - SortSymbol symbol(name.getValue(), node.children.size() - 1); + assert(type == ASTType::LID_T and not node.children->empty()); + ASTNode const & name = *(*node.children)[0]; + SortSymbol symbol(name.getValue(), node.children->size() - 1); SSymRef symRef; bool known = logic->peekSortSymbol(symbol, symRef); if (not known) { return SRef_Undef; } vec args; - auto astSortArgs = opensmt::span(&node.children[1], node.children.size()-1); + auto astSortArgs = opensmt::span(&(*node.children)[1], node.children->size()-1); for (auto const & astSortArg : astSortArgs) { - SRef argSortRef = sortFromASTNode(astSortArg); + SRef argSortRef = sortFromASTNode(*astSortArg); if (argSortRef == SRef_Undef) { return SRef_Undef; } args.push(argSortRef); } @@ -1209,12 +1197,12 @@ void Interpret::getInterpolants(const ASTNode& n) vec grouping; // Consists of PTRefs that we want to group LetRecords letRecords; letRecords.pushFrame(); - for (auto key : nameToTerm.getKeys()) { + for (auto const & key : term_names) { letRecords.addBinding(key, nameToTerm[key]); } - for (auto const & c : exps) { - PTRef tr = parseTerm(c, letRecords); + for (auto const & c : *exps) { + PTRef tr = parseTerm(*c, letRecords); // printf("Itp'ing a term %s\n", logic->pp(tr)); grouping.push(tr); } diff --git a/src/api/Interpret.h b/src/api/Interpret.h index 6a3d524cb..94dcd2c41 100644 --- a/src/api/Interpret.h +++ b/src/api/Interpret.h @@ -86,11 +86,11 @@ class LetBinder { }; class LetRecords { - std::unordered_map > letBinders; - std::vector knownBinders; + std::unordered_map letBinders; + std::vector knownBinders; std::vector frameLimits; - bool has(const char* name) const { return letBinders.count(name) != 0; } + bool has(std::string const & name) const { return letBinders.find(name) != letBinders.end(); } public: PTRef getOrUndef(const char* letSymbol) const { auto it = letBinders.find(letSymbol); @@ -104,7 +104,7 @@ class LetRecords { auto limit = frameLimits.back(); frameLimits.pop_back(); while (knownBinders.size() > limit) { - const char* binder = knownBinders.back(); + std::string binder = knownBinders.back(); knownBinders.pop_back(); assert(this->has(binder)); auto& values = letBinders.at(binder); @@ -116,7 +116,7 @@ class LetRecords { } } - void addBinding(const char* name, PTRef arg) { + void addBinding(std::string const & name, PTRef arg) { knownBinders.push_back(name); if (not this->has(name)) { letBinders.insert(std::make_pair(name, LetBinder(arg))); @@ -135,8 +135,7 @@ class Interpret { bool f_exit; // Named terms for getting variable values - MapWithKeys> nameToTerm; - VecMap > termToNames; + std::unordered_map nameToTerm; std::vector term_names; // For (! :named ) constructs. if Itp is enabled, this maps a // partition to it name. vec assertions; @@ -157,7 +156,7 @@ class Interpret { bool declareConst(ASTNode const & n); //(const char* fname, const SRef ret_sort); bool defineFun(ASTNode const & n); virtual sstat checkSat(); - void getValue(std::vector const & term); + void getValue(std::vector> const & term); void getModel(); std::string printDefinitionSmtlib(PTRef tr, PTRef val); std::string printDefinitionSmtlib(const TemplateFunction &templateFun) const; @@ -193,7 +192,7 @@ class Interpret { int interpFile(char *content); int interpPipe(); - void execute(const ASTNode* n); + void execute(ASTNode const & n); bool gotExit() const { return f_exit; } ValPair getValue (PTRef tr) const; diff --git a/src/options/SMTConfig.cc b/src/options/SMTConfig.cc index 30485ffc9..5805653eb 100644 --- a/src/options/SMTConfig.cc +++ b/src/options/SMTConfig.cc @@ -34,24 +34,18 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Generic configuration class, used for both set-info and set-option *********************************************************************/ -ConfValue::ConfValue(const char* s) { - type = O_STR; - strval = strdup(s); // TODO memory leak -} - ConfValue::ConfValue(const ASTNode& s_expr_n) { if (s_expr_n.getType() == ASTType::SEXPRL_T) { type = O_LIST; - configs = new std::list; - for (auto const & i : s_expr_n.children) { - configs->push_back(new ConfValue(i)); + for (auto const & i : (*s_expr_n.children)) { + configs.push_back(ConfValue(*i)); } } else if (s_expr_n.getType() == ASTType::SYM_T) { type = O_SYM; strval = s_expr_n.getValue(); } else if (s_expr_n.getType() == ASTType::SPECC_T) { - assert(s_expr_n.children.size() > 0); - ASTNode const & spn = s_expr_n.children[0]; + assert(s_expr_n.children->size() > 0); + ASTNode const & spn = *(*s_expr_n.children)[0]; if (spn.getType() == ASTType::NUM_T) { type = O_NUM; numval = std::stoi(spn.getValue()); @@ -90,66 +84,57 @@ ConfValue::ConfValue(const ASTNode& s_expr_n) { } } -ConfValue::ConfValue(const ConfValue& other) { - type = other.type; - if (type == O_NUM) numval = other.numval; - else if (type == O_STR) strval = other.strval; - else if (type == O_DEC) decval = other.decval; - else if (type == O_LIST) { - configs = new std::list; - for (ConfValue * value : *other.configs) - configs->push_back(new ConfValue(*value)); - } - else if (type == O_SYM) - strval = other.strval; - else if (type == O_HEX) - unumval = other.unumval; - else if (type == O_BIN) - unumval = other.unumval; - else if (type == O_ATTR) - strval = other.strval; - else if (type == O_BOOL) - numval = other.numval; - else if (type == O_EMPTY) - strval = strdup(""); - else assert(false); -} - -ConfValue& ConfValue::operator=(const ConfValue& other) -{ - type = other.type; - if (type == O_NUM) numval = other.numval; - else if (type == O_STR) strval = other.strval; - else if (type == O_DEC) decval = other.decval; - else if (type == O_LIST) { - configs = new std::list; - for (ConfValue * value : *other.configs) - configs->push_back(new ConfValue(*value)); - } - else if (type == O_SYM) - strval = other.strval; - else if (type == O_HEX) - unumval = other.unumval; - else if (type == O_BIN) - unumval = other.unumval; - else if (type == O_ATTR) - strval = other.strval; - else if (type == O_BOOL) - numval = other.numval; - else if (type == O_EMPTY) - strval = strdup(""); - else assert(false); - return *this; -} - -ConfValue::~ConfValue() { - if (type == O_LIST) { - for (auto * value : *configs) { - delete value; - } - delete configs; - } -} +//ConfValue::ConfValue(const ConfValue& other) { +// type = other.type; +// if (type == O_NUM) numval = other.numval; +// else if (type == O_STR) strval = other.strval; +// else if (type == O_DEC) decval = other.decval; +// else if (type == O_LIST) { +// configs = new std::list; +// for (ConfValue * value : *other.configs) +// configs->push_back(new ConfValue(*value)); +// } +// else if (type == O_SYM) +// strval = other.strval; +// else if (type == O_HEX) +// unumval = other.unumval; +// else if (type == O_BIN) +// unumval = other.unumval; +// else if (type == O_ATTR) +// strval = other.strval; +// else if (type == O_BOOL) +// numval = other.numval; +// else if (type == O_EMPTY) +// strval = strdup(""); +// else assert(false); +//} + +//ConfValue& ConfValue::operator=(const ConfValue& other) +//{ +// type = other.type; +// if (type == O_NUM) numval = other.numval; +// else if (type == O_STR) strval = other.strval; +// else if (type == O_DEC) decval = other.decval; +// else if (type == O_LIST) { +// configs = new std::list; +// for (ConfValue * value : *other.configs) +// configs->push_back(new ConfValue(*value)); +// } +// else if (type == O_SYM) +// strval = other.strval; +// else if (type == O_HEX) +// unumval = other.unumval; +// else if (type == O_BIN) +// unumval = other.unumval; +// else if (type == O_ATTR) +// strval = other.strval; +// else if (type == O_BOOL) +// numval = other.numval; +// else if (type == O_EMPTY) +// strval = strdup(""); +// else assert(false); +// return *this; +//} std::string ConfValue::toString() const { if (type == O_BOOL) @@ -177,11 +162,10 @@ std::string ConfValue::toString() const { return strval; } if (type == O_LIST) { - assert(configs); std::stringstream ss; ss << "( "; - for (ConfValue * val : *configs) { - ss << val->toString() << " "; + for (ConfValue const & val : configs) { + ss << val.toString() << " "; } ss << ")"; return ss.str(); @@ -196,12 +180,12 @@ std::string ConfValue::toString() const { Info::Info(ASTNode const & n) { assert(n.getType() == ASTType::UATTR_T or n.getType() == ASTType::PATTR_T); - if (n.children.empty()) { + if (n.children->empty()) { value.type = O_EMPTY; return; } else { // child is attribute_value - ASTNode const & child = n.children[0]; + ASTNode const & child = *(*n.children)[0]; if (child.getType() == ASTType::SPECC_T or child.getType() == ASTType::SEXPRL_T) { value = ConfValue(child); @@ -214,19 +198,19 @@ Info::Info(ASTNode const & n) { } } -Info::Info(const Info& other) -{ - value = other.value; -} +//Info::Info(const Info& other) +//{ +// value = other.value; +//} /*********************************************************** * Class defining the options, configured with set-config ***********************************************************/ SMTOption::SMTOption(ASTNode const & n) { - assert(not n.children.empty()); + assert(not n.children->empty()); - ASTNode const & child = n.children[0]; + ASTNode const & child = *(*n.children)[0]; if (child.getType() == ASTType::BOOL_T) { value.type = O_BOOL; @@ -251,12 +235,12 @@ SMTOption::SMTOption(ASTNode const & n) { assert(child.getType() == ASTType::UATTR_T or child.getType() == ASTType::PATTR_T); // The option is an attribute - if (child.children.empty()) { + if (child.children->empty()) { value.type = O_EMPTY; return; } else { // n is now attribute_value - ASTNode const & attributeValue = child.children[0]; + ASTNode const & attributeValue = *(*child.children)[0]; if (attributeValue.getType() == ASTType::SPECC_T or attributeValue.getType() == ASTType::SEXPRL_T) { value = ConfValue(attributeValue); @@ -293,7 +277,7 @@ bool SMTConfig::setOption(std::string const & name, const SMTOption& value, cons if (value.getValue().type != O_STR) { msg = s_err_not_str; return false; } if (optionTable.find(name) == optionTable.end()) stats_out.open(value.getValue().strval, std::ios_base::out); - else if (optionTable[name]->getValue().strval != value.getValue().strval) { + else if (optionTable[name].getValue().strval != value.getValue().strval) { if (stats_out.is_open()) { stats_out.close(); stats_out.open(value.getValue().strval, std::ios_base::out); @@ -308,21 +292,21 @@ bool SMTConfig::setOption(std::string const & name, const SMTOption& value, cons if (value.getValue().numval == 1) { // Gets set to true if (optionTable.find(o_stats_out) == optionTable.end()) { - if (optionTable.find(o_produce_stats) == optionTable.end() || optionTable[o_produce_stats]->getValue().numval == 0) { + if (optionTable.find(o_produce_stats) == optionTable.end() || optionTable[o_produce_stats].getValue().numval == 0) { // Insert the default value - insertOption(o_stats_out, new SMTOption("/dev/stdout")); - } else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats]->getValue().numval == 1) { + insertOption(o_stats_out, SMTOption("/dev/stdout")); + } else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats].getValue().numval == 1) { assert(false); } } else { } // No action required - if (!stats_out.is_open()) stats_out.open(optionTable[o_stats_out]->getValue().strval, std::ios_base::out); + if (!stats_out.is_open()) stats_out.open(optionTable[o_stats_out].getValue().strval, std::ios_base::out); } - else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats]->getValue().numval == 1) { + else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats].getValue().numval == 1) { // gets set to false and was previously true if (optionTable.find(o_stats_out) != optionTable.end()) { - if (optionTable.at(o_stats_out)->getValue().numval == 0) assert(false); + if (optionTable.at(o_stats_out).getValue().numval == 0) assert(false); else if (stats_out.is_open()) stats_out.close(); } } @@ -354,29 +338,28 @@ bool SMTConfig::setOption(std::string const & name, const SMTOption& value, cons if (itr != optionTable.end()) { optionTable.erase(itr); } - insertOption(name, new SMTOption(value)); + insertOption(name, SMTOption(value)); return true; } const SMTOption& SMTConfig::getOption(std::string const & name) const { auto itr = optionTable.find(name); if (itr != optionTable.end()) - return *itr->second; + return itr->second; else return option_Empty; } -bool SMTConfig::setInfo(std::string && name_, const Info& value) { +bool SMTConfig::setInfo(std::string && name_, Info && value) { if (infoTable.find(name_) != infoTable.end()) infoTable.erase(infoTable.find(name_)); - infos.emplace_back(Info(value)); - infoTable.insert({name_, &infos.back()}); + infoTable.insert({name_, value}); return true; } -const Info& SMTConfig::getInfo(std::string const & name) const { +Info SMTConfig::getInfo(std::string const & name) const { if (infoTable.find(name) != infoTable.end()) - return *infoTable.at(name); + return infoTable.at(name); else return info_Empty; } @@ -476,7 +459,7 @@ SMTConfig::initializeConfig( ) { // Set Global Default configuration status = l_Undef; - insertOption(o_produce_stats, new SMTOption(0)); + insertOption(o_produce_stats, SMTOption(0)); // produce_stats = 0; // produce_models = 0; print_stats = 1; diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index 87c1af255..42559ae63 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -81,24 +81,30 @@ enum class ASTType { }; class ASTNode { + using ASTNode_up = std::unique_ptr; + using ASTVec = std::vector; + using ASTVec_up = std::unique_ptr; + using string_up = std::unique_ptr; + private: - ASTType type; - osmttokens::smt2token tok; - std::string val; + ASTType type = ASTType::UNDEF_T; + osmttokens::smt2token tok = {osmttokens::t_none}; + std::unique_ptr val; public: - std::vector children; + ASTVec_up children = nullptr; - ASTNode(ASTType t, osmttokens::smt2token tok = {osmttokens::t_none}, std::string && v = "", std::vector && children = {}) + ASTNode(ASTType t, osmttokens::smt2token tok = {osmttokens::t_none}, string_up v = nullptr, ASTVec_up children = nullptr) : type(t), tok(tok), val(std::move(v)), children(std::move(children)) {} - ASTNode() : ASTNode(ASTType::UNDEF_T) {} - ASTNode(ASTNode const &) = delete; - ASTNode(ASTNode &&) = default; - ASTNode & operator=(ASTNode const &) = delete; +// ASTNode(ASTNode const &) = default; +// ASTNode(ASTNode &&) = default; +// ASTNode & operator=(ASTNode const &) = delete; +// ASTNode & operator=(ASTNode &&) = default; void print(std::ostream& o, int indent) const; ASTType getType() const { return type; } - std::string const & getValue() const { return val; } - const osmttokens::smt2token getToken() const { return tok; } + bool hasValue() const { return val != nullptr; } + std::string const & getValue() const { assert(hasValue()); return *val; } + osmttokens::smt2token getToken() const { return tok; } }; @@ -106,18 +112,21 @@ enum ConfType { O_EMPTY, O_STR, O_SYM, O_NUM, O_DEC, O_HEX, O_BIN, O_LIST, O_ATT class ConfValue { public: - ConfType type; - union { std::string strval; int numval; double decval; uint32_t unumval; std::list* configs; }; - ConfValue() : type(O_EMPTY), strval(NULL) {}; + ConfType type = O_EMPTY; + std::string strval = ""; + int numval = 0; + double decval = 0; + uint32_t unumval = 0; + std::list configs; + ConfValue() = default; ConfValue(const ASTNode& s_expr_n); ConfValue(int i) : type(O_NUM), numval(i) {}; ConfValue(double i) : type(O_DEC), decval(i) {}; - ConfValue(const char* s); - ConfValue(const ConfValue& other); - ConfValue& operator=(const ConfValue& other); + ConfValue(std::string && s) : strval(s) {} +// ConfValue(const ConfValue& other); +// ConfValue& operator=(const ConfValue& other); std::string toString() const; double getDoubleVal() const {if (type == O_NUM) return (double)numval; else if (type == O_DEC) return decval; else assert(false); return -1;} - ~ConfValue(); }; class Info { @@ -125,8 +134,9 @@ class Info { ConfValue value; public: Info(ASTNode const & n); - Info(Info const & other); - Info() {}; + Info() = default; +// Info(Info const & other); +// Info() {}; bool isEmpty() const { return value.type == O_EMPTY; } inline std::string toString() const { return value.toString(); } }; @@ -139,7 +149,7 @@ class SMTOption { SMTOption() {} SMTOption(int i) : value(i) {} SMTOption(double i): value(i) {} - SMTOption(const char* s) : value(s) {} + SMTOption(std::string && s) : value(std::move(s)) {} inline bool isEmpty() const { return value.type == O_EMPTY; } inline std::string toString() const { return value.toString(); } inline const ConfValue& getValue() const { return value; } @@ -309,11 +319,9 @@ struct SMTConfig Info info_Empty; SMTOption option_Empty; - std::vector options; std::vector option_names; - std::vector infos; - std::unordered_map infoTable; - std::unordered_map optionTable; + std::unordered_map infoTable; + std::unordered_map optionTable; bool usedForInitialization = false; // Some options can be changed only before this config is used for initialization of MainSolver bool isPreInitializationOption(std::string const & o_name) { @@ -322,12 +330,11 @@ struct SMTConfig or o_name == o_sat_scatter_split or o_name == o_ghost_vars; } - void insertOption(std::string const & o_name, SMTOption* o) { - options.push_back(o); - if (optionTable.find(o_name) != optionTable.end()) optionTable[o_name] = o; + void insertOption(std::string const & o_name, SMTOption && o) { + if (optionTable.find(o_name) != optionTable.end()) optionTable.insert({o_name, std::move(o)}); else { option_names.push_back(o_name); - optionTable.insert({o_name, o}); + optionTable.insert({o_name, std::move(o)}); } } std::string append_output_dir(std::string const & name) const @@ -351,16 +358,11 @@ struct SMTConfig initializeConfig( ); } - ~SMTConfig () { - for (auto i : options) - delete i; - } - bool setOption(std::string const & name, const SMTOption& value, const char*& msg); const SMTOption& getOption(std::string const & name) const; - bool setInfo (std::string && name, const Info& value); - const Info& getInfo (std::string const & name) const; + bool setInfo (std::string && name, Info && value); + Info getInfo (std::string const & name) const; void initializeConfig ( ); @@ -369,194 +371,194 @@ struct SMTConfig void printHelp ( ); void printConfig ( std::ostream & out ); - inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed)->getValue().numval : 91648253; } - inline void setProduceModels( ) { insertOption(o_produce_models, new SMTOption(1)); } - inline bool setRandomSeed(int seed) { insertOption(o_random_seed, new SMTOption(seed)); return true; } + inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getValue().numval : 91648253; } + inline void setProduceModels( ) { insertOption(o_produce_models, SMTOption(1)); } + inline bool setRandomSeed(int seed) { insertOption(o_random_seed, SMTOption(seed)); return true; } void setUsedForInitiliazation() { usedForInitialization = true; } inline bool produceProof( ) { - return optionTable.find(o_produce_proofs) != optionTable.end() ? optionTable[o_produce_proofs]->getValue().numval > 0 : false; + return optionTable.find(o_produce_proofs) != optionTable.end() ? optionTable[o_produce_proofs].getValue().numval > 0 : false; } - void setTimeQueries() { insertOption(o_time_queries, new SMTOption(1)); } - bool timeQueries() { return optionTable.find(o_time_queries) != optionTable.end() ? optionTable[o_time_queries]->getValue().numval : false; } + void setTimeQueries() { insertOption(o_time_queries, SMTOption(1)); } + bool timeQueries() { return optionTable.find(o_time_queries) != optionTable.end() ? optionTable[o_time_queries].getValue().numval : false; } // Set reduction params - inline void setReduction(int r) { insertOption(o_proof_reduce, new SMTOption(r)); } + inline void setReduction(int r) { insertOption(o_proof_reduce, SMTOption(r)); } - inline void setReductionGraph(int r) { insertOption(o_proof_num_graph_traversals, new SMTOption(r)); } + inline void setReductionGraph(int r) { insertOption(o_proof_num_graph_traversals, SMTOption(r)); } - inline void setReductionLoops(int r) { insertOption(o_proof_red_trans, new SMTOption(r)); } + inline void setReductionLoops(int r) { insertOption(o_proof_red_trans, SMTOption(r)); } // Set interpolation algorithms inline void setBooleanInterpolationAlgorithm( ItpAlgorithm i ) { - insertOption(o_itp_bool_alg, new SMTOption(static_cast(i))); } + insertOption(o_itp_bool_alg, SMTOption(static_cast(i))); } - inline void setEUFInterpolationAlgorithm( ItpAlgorithm i ) { insertOption(o_itp_euf_alg, new SMTOption(static_cast(i))); } + inline void setEUFInterpolationAlgorithm( ItpAlgorithm i ) { insertOption(o_itp_euf_alg, SMTOption(static_cast(i))); } - inline void setLRAInterpolationAlgorithm( ItpAlgorithm i ) { insertOption(o_itp_lra_alg, new SMTOption(static_cast(i))); } + inline void setLRAInterpolationAlgorithm( ItpAlgorithm i ) { insertOption(o_itp_lra_alg, SMTOption(static_cast(i))); } - inline void setLRAStrengthFactor(const char *factor) { insertOption(o_itp_lra_factor, new SMTOption(factor)); } + inline void setLRAStrengthFactor(const char *factor) { insertOption(o_itp_lra_factor, SMTOption(factor)); } - inline void setInstanceName(const char* name) { insertOption(o_inst_name, new SMTOption(name)); } + inline void setInstanceName(const char* name) { insertOption(o_inst_name, SMTOption(name)); } // Get interpolation algorithms inline ItpAlgorithm getBooleanInterpolationAlgorithm() const { - return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg)->getValue().numval) + return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getValue().numval) : ItpAlgorithm::itp_alg_mcmillan; } inline ItpAlgorithm getEUFInterpolationAlgorithm() const { - return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg)->getValue().numval) + return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getValue().numval) : ItpAlgorithm::itp_euf_alg_strong; } inline ItpAlgorithm getLRAInterpolationAlgorithm() const { - return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg)->getValue().numval) + return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getValue().numval) : ItpAlgorithm::itp_lra_alg_strong; } inline std::string getLRAStrengthFactor() const { return optionTable.find(o_itp_lra_factor) != optionTable.end() ? optionTable.at( - o_itp_lra_factor)->getValue().strval : itp_lra_factor_0; + o_itp_lra_factor).getValue().strval : itp_lra_factor_0; } inline std::string getInstanceName() const { - return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name)->getValue().strval : "unknown"; + return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name).getValue().strval : "unknown"; } lbool status; // Status of the benchmark // int incremental; // Incremental solving int isIncremental() const { return optionTable.find(o_incremental) != optionTable.end() ? - optionTable.at(o_incremental)->getValue().numval == 1: true; } + optionTable.at(o_incremental).getValue().numval == 1: true; } int produce_models() const { return optionTable.find(o_produce_models) != optionTable.end() ? - optionTable.at(o_produce_models)->getValue().numval : + optionTable.at(o_produce_models).getValue().numval : 1; } int produceStats() const { return optionTable.find(o_produce_stats) != optionTable.end() ? - optionTable.at(o_produce_stats)->getValue().numval == 1: false; } + optionTable.at(o_produce_stats).getValue().numval == 1: false; } std::string getStatsOut() const { - return optionTable.find(o_stats_out) != optionTable.end() ? optionTable.at(o_stats_out)->getValue().strval : "/dev/stdout"; + return optionTable.find(o_stats_out) != optionTable.end() ? optionTable.at(o_stats_out).getValue().strval : "/dev/stdout"; } int sat_grow() const { return optionTable.find(o_grow) != optionTable.end() ? - optionTable.at(o_grow)->getValue().numval : 0; } + optionTable.at(o_grow).getValue().numval : 0; } int sat_clause_lim() const { return optionTable.find(o_clause_lim) != optionTable.end() ? - optionTable.at(o_clause_lim)->getValue().numval : 20; } + optionTable.at(o_clause_lim).getValue().numval : 20; } int sat_subsumption_lim() const { return optionTable.find(o_subsumption_lim) != optionTable.end() ? - optionTable.at(o_subsumption_lim)->getValue().numval : 1000; } + optionTable.at(o_subsumption_lim).getValue().numval : 1000; } double sat_simp_garbage_frac() const { return optionTable.find(o_simp_garbage_frac) != optionTable.end() ? - optionTable.at(o_simp_garbage_frac)->getValue().decval : 0.5; } + optionTable.at(o_simp_garbage_frac).getValue().decval : 0.5; } int sat_use_asymm() const { return optionTable.find(o_use_asymm) != optionTable.end() ? - optionTable.at(o_use_asymm)->getValue().numval == 1: false; } + optionTable.at(o_use_asymm).getValue().numval == 1: false; } int sat_use_rcheck() const { return optionTable.find(o_use_rcheck) != optionTable.end() ? - optionTable.at(o_use_rcheck)->getValue().numval == 1: false; } + optionTable.at(o_use_rcheck).getValue().numval == 1: false; } int sat_use_elim() const { return optionTable.find(o_use_elim) != optionTable.end() ? - optionTable.at(o_use_elim)->getValue().numval == 1: true; } + optionTable.at(o_use_elim).getValue().numval == 1: true; } double sat_var_decay() const { return optionTable.find(o_var_decay) != optionTable.end() ? - optionTable.at(o_var_decay)->getValue().decval : 1 / 0.95; } + optionTable.at(o_var_decay).getValue().decval : 1 / 0.95; } double sat_clause_decay() const { return optionTable.find(o_clause_decay) != optionTable.end() ? - optionTable.at(o_clause_decay)->getValue().decval : 1 / 0.999; } + optionTable.at(o_clause_decay).getValue().decval : 1 / 0.999; } double sat_random_var_freq() const { return optionTable.find(o_random_var_freq) != optionTable.end() ? - optionTable.at(o_random_var_freq)->getValue().decval : 0.02; } + optionTable.at(o_random_var_freq).getValue().decval : 0.02; } int sat_random_seed() const { return optionTable.find(o_random_seed) != optionTable.end() ? - optionTable.at(o_random_seed)->getValue().decval : 91648253; } + optionTable.at(o_random_seed).getValue().decval : 91648253; } int sat_luby_restart() const { return optionTable.find(o_luby_restart) != optionTable.end() ? - optionTable.at(o_luby_restart)->getValue().numval > 0 : 1; } + optionTable.at(o_luby_restart).getValue().numval > 0 : 1; } int sat_ccmin_mode() const { return optionTable.find(o_ccmin_mode) != optionTable.end() ? - optionTable.at(o_ccmin_mode)->getValue().numval : 2; } + optionTable.at(o_ccmin_mode).getValue().numval : 2; } int sat_rnd_pol() const { return optionTable.find(o_rnd_pol) != optionTable.end() ? - optionTable.at(o_rnd_pol)->getValue().numval > 0 : 0; } + optionTable.at(o_rnd_pol).getValue().numval > 0 : 0; } int sat_rnd_init_act() const { return optionTable.find(o_rnd_init_act) != optionTable.end() ? - optionTable.at(o_rnd_init_act)->getValue().numval > 0 : 0; } + optionTable.at(o_rnd_init_act).getValue().numval > 0 : 0; } double sat_garbage_frac() const { return optionTable.find(o_garbage_frac) != optionTable.end() ? - optionTable.at(o_garbage_frac)->getValue().decval : 0.20; } + optionTable.at(o_garbage_frac).getValue().decval : 0.20; } int sat_restart_first() const { return optionTable.find(o_restart_first) != optionTable.end() ? - optionTable.at(o_restart_first)->getValue().numval : 100; } + optionTable.at(o_restart_first).getValue().numval : 100; } double sat_restart_inc() const { return optionTable.find(o_restart_inc) != optionTable.end() ? - optionTable.at(o_restart_inc)->getValue().numval : 1.1; } + optionTable.at(o_restart_inc).getValue().numval : 1.1; } int proof_interpolant_cnf() const { return optionTable.find(o_interpolant_cnf) != optionTable.end() ? - optionTable.at(o_interpolant_cnf)->getValue().numval : 0; } + optionTable.at(o_interpolant_cnf).getValue().numval : 0; } int certify_inter() const { return optionTable.find(o_certify_inter) != optionTable.end() ? - optionTable.at(o_certify_inter)->getValue().numval : 0; } + optionTable.at(o_certify_inter).getValue().numval : 0; } bool produce_inter() const { return optionTable.find(o_produce_inter) != optionTable.end() ? - optionTable.at(o_produce_inter)->getValue().numval > 0 : false; } + optionTable.at(o_produce_inter).getValue().numval > 0 : false; } int simplify_inter() const { return optionTable.find(o_simplify_inter) != optionTable.end() ? - optionTable.at(o_simplify_inter)->getValue().numval : 0; } + optionTable.at(o_simplify_inter).getValue().numval : 0; } int proof_struct_hash() const { return optionTable.find(o_proof_struct_hash) != optionTable.end() ? - optionTable.at(o_proof_struct_hash)->getValue().numval : 1; } + optionTable.at(o_proof_struct_hash).getValue().numval : 1; } int proof_num_graph_traversals() const { return optionTable.find(o_proof_num_graph_traversals) != optionTable.end() ? - optionTable.at(o_proof_num_graph_traversals)->getValue().numval : 3; } + optionTable.at(o_proof_num_graph_traversals).getValue().numval : 3; } int proof_red_trans() const { return optionTable.find(o_proof_red_trans) != optionTable.end() ? - optionTable.at(o_proof_red_trans)->getValue().numval : 2; } + optionTable.at(o_proof_red_trans).getValue().numval : 2; } int proof_rec_piv() const { return optionTable.find(o_proof_rec_piv) != optionTable.end() ? - optionTable.at(o_proof_rec_piv)->getValue().numval : 1; } + optionTable.at(o_proof_rec_piv).getValue().numval : 1; } int proof_push_units() const { return optionTable.find(o_proof_push_units) != optionTable.end() ? - optionTable.at(o_proof_push_units)->getValue().numval : 1; } + optionTable.at(o_proof_push_units).getValue().numval : 1; } int proof_transf_trav() const { return optionTable.find(o_proof_transf_trav) != optionTable.end() ? - optionTable.at(o_proof_transf_trav)->getValue().numval : 1; } + optionTable.at(o_proof_transf_trav).getValue().numval : 1; } int proof_check() const { return optionTable.find(o_proof_check) != optionTable.end() ? - optionTable.at(o_proof_check)->getValue().numval : 0; } + optionTable.at(o_proof_check).getValue().numval : 0; } int proof_multiple_inter() const { return optionTable.find(o_proof_multiple_inter) != optionTable.end() ? - optionTable.at(o_proof_multiple_inter)->getValue().numval : 0; } + optionTable.at(o_proof_multiple_inter).getValue().numval : 0; } int proof_alternative_inter() const { return optionTable.find(o_proof_alternative_inter) != optionTable.end() ? - optionTable.at(o_proof_alternative_inter)->getValue().numval : 0; } + optionTable.at(o_proof_alternative_inter).getValue().numval : 0; } int proof_reduce() const { return optionTable.find(o_proof_reduce) != optionTable.end() ? - optionTable.at(o_proof_reduce)->getValue().numval : 0; } + optionTable.at(o_proof_reduce).getValue().numval : 0; } int itp_bool_alg() const { return optionTable.find(o_itp_bool_alg) != optionTable.end() ? - optionTable.at(o_itp_bool_alg)->getValue().numval : 0; } + optionTable.at(o_itp_bool_alg).getValue().numval : 0; } int itp_euf_alg() const { return optionTable.find(o_itp_euf_alg) != optionTable.end() ? - optionTable.at(o_itp_euf_alg)->getValue().numval : 0; } + optionTable.at(o_itp_euf_alg).getValue().numval : 0; } int itp_lra_alg() const { return optionTable.find(o_itp_lra_alg) != optionTable.end() ? - optionTable.at(o_itp_lra_alg)->getValue().numval : 0; } + optionTable.at(o_itp_lra_alg).getValue().numval : 0; } int sat_dump_rnd_inter() const { return optionTable.find(o_sat_dump_rnd_inter) != optionTable.end() ? - optionTable.at(o_sat_dump_rnd_inter)->getValue().numval : 2; } + optionTable.at(o_sat_dump_rnd_inter).getValue().numval : 2; } bool declarations_are_global() const { - return optionTable.find(o_global_declarations) != optionTable.end() ? optionTable.at(o_global_declarations)->getValue().numval > 0 : false; + return optionTable.find(o_global_declarations) != optionTable.end() ? optionTable.at(o_global_declarations).getValue().numval > 0 : false; } SpUnit sat_resource_units() const { if (optionTable.find(o_sat_resource_units) != optionTable.end()) { - std::string type = optionTable.at(o_sat_resource_units)->getValue().strval; + std::string type = optionTable.at(o_sat_resource_units).getValue().strval; if (type == spts_search_counter) { return SpUnit::search_counter; } else if (type == spts_time) { @@ -568,49 +570,48 @@ struct SMTConfig bool respect_logic_partitioning_hints() const { return optionTable.find(o_respect_logic_partitioning_hints) != optionTable.end() ? - optionTable.at(o_respect_logic_partitioning_hints)->getValue().numval : 0; } + optionTable.at(o_respect_logic_partitioning_hints).getValue().numval : 0; } double sat_resource_limit() const { return optionTable.find(o_sat_resource_limit) != optionTable.end() ? - optionTable.at(o_sat_resource_limit)->getValue().getDoubleVal() : -1; } + optionTable.at(o_sat_resource_limit).getValue().getDoubleVal() : -1; } std::string dump_state() const { if (optionTable.find(o_dump_state) != optionTable.end()) { - return append_output_dir(optionTable.at(o_dump_state)->getValue().strval); + return append_output_dir(optionTable.at(o_dump_state).getValue().strval); } else { std::string name = getInstanceName(); return name.substr(0, name.size() - strlen(".smt2")); } } std::string output_dir() const { - return optionTable.find(o_output_dir) != optionTable.end() ? optionTable.at(o_output_dir)->getValue().strval : ""; + return optionTable.find(o_output_dir) != optionTable.end() ? optionTable.at(o_output_dir).getValue().strval : ""; } int dump_only() const - { return optionTable.find(o_dump_only) != optionTable.end() ? optionTable.at(o_dump_only)->getValue().numval : 0; } + { return optionTable.find(o_dump_only) != optionTable.end() ? optionTable.at(o_dump_only).getValue().numval : 0; } bool dump_query() const - { return optionTable.find(o_dump_query) != optionTable.end() ? optionTable.at(o_dump_query)->getValue().numval : 0; } + { return optionTable.find(o_dump_query) != optionTable.end() ? optionTable.at(o_dump_query).getValue().numval : 0; } - void set_dump_query_name(const char* dump_query_name) + void set_dump_query_name(std::string && dump_query_name) { if (optionTable.find(o_dump_query_name) != optionTable.end()) { - delete optionTable[o_dump_query_name]; - optionTable[o_dump_query_name] = new SMTOption(strdup(dump_query_name)); + optionTable.insert({o_dump_query_name, SMTOption(std::move(dump_query_name))}); } else - insertOption(o_dump_query_name, new SMTOption(strdup(dump_query_name))); + insertOption(o_dump_query_name, SMTOption(std::move(dump_query_name))); } std::string dump_query_name() const { - return optionTable.find(o_dump_query_name) != optionTable.end() ? append_output_dir(optionTable.at(o_dump_query_name)->getValue().strval) : ""; + return optionTable.find(o_dump_query_name) != optionTable.end() ? append_output_dir(optionTable.at(o_dump_query_name).getValue().strval) : ""; } int sat_dump_learnts() const { return optionTable.find(o_sat_dump_learnts) != optionTable.end() ? - optionTable.at(o_sat_dump_learnts)->getValue().numval : 0; } + optionTable.at(o_sat_dump_learnts).getValue().numval : 0; } bool sat_split_test_cube_and_conquer() const { return optionTable.find(o_sat_split_test_cube_and_conquer) != optionTable.end() ? - optionTable.at(o_sat_split_test_cube_and_conquer)->getValue().numval : 0; } + optionTable.at(o_sat_split_test_cube_and_conquer).getValue().numval : 0; } SpType sat_split_type() const { if (sat_lookahead_split()) { @@ -624,7 +625,7 @@ struct SMTConfig SpUnit sat_split_units() const { if (optionTable.find(o_sat_split_units) != optionTable.end()) { - std::string type = optionTable.at(o_sat_split_units)->getValue().strval; + std::string type = optionTable.at(o_sat_split_units).getValue().strval; if (type == spts_search_counter) { return SpUnit::search_counter; } else if (type == spts_time) { @@ -636,64 +637,64 @@ struct SMTConfig double sat_split_inittune() const { return optionTable.find(o_sat_split_inittune) != optionTable.end() ? - optionTable.at(o_sat_split_inittune)->getValue().getDoubleVal() : + optionTable.at(o_sat_split_inittune).getValue().getDoubleVal() : -1; } double sat_split_midtune() const { return optionTable.find(o_sat_split_midtune) != optionTable.end() ? - optionTable.at(o_sat_split_midtune)->getValue().getDoubleVal() : + optionTable.at(o_sat_split_midtune).getValue().getDoubleVal() : -1; } int sat_split_num() const { return optionTable.find(o_sat_split_num) != optionTable.end() ? - optionTable.at(o_sat_split_num)->getValue().numval : + optionTable.at(o_sat_split_num).getValue().numval : 2; } int sat_split_fixvars() const { return optionTable.find(o_sat_split_fix_vars) != optionTable.end() ? - optionTable.at(o_sat_split_fix_vars)->getValue().numval : + optionTable.at(o_sat_split_fix_vars).getValue().numval : -1; } int sat_split_asap() const { return optionTable.find(o_sat_split_asap) != optionTable.end() ? - optionTable.at(o_sat_split_asap)->getValue().numval : + optionTable.at(o_sat_split_asap).getValue().numval : 0; } int sat_lookahead_split() const { return optionTable.find(o_sat_lookahead_split) != optionTable.end() ? - optionTable.at(o_sat_lookahead_split)->getValue().numval : + optionTable.at(o_sat_lookahead_split).getValue().numval : 0; } int sat_scatter_split() const { return optionTable.find(o_sat_scatter_split) != optionTable.end() ? - optionTable.at(o_sat_scatter_split)->getValue().numval : + optionTable.at(o_sat_scatter_split).getValue().numval : 0; } int sat_pure_lookahead() const { return optionTable.find(o_sat_pure_lookahead) != optionTable.end() ? - optionTable.at(o_sat_pure_lookahead)->getValue().numval : + optionTable.at(o_sat_pure_lookahead).getValue().numval : 0; } int lookahead_score_deep() const { return optionTable.find(o_lookahead_score_deep) != optionTable.end() ? - optionTable.at(o_lookahead_score_deep)->getValue().numval : + optionTable.at(o_lookahead_score_deep).getValue().numval : 0; } int randomize_lookahead() const { return optionTable.find(o_sat_split_randomize_lookahead) != optionTable.end() ? - optionTable.at(o_sat_split_randomize_lookahead)->getValue().numval : + optionTable.at(o_sat_split_randomize_lookahead).getValue().numval : 0; } int randomize_lookahead_bufsz() const { return optionTable.find(o_sat_split_randomize_lookahead_buf) != optionTable.end() ? - optionTable.at(o_sat_split_randomize_lookahead_buf)->getValue().numval : + optionTable.at(o_sat_split_randomize_lookahead_buf).getValue().numval : 1; } int remove_symmetries() const { return optionTable.find(o_sat_remove_symmetries) != optionTable.end() ? - optionTable.at(o_sat_remove_symmetries)->getValue().numval : 0; } + optionTable.at(o_sat_remove_symmetries).getValue().numval : 0; } int dryrun() const { return optionTable.find(o_dryrun) != optionTable.end() ? - optionTable.at(o_dryrun)->getValue().numval : 0; } + optionTable.at(o_dryrun).getValue().numval : 0; } void set_dryrun(bool b) - { insertOption(o_dryrun, new SMTOption(b)); } + { insertOption(o_dryrun, SMTOption(b)); } SpPref sat_split_preference() const { if (optionTable.find(o_sat_split_preference) != optionTable.end()) { - std::string type = optionTable.at(o_sat_split_preference)->getValue().strval; + std::string type = optionTable.at(o_sat_split_preference).getValue().strval; if (type == spprefs_tterm) return sppref_tterm; if (type == spprefs_blind) return sppref_blind; if (type == spprefs_bterm) return sppref_bterm; @@ -707,14 +708,14 @@ struct SMTConfig bool use_ghost_vars() const { if (optionTable.find(o_ghost_vars) != optionTable.end()) { - return optionTable.at(o_ghost_vars)->getValue().numval != 0; + return optionTable.at(o_ghost_vars).getValue().numval != 0; } return false; } int do_substitutions() const { return optionTable.find(o_do_substitutions) != optionTable.end()? - optionTable.at(o_do_substitutions)->getValue().numval : 1; } + optionTable.at(o_do_substitutions).getValue().numval : 1; } bool use_theory_polarity_suggestion() const @@ -722,11 +723,11 @@ struct SMTConfig int sat_solver_limit() const { return optionTable.find(o_sat_solver_limit) != optionTable.end() ? - optionTable.at(o_sat_solver_limit)->getValue().numval : 0; } + optionTable.at(o_sat_solver_limit).getValue().numval : 0; } bool sat_split_mode() const { if (optionTable.find(o_sat_split_mode) != optionTable.end()) { - return optionTable.at(o_sat_split_mode)->getValue().numval != 0; + return optionTable.at(o_sat_split_mode).getValue().numval != 0; } return false; } @@ -748,11 +749,11 @@ struct SMTConfig optionTable[o_verbosity]->getValue().numval : 2; } #else { return optionTable.find(o_verbosity) != optionTable.end() ? - optionTable.at(o_verbosity)->getValue().numval : 0; } + optionTable.at(o_verbosity).getValue().numval : 0; } #endif int printSuccess() const { return optionTable.find(":print-success") != optionTable.end() ? - optionTable.at(":print-success")->getValue().numval == 1: false; } + optionTable.at(":print-success").getValue().numval == 1: false; } int certification_level; // Level of certification char certifying_solver[256]; // Executable used for certification diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 0bd108f4d..7aae37260 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -37,22 +37,22 @@ class Smt2newContext { char* buffer; int buffer_sz; int buffer_cap; - ASTNode* root; + std::unique_ptr root; public: void* scanner; int result; FILE* is; char* ib; bool interactive; - inline const ASTNode* getRoot() { return root; }; + inline ASTNode const & getRoot() { return *root; }; Smt2newContext(FILE* in) : buffer_sz(0) , buffer_cap(1) - , root(NULL) + , root(nullptr) , result(0) , is(in) - , ib(NULL) + , ib(nullptr) , interactive(false) { init_scanner(); @@ -62,9 +62,9 @@ class Smt2newContext { Smt2newContext(char* in_s) : buffer_sz(0) , buffer_cap(1) - , root(NULL) + , root(nullptr) , result(0) - , is(NULL) + , is(nullptr) , ib(in_s) , interactive(true) { @@ -74,7 +74,6 @@ class Smt2newContext { ~Smt2newContext() { destroy_scanner(); - delete root; free(buffer); } @@ -95,8 +94,8 @@ class Smt2newContext { buffer_sz = 0; } - void insertRoot(ASTNode* n) { - root = n; + void insertRoot(std::unique_ptr n) { + root = std::move(n); } void prettyPrint(std::ostream& o) { diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 77600336f..25205ed39 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -26,7 +26,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. %define api.pure %define parse.error verbose -%name-prefix "smt2new" +%define api.prefix {smt2new} %locations %defines %parse-param { Smt2newContext* context } @@ -37,14 +37,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include #include -#include #include "smt2newcontext.h" #include "smt2newparser.hh" #include "smt2tokens.h" +using ASTNode_up = std::unique_ptr; +using ASTVec = std::vector; +using ASTVec_up = std::unique_ptr; +using string_up = std::unique_ptr; + +std::unique_ptr mkUniqueStr(std::string const & s) { return std::make_unique(s); } + int smt2newlex(YYSTYPE* lvalp, YYLTYPE* llocp, void* scanner); void smt2newerror( YYLTYPE* locp, Smt2newContext* context, const char * s ) @@ -66,11 +71,11 @@ void smt2newerror( YYLTYPE* locp, Smt2newContext* context, const char * s ) { std::string * str; ASTNode * snode; - std::vector * snode_list; + std::vector> * snode_list; osmttokens::smt2token tok; } -%destructor { free($$); } +%destructor { delete $$; } %destructor { delete $$; } %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING @@ -91,81 +96,100 @@ void smt2newerror( YYLTYPE* locp, Smt2newContext* context, const char * s ) %% -script: command_list { ASTNode *n = new ASTNode(ASTType::CMDL_T, {osmttokens::t_none}, "main-script", std::move(*$1)); context->insertRoot(n); }; +script: command_list { context->insertRoot(std::make_unique(ASTType::CMDL_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr("main-script"), ASTVec_up($1))); }; symbol: TK_SYM - { $$ = new ASTNode(ASTType::SYM_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::SYM_T, {osmttokens::t_none}, string_up($1)); } | TK_QSYM - { $$ = new ASTNode(ASTType::QSYM_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::QSYM_T, {osmttokens::t_none}, string_up($1)); } ; command_list: - { $$ = new std::vector(); } + { $$ = new ASTVec(); } | command_list command - { (*$1).push_back(std::move(*$2)); $$ = $1; } + { (*$1).emplace_back(ASTNode_up($2)); $$ = $1; } ; command: '(' TK_SETLOGIC symbol ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::CMD_T, $2, mkUniqueStr(""), std::move(tmp)); } | '(' TK_SETOPTION option ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::CMD_T, $2, mkUniqueStr(""), std::move(tmp)); } | '(' TK_SETINFO attribute ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::CMD_T, $2, mkUniqueStr(""), std::move(tmp)); } | '(' TK_DECLARESORT symbol TK_NUM ')' { + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($4))); $$ = new ASTNode(ASTType::CMD_T, $2, - "", - std::vector{std::move(*$3), - ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$4))}); + mkUniqueStr(""), + std::move(tmp)); } | '(' TK_DEFINESORT symbol '(' symbol_list ')' sort ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", - std::vector{ - std::move(*$3), - ASTNode(ASTType::SYML_T, {osmttokens::t_none}, "", std::move(*$5)), - std::move(*$7)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + tmp->push_back(std::make_unique(ASTType::SYML_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr(""), ASTVec_up($5))); + tmp->push_back(ASTNode_up($7)); + $$ = new ASTNode(ASTType::CMD_T, $2, mkUniqueStr(""), std::move(tmp)); } | '(' TK_DECLAREFUN symbol '(' sort_list ')' sort ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", - std::vector{std::move(*$3), - ASTNode(ASTType::SORTL_T, {osmttokens::t_none}, "", std::move(*$5)), - std::move(*$7)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + tmp->push_back(std::make_unique(ASTType::SORTL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($5))); + tmp->push_back(ASTNode_up($7)); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_DECLARECONST const_val sort ')' { // todo: drop the second child? - $$ = new ASTNode(ASTType::CMD_T, $2, "", - std::vector{std::move(*$3), ASTNode(ASTType::SORTL_T), std::move(*$4)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + tmp->push_back(std::make_unique(ASTType::SORTL_T)); + tmp->push_back(ASTNode_up($4)); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_DEFINEFUN symbol '(' sorted_var_list ')' sort term ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", - std::vector{std::move(*$3), - ASTNode(ASTType::SVL_T, {osmttokens::t_none}, "", std::move(*$5)), - std::move(*$7), - std::move(*$8)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + tmp->push_back(std::make_unique(ASTType::SVL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($5))); + tmp->push_back(ASTNode_up($7)); + tmp->push_back(ASTNode_up($8)); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_PUSH TK_NUM ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$3))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_POP TK_NUM ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$3))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_ASSERT term ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_CHECKSAT ')' { @@ -181,23 +205,26 @@ command: '(' TK_SETLOGIC symbol ')' } | '(' TK_GETITPS term_list ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::move(*$3)); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, ASTVec_up($3)); } | '(' TK_WRSTATE TK_STR ')' { - // todo: consider inserting the TK_STR to the string? // todo: TK_{WR,RD}STATE and TK_WRFUNS is not implemented and is not part of the standard - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_RDSTATE TK_STR ')' { - // todo: consider inserting the TK_STR to the string? - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_WRFUNS TK_STR ')' { - // todo: consider inserting the TK_STR to the string? - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_GETUNSATCORE ')' { @@ -205,8 +232,9 @@ command: '(' TK_SETLOGIC symbol ')' } | '(' TK_GETVALUE '(' term term_list ')' ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$5)}); - $$->children.insert($$->children.begin(), std::move(*$4)); + // todo: insert first $4 and then extend with $5? + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, ASTVec_up($5)); + $$->children->insert($$->children->begin(), ASTNode_up($4)); } | '(' TK_GETMODEL ')' { @@ -218,15 +246,21 @@ command: '(' TK_SETLOGIC symbol ')' } | '(' TK_GETOPTION TK_KEY ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_GETOPTION predef_key ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::PATTR_T, {osmttokens::t_none}, std::move(*$3))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::PATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_GETINFO info_flag ')' { - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{std::move(*$3)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } | '(' TK_SIMPLIFY ')' { @@ -237,35 +271,48 @@ command: '(' TK_SETLOGIC symbol ')' | '(' TK_ECHO TK_STR ')' { // todo: consider using ASTNode's string instead of vector - $$ = new ASTNode(ASTType::CMD_T, $2, "", std::vector{ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$3))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); + $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); } ; attribute_list: - { $$ = new std::vector(); } + { $$ = new ASTVec{}; } | attribute_list attribute - { $1->push_back(std::move(*$2)); $$ = $1; } + { $1->emplace_back(ASTNode_up($2)); $$ = $1; } ; attribute: TK_KEY - { $$ = new ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | TK_KEY attribute_value - { $$ = new ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } + { + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); + } | predef_key - { $$ = new ASTNode(ASTType::PATTR_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::PATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | predef_key attribute_value - { $$ = new ASTNode(ASTType::PATTR_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); } + { + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::PATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); + } ; attribute_value: spec_const - { $$ = new ASTNode(ASTType::SPECC_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); } + { + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($1)); + $$ = new ASTNode(ASTType::SPECC_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } | symbol { $$ = $1; } | '(' s_expr_list ')' { - $$ = new ASTNode(ASTType::SEXPRL_T, {osmttokens::t_none}, "", std::vector{std::move(*$2)}); + $$ = new ASTNode(ASTType::SEXPRL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($2)); } ; @@ -274,9 +321,7 @@ identifier: symbol | '(' '_' symbol numeral_list ')' { $$ = $3; - for (auto & el : *$4) { - $$->children.emplace_back(std::move(el)); - } + $$->children = ASTVec_up($4); } ; @@ -284,22 +329,28 @@ sort: identifier { $$ = $1; } | '(' identifier sort sort_list ')' { - $$ = new ASTNode(ASTType::LID_T, {osmttokens::t_none}, "", std::vector{std::move(*$2), std::move(*$3)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::LID_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); for (auto & c : *$4) { - $$->children.push_back(std::move(c)); + $$->children->push_back(std::move(c)); } + delete $4; } ; sort_list: sort_list sort - { $1->push_back(std::move(*$2)); $$ = $1; } + { $1->emplace_back(ASTNode_up($2)); $$ = $1; } | - { $$ = new std::vector(); } + { $$ = new ASTVec(); } ; s_expr: spec_const { - $$ = new ASTNode(ASTType::SPECC_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($1)); + $$ = new ASTNode(ASTType::SPECC_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } | symbol { @@ -307,36 +358,36 @@ s_expr: spec_const } | TK_KEY { - $$ = new ASTNode(ASTType::UATTR_T, {osmttokens::t_none}, std::move(*$1)); + $$ = new ASTNode(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | '(' s_expr_list ')' { - $$ = new ASTNode(ASTType::SEXPRL_T, {osmttokens::t_none}, "", std::move(*$2)); + $$ = new ASTNode(ASTType::SEXPRL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($2)); } ; s_expr_list: { - $$ = new std::vector(); + $$ = new ASTVec(); } | s_expr_list s_expr { - $1->push_back(std::move(*$2)); + $1->emplace_back(ASTNode_up($2)); $$ = $1; } ; spec_const: TK_NUM - { $$ = new ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | TK_DEC - { $$ = new ASTNode(ASTType::DEC_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::DEC_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | TK_HEX - { $$ = new ASTNode(ASTType::HEX_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::HEX_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | TK_BIN - { $$ = new ASTNode(ASTType::BIN_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::BIN_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | TK_STR - { $$ = new ASTNode(ASTType::STR_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::STR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } ; const_val: symbol @@ -346,87 +397,124 @@ const_val: symbol ; numeral_list: numeral_list TK_NUM - { $1->push_back(ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$2))); $$ = $1; } + { $1->emplace_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); $$ = $1; } | TK_NUM - { $$ = new std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$1))}; } + { $$ = new ASTVec(); $$->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1))); } ; qual_identifier: identifier { $$ = $1; } | '(' TK_AS identifier sort ')' { - $$ = new ASTNode(ASTType::AS_T, {osmttokens::t_none}, "", std::vector{std::move(*$3), std::move(*$4)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + tmp->push_back(ASTNode_up($4)); + $$ = new ASTNode(ASTType::AS_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } ; var_binding_list: var_binding - { $$ = new std::vector{std::move(*$1)}; } + { $$ = new ASTVec(); $$->push_back(ASTNode_up($1)); } | var_binding_list var_binding - { $1->push_back(std::move(*$2)); $$ = $1; } + { $1->emplace_back(ASTNode_up($2)); $$ = $1; } ; var_binding: '(' symbol term ')' - { $$ = new ASTNode(ASTType::VARB_T, {osmttokens::t_none}, std::string($2->getValue()), std::vector{std::move(*$3)}); } + { + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::VARB_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr($2->getValue()), std::move(tmp)); + delete $2; + } ; sorted_var_list: - { $$ = new std::vector(); } + { $$ = new ASTVec(); } | sorted_var_list sorted_var - { $1->push_back(std::move(*$2)); $$ = $1; } + { $1->emplace_back(ASTNode_up($2)); $$ = $1; } ; sorted_var: '(' symbol sort ')' - { $$ = new ASTNode(ASTType::SV_T, {osmttokens::t_none}, std::string($2->getValue()), std::vector{std::move(*$3)}); } + { + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::SV_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr($2->getValue()), std::move(tmp)); + delete $2; + } term_list: - { $$ = new std::vector(); } + { $$ = new ASTVec(); } | term_list term - { $1->push_back(std::move(*$2)); $$ = $1; } + { $1->emplace_back(ASTNode_up($2)); $$ = $1; } ; term: spec_const - { $$ = new ASTNode(ASTType::TERM_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); } + { + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($1)); + $$ = new ASTNode(ASTType::TERM_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); + } | qual_identifier - { $$ = new ASTNode(ASTType::QID_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); } + { + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($1)); + $$ = new ASTNode(ASTType::QID_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); + } | '(' qual_identifier term term_list ')' { - $$ = new ASTNode(ASTType::LQID_T, {osmttokens::t_none}, "", std::vector{std::move(*$2), std::move(*$3)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + tmp->push_back(ASTNode_up($3)); + $$ = new ASTNode(ASTType::LQID_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); for (auto & c : (*$4)) { - $$->children.push_back(std::move(c)); + $$->children->emplace_back(std::move(c)); } + delete $4; } | '(' TK_LET '(' var_binding_list ')' term ')' { - $$ = new ASTNode(ASTType::LET_T, {osmttokens::t_none}, "", {ASTNode(ASTType::VARBL_T, {osmttokens::t_none}, "", std::move(*$4)), std::move(*$6)}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::VARBL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($4))); + tmp->push_back(ASTNode_up($6)); + $$ = new ASTNode(ASTType::LET_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } | '(' TK_FORALL '(' sorted_var_list ')' term ')' { // todo: AST traversal must ensure that sorted_var_list is non-empty - $$ = new ASTNode(ASTType::FORALL_T, {osmttokens::t_none}, "", {ASTNode(ASTType::SVL_T, {osmttokens::t_none}, "", std::move(*$4)), std::move(*$6)}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::SVL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($4))); + tmp->push_back(ASTNode_up($6)); + $$ = new ASTNode(ASTType::FORALL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } | '(' TK_EXISTS '(' sorted_var_list ')' term ')' { // todo: AST traversal must ensure that sorted_var_list is non-empty - $$ = new ASTNode(ASTType::EXISTS_T, {osmttokens::t_none}, "", {ASTNode(ASTType::SVL_T, {osmttokens::t_none}, "", std::move(*$4)), std::move(*$6)}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::SVL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($4))); + tmp->push_back(ASTNode_up($6)); + $$ = new ASTNode(ASTType::EXISTS_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } | '(' '!' term attribute_list ')' { // todo: AST traversal must ensure that attribute_list is non-empty - $$ = new ASTNode(ASTType::BANG_T, {osmttokens::t_none}, "", {std::move(*$3), ASTNode(ASTType::GATTRL_T, {osmttokens::t_none}, "", std::move(*$4))}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($3)); + tmp->push_back(std::make_unique(ASTType::GATTRL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($4))); + $$ = new ASTNode(ASTType::BANG_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } ; symbol_list: - { $$ = new std::vector(); } + { $$ = new ASTVec(); } | symbol_list symbol - { $1->push_back(*$2); $$ = $1; } + { $1->emplace_back(ASTNode_up($2)); $$ = $1; } ; b_value: symbol { std::string const & str = $1->getValue(); if (str == "true" or str == "false") { - $$ = new ASTNode(ASTType::BOOL_T, {osmttokens::t_none}, std::string(str)); delete $1; + $$ = new ASTNode(ASTType::BOOL_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr(str)); delete $1; } else { printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", str.c_str()); @@ -438,51 +526,75 @@ b_value: symbol option: KW_PRINTSUCCESS b_value { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_EXPANDDEFINITIONS b_value { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_INTERACTIVEMODE b_value { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_PRODUCEPROOFS b_value { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_PRODUCEUNSATCORES b_value { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_PRODUCEMODELS b_value { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_PRODUCEASSIGNMENTS b_value { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{std::move(*$2)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($2)); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_REGULAROUTPUTCHANNEL TK_STR { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{ASTNode(ASTType::STR_T, {osmttokens::t_none}, std::move(*$2))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::STR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_DIAGNOSTICOUTPUTCHANNEL TK_STR { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{ASTNode(ASTType::STR_T, {osmttokens::t_none}, std::move(*$2))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::STR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_RANDOMSEED TK_NUM { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$2))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | KW_VERBOSITY TK_NUM { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, std::move(*$1), std::vector{ASTNode(ASTType::NUM_T, {osmttokens::t_none}, std::move(*$2))}); + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); } | attribute { - $$ = new ASTNode(ASTType::OPTION_T, {osmttokens::t_none}, "", std::vector{std::move(*$1)}); + auto tmp = std::make_unique(); + tmp->push_back(ASTNode_up($1)); + $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } ; @@ -545,21 +657,25 @@ predef_key: KW_SORTS ; info_flag: KW_ERRORBEHAVIOR - { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | KW_NAME - { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | KW_AUTHORS - { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | KW_VERSION - { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | KW_STATUS - { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | KW_REASONUNKNOWN - { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | KW_ALLSTATISTICS - { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, std::move(*$1)); } + { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } | TK_KEY - { $$ = new ASTNode(ASTType::INFO_T, {osmttokens::t_none}, "", std::vector{ASTNode(ASTType::GATTR_T, {osmttokens::t_none}, std::move(*$1))}); } + { + auto tmp = std::make_unique(); + tmp->push_back(std::make_unique(ASTType::GATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1))); + $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); + } ; %% diff --git a/test/unit/test_LIAInterpolation.cc b/test/unit/test_LIAInterpolation.cc index f78b57085..460da76cb 100644 --- a/test/unit/test_LIAInterpolation.cc +++ b/test/unit/test_LIAInterpolation.cc @@ -189,12 +189,12 @@ TEST_F(LIAInterpolationTest, test_Split_ABShared) { std::cout << logic.pp(interpolants[0]) << std::endl; EXPECT_TRUE(verifyInterpolant(partA, partB, interpolants[0])); interpolants.clear(); - config.setBooleanInterpolationAlgorithm(itp_alg_pudlak); + config.setBooleanInterpolationAlgorithm(ItpAlgorithm::itp_alg_pudlak); itpCtx->getSingleInterpolant(interpolants, mask); std::cout << logic.pp(interpolants[0]) << std::endl; EXPECT_TRUE(verifyInterpolant(partA, partB, interpolants[0])); interpolants.clear(); - config.setBooleanInterpolationAlgorithm(itp_alg_mcmillanp); + config.setBooleanInterpolationAlgorithm(ItpAlgorithm::itp_alg_mcmillanp); itpCtx->getSingleInterpolant(interpolants, mask); std::cout << logic.pp(interpolants[0]) << std::endl; EXPECT_TRUE(verifyInterpolant(partA, partB, interpolants[0])); diff --git a/test/unit/test_ResolutionProofInterpolation.cc b/test/unit/test_ResolutionProofInterpolation.cc index 5f8bf2c44..dffa3cb5b 100644 --- a/test/unit/test_ResolutionProofInterpolation.cc +++ b/test/unit/test_ResolutionProofInterpolation.cc @@ -46,7 +46,7 @@ class ResolutionProofInterpolationTest : public ::testing::Test { }; TEST_F(ResolutionProofInterpolationTest, test_McMillanInterpolant) { - config.setBooleanInterpolationAlgorithm(itp_alg_mcmillan); + config.setBooleanInterpolationAlgorithm(ItpAlgorithm::itp_alg_mcmillan); auto itpContext = solver->getInterpolationContext(); vec itps; ipartitions_t A_mask = 1; @@ -57,7 +57,7 @@ TEST_F(ResolutionProofInterpolationTest, test_McMillanInterpolant) { } TEST_F(ResolutionProofInterpolationTest, test_PudlakInterpolant) { - config.setBooleanInterpolationAlgorithm(itp_alg_pudlak); + config.setBooleanInterpolationAlgorithm(ItpAlgorithm::itp_alg_pudlak); auto itpContext = solver->getInterpolationContext(); vec itps; ipartitions_t A_mask = 1; @@ -68,7 +68,7 @@ TEST_F(ResolutionProofInterpolationTest, test_PudlakInterpolant) { } TEST_F(ResolutionProofInterpolationTest, test_McMillanPrimeInterpolant) { - config.setBooleanInterpolationAlgorithm(itp_alg_mcmillanp); + config.setBooleanInterpolationAlgorithm(ItpAlgorithm::itp_alg_mcmillanp); auto itpContext = solver->getInterpolationContext(); vec itps; ipartitions_t A_mask = 1; @@ -118,7 +118,7 @@ class ResolutionProofInterpolationTestWithReduction : public ::testing::Test { }; TEST_F(ResolutionProofInterpolationTestWithReduction, test_InterpolationAfterReduction) { - config.setBooleanInterpolationAlgorithm(itp_alg_mcmillan); + config.setBooleanInterpolationAlgorithm(ItpAlgorithm::itp_alg_mcmillan); config.setReduction(1); auto itpContext = solver->getInterpolationContext(); vec itps; @@ -166,7 +166,7 @@ class ResolutionProofIncrementalInterpolationTest : public ::testing::Test { }; TEST_F(ResolutionProofIncrementalInterpolationTest, test_McMillanInterpolant) { - config.setBooleanInterpolationAlgorithm(itp_alg_mcmillan); + config.setBooleanInterpolationAlgorithm(ItpAlgorithm::itp_alg_mcmillan); auto itpContext = solver->getInterpolationContext(); vec itps; ipartitions_t A_mask = 1; diff --git a/test/unit/test_UFInterpolation.cc b/test/unit/test_UFInterpolation.cc index 0e7be4c02..6c6e186d1 100644 --- a/test/unit/test_UFInterpolation.cc +++ b/test/unit/test_UFInterpolation.cc @@ -165,7 +165,7 @@ TEST_F(UFInterpolationTest, test_NotImmediatelyColorableCGraph){ itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); // change the interpolation algorithm - config.setEUFInterpolationAlgorithm(itp_euf_alg_weak); + config.setEUFInterpolationAlgorithm(ItpAlgorithm::itp_euf_alg_weak); interpolants.clear(); itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); @@ -194,7 +194,7 @@ TEST_F(UFInterpolationTest, test_NotImmediatelyColorableCGraphReversed){ itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); // change the interpolation algorithm - config.setEUFInterpolationAlgorithm(itp_euf_alg_weak); + config.setEUFInterpolationAlgorithm(ItpAlgorithm::itp_euf_alg_weak); interpolants.clear(); itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); @@ -233,7 +233,7 @@ TEST_F(UFInterpolationTest, test_JustificationRequired){ itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); // change the interpolation algorithm - config.setEUFInterpolationAlgorithm(itp_euf_alg_weak); + config.setEUFInterpolationAlgorithm(ItpAlgorithm::itp_euf_alg_weak); interpolants.clear(); itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); @@ -273,7 +273,7 @@ TEST_F(UFInterpolationTest, test_JustificationRequiredReversed){ itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); // change the interpolation algorithm - config.setEUFInterpolationAlgorithm(itp_euf_alg_weak); + config.setEUFInterpolationAlgorithm(ItpAlgorithm::itp_euf_alg_weak); interpolants.clear(); itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); @@ -351,7 +351,7 @@ TEST_F(UFInterpolationTest, test_TwoLevelJustification){ itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); // change the interpolation algorithm - config.setEUFInterpolationAlgorithm(itp_euf_alg_weak); + config.setEUFInterpolationAlgorithm(ItpAlgorithm::itp_euf_alg_weak); interpolants.clear(); itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); @@ -383,7 +383,7 @@ TEST_F(UFInterpolationTest, test_TwoLevelJustificationDiseqInB){ itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); // change the interpolation algorithm - config.setEUFInterpolationAlgorithm(itp_euf_alg_weak); + config.setEUFInterpolationAlgorithm(ItpAlgorithm::itp_euf_alg_weak); interpolants.clear(); itpCtx->getSingleInterpolant(interpolants, mask); EXPECT_TRUE(verifyInterpolant(interpolants[0], solver.getPartitionManager(), mask)); From 99354628dafe1407c9e0516ae4315b7fdbe8df20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 28 Jul 2022 15:16:14 +0200 Subject: [PATCH 03/76] parser: Remove unused generated files --- src/parsers/smt2new/parsetest | Bin 281772 -> 0 bytes src/parsers/smt2new/parsetest.cc | 57 - src/parsers/smt2new/smt2newlexer.cc | 3166 -------------------------- src/parsers/smt2new/smt2newparser.cc | 2887 ----------------------- src/parsers/smt2new/smt2newparser.hh | 160 -- 5 files changed, 6270 deletions(-) delete mode 100755 src/parsers/smt2new/parsetest delete mode 100644 src/parsers/smt2new/parsetest.cc delete mode 100644 src/parsers/smt2new/smt2newlexer.cc delete mode 100644 src/parsers/smt2new/smt2newparser.cc delete mode 100644 src/parsers/smt2new/smt2newparser.hh diff --git a/src/parsers/smt2new/parsetest b/src/parsers/smt2new/parsetest deleted file mode 100755 index e5c150596c59c500a8316e43a6a58f5144f881b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281772 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

1g9QgswV3*9ml@ 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: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⪚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 pyQ-3Zt!bMA^z&}u5KiPblET({|At729f{( diff --git a/src/parsers/smt2new/parsetest.cc b/src/parsers/smt2new/parsetest.cc deleted file mode 100644 index c7142f821..000000000 --- a/src/parsers/smt2new/parsetest.cc +++ /dev/null @@ -1,57 +0,0 @@ -/********************************************************************* -Author: Antti Hyvarinen - -OpenSMT2 -- Copyright (C) 2012 - 2014 Antti Hyvarinen - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*********************************************************************/ - - -#include -#include -#include -#include - -#include "smt2newcontext.h" - -extern void smt2newset_in ( FILE * ); -extern void smt2newparse ( ); - -int main(int argc, char ** argv) -{ - if (argc > 1 && strcmp(argv[1], "--help") == 0) { - printf("Usage: %s [file]\n", argv[0]); return 1; } - - FILE* in; - if (argc == 2) { - if ((in = fopen(argv[1], "r")) == 0) { - perror("Error opening file"); return 1; } - } - else - in = fopen("/dev/stdin", "r"); - - Smt2newContext context(in); - int rval = smt2newparse(&context); - printf("Parser returned with result %d and ret val %d\n", context.result, rval); - if (rval == 0) - context.prettyPrint(std::cout); - fclose(in); - return rval; -} diff --git a/src/parsers/smt2new/smt2newlexer.cc b/src/parsers/smt2new/smt2newlexer.cc deleted file mode 100644 index c3dc11387..000000000 --- a/src/parsers/smt2new/smt2newlexer.cc +++ /dev/null @@ -1,3166 +0,0 @@ -#line 1 "smt2new/smt2newlexer.cc" - -#line 3 "smt2new/smt2newlexer.cc" - -#define YY_INT_ALIGNED short int - -/* A lexical scanner generated by flex */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 6 -#define YY_FLEX_SUBMINOR_VERSION 4 -#if YY_FLEX_SUBMINOR_VERSION > 0 -#define FLEX_BETA -#endif - -#ifdef yy_create_buffer -#define smt2new_create_buffer_ALREADY_DEFINED -#else -#define yy_create_buffer smt2new_create_buffer -#endif - -#ifdef yy_delete_buffer -#define smt2new_delete_buffer_ALREADY_DEFINED -#else -#define yy_delete_buffer smt2new_delete_buffer -#endif - -#ifdef yy_scan_buffer -#define smt2new_scan_buffer_ALREADY_DEFINED -#else -#define yy_scan_buffer smt2new_scan_buffer -#endif - -#ifdef yy_scan_string -#define smt2new_scan_string_ALREADY_DEFINED -#else -#define yy_scan_string smt2new_scan_string -#endif - -#ifdef yy_scan_bytes -#define smt2new_scan_bytes_ALREADY_DEFINED -#else -#define yy_scan_bytes smt2new_scan_bytes -#endif - -#ifdef yy_init_buffer -#define smt2new_init_buffer_ALREADY_DEFINED -#else -#define yy_init_buffer smt2new_init_buffer -#endif - -#ifdef yy_flush_buffer -#define smt2new_flush_buffer_ALREADY_DEFINED -#else -#define yy_flush_buffer smt2new_flush_buffer -#endif - -#ifdef yy_load_buffer_state -#define smt2new_load_buffer_state_ALREADY_DEFINED -#else -#define yy_load_buffer_state smt2new_load_buffer_state -#endif - -#ifdef yy_switch_to_buffer -#define smt2new_switch_to_buffer_ALREADY_DEFINED -#else -#define yy_switch_to_buffer smt2new_switch_to_buffer -#endif - -#ifdef yypush_buffer_state -#define smt2newpush_buffer_state_ALREADY_DEFINED -#else -#define yypush_buffer_state smt2newpush_buffer_state -#endif - -#ifdef yypop_buffer_state -#define smt2newpop_buffer_state_ALREADY_DEFINED -#else -#define yypop_buffer_state smt2newpop_buffer_state -#endif - -#ifdef yyensure_buffer_stack -#define smt2newensure_buffer_stack_ALREADY_DEFINED -#else -#define yyensure_buffer_stack smt2newensure_buffer_stack -#endif - -#ifdef yylex -#define smt2newlex_ALREADY_DEFINED -#else -#define yylex smt2newlex -#endif - -#ifdef yyrestart -#define smt2newrestart_ALREADY_DEFINED -#else -#define yyrestart smt2newrestart -#endif - -#ifdef yylex_init -#define smt2newlex_init_ALREADY_DEFINED -#else -#define yylex_init smt2newlex_init -#endif - -#ifdef yylex_init_extra -#define smt2newlex_init_extra_ALREADY_DEFINED -#else -#define yylex_init_extra smt2newlex_init_extra -#endif - -#ifdef yylex_destroy -#define smt2newlex_destroy_ALREADY_DEFINED -#else -#define yylex_destroy smt2newlex_destroy -#endif - -#ifdef yyget_debug -#define smt2newget_debug_ALREADY_DEFINED -#else -#define yyget_debug smt2newget_debug -#endif - -#ifdef yyset_debug -#define smt2newset_debug_ALREADY_DEFINED -#else -#define yyset_debug smt2newset_debug -#endif - -#ifdef yyget_extra -#define smt2newget_extra_ALREADY_DEFINED -#else -#define yyget_extra smt2newget_extra -#endif - -#ifdef yyset_extra -#define smt2newset_extra_ALREADY_DEFINED -#else -#define yyset_extra smt2newset_extra -#endif - -#ifdef yyget_in -#define smt2newget_in_ALREADY_DEFINED -#else -#define yyget_in smt2newget_in -#endif - -#ifdef yyset_in -#define smt2newset_in_ALREADY_DEFINED -#else -#define yyset_in smt2newset_in -#endif - -#ifdef yyget_out -#define smt2newget_out_ALREADY_DEFINED -#else -#define yyget_out smt2newget_out -#endif - -#ifdef yyset_out -#define smt2newset_out_ALREADY_DEFINED -#else -#define yyset_out smt2newset_out -#endif - -#ifdef yyget_leng -#define smt2newget_leng_ALREADY_DEFINED -#else -#define yyget_leng smt2newget_leng -#endif - -#ifdef yyget_text -#define smt2newget_text_ALREADY_DEFINED -#else -#define yyget_text smt2newget_text -#endif - -#ifdef yyget_lineno -#define smt2newget_lineno_ALREADY_DEFINED -#else -#define yyget_lineno smt2newget_lineno -#endif - -#ifdef yyset_lineno -#define smt2newset_lineno_ALREADY_DEFINED -#else -#define yyset_lineno smt2newset_lineno -#endif - -#ifdef yyget_column -#define smt2newget_column_ALREADY_DEFINED -#else -#define yyget_column smt2newget_column -#endif - -#ifdef yyset_column -#define smt2newset_column_ALREADY_DEFINED -#else -#define yyset_column smt2newset_column -#endif - -#ifdef yywrap -#define smt2newwrap_ALREADY_DEFINED -#else -#define yywrap smt2newwrap -#endif - -#ifdef yyget_lval -#define smt2newget_lval_ALREADY_DEFINED -#else -#define yyget_lval smt2newget_lval -#endif - -#ifdef yyset_lval -#define smt2newset_lval_ALREADY_DEFINED -#else -#define yyset_lval smt2newset_lval -#endif - -#ifdef yyget_lloc -#define smt2newget_lloc_ALREADY_DEFINED -#else -#define yyget_lloc smt2newget_lloc -#endif - -#ifdef yyset_lloc -#define smt2newset_lloc_ALREADY_DEFINED -#else -#define yyset_lloc smt2newset_lloc -#endif - -#ifdef yyalloc -#define smt2newalloc_ALREADY_DEFINED -#else -#define yyalloc smt2newalloc -#endif - -#ifdef yyrealloc -#define smt2newrealloc_ALREADY_DEFINED -#else -#define yyrealloc smt2newrealloc -#endif - -#ifdef yyfree -#define smt2newfree_ALREADY_DEFINED -#else -#define yyfree smt2newfree -#endif - -/* First, we deal with platform-specific or compiler-specific issues. */ - -/* begin standard C headers. */ -#include -#include -#include -#include - -/* end standard C headers. */ - -/* flex integer type definitions */ - -#ifndef FLEXINT_H -#define FLEXINT_H - -/* C99 systems have . Non-C99 systems may or may not. */ - -#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - -/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, - * if you want the limit (max/min) macros for int types. - */ -#ifndef __STDC_LIMIT_MACROS -#define __STDC_LIMIT_MACROS 1 -#endif - -#include -typedef int8_t flex_int8_t; -typedef uint8_t flex_uint8_t; -typedef int16_t flex_int16_t; -typedef uint16_t flex_uint16_t; -typedef int32_t flex_int32_t; -typedef uint32_t flex_uint32_t; -#else -typedef signed char flex_int8_t; -typedef short int flex_int16_t; -typedef int flex_int32_t; -typedef unsigned char flex_uint8_t; -typedef unsigned short int flex_uint16_t; -typedef unsigned int flex_uint32_t; - -/* Limits of integral types. */ -#ifndef INT8_MIN -#define INT8_MIN (-128) -#endif -#ifndef INT16_MIN -#define INT16_MIN (-32767-1) -#endif -#ifndef INT32_MIN -#define INT32_MIN (-2147483647-1) -#endif -#ifndef INT8_MAX -#define INT8_MAX (127) -#endif -#ifndef INT16_MAX -#define INT16_MAX (32767) -#endif -#ifndef INT32_MAX -#define INT32_MAX (2147483647) -#endif -#ifndef UINT8_MAX -#define UINT8_MAX (255U) -#endif -#ifndef UINT16_MAX -#define UINT16_MAX (65535U) -#endif -#ifndef UINT32_MAX -#define UINT32_MAX (4294967295U) -#endif - -#ifndef SIZE_MAX -#define SIZE_MAX (~(size_t)0) -#endif - -#endif /* ! C99 */ - -#endif /* ! FLEXINT_H */ - -/* begin standard C++ headers. */ - -/* TODO: this is always defined, so inline it */ -#define yyconst const - -#if defined(__GNUC__) && __GNUC__ >= 3 -#define yynoreturn __attribute__((__noreturn__)) -#else -#define yynoreturn -#endif - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an - * integer in range [0..255] for use as an array index. - */ -#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) - -/* An opaque pointer. */ -#ifndef YY_TYPEDEF_YY_SCANNER_T -#define YY_TYPEDEF_YY_SCANNER_T -typedef void* yyscan_t; -#endif - -/* For convenience, these vars (plus the bison vars far below) - are macros in the reentrant scanner. */ -#define yyin yyg->yyin_r -#define yyout yyg->yyout_r -#define yyextra yyg->yyextra_r -#define yyleng yyg->yyleng_r -#define yytext yyg->yytext_r -#define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno) -#define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column) -#define yy_flex_debug yyg->yy_flex_debug_r - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN yyg->yy_start = 1 + 2 * -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START ((yyg->yy_start - 1) / 2) -#define YYSTATE YY_START -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin , yyscanner ) -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else -#define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ -#endif - -/* The state buf must be large enough to hold one state per character in the main buffer. - */ -#define YY_STATE_BUF_SIZE ((YY_BUF_SIZE + 2) * sizeof(yy_state_type)) - -#ifndef YY_TYPEDEF_YY_BUFFER_STATE -#define YY_TYPEDEF_YY_BUFFER_STATE -typedef struct yy_buffer_state *YY_BUFFER_STATE; -#endif - -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - - /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires - * access to the local variable yy_act. Since yyless() is a macro, it would break - * existing scanners that call yyless() from OUTSIDE yylex. - * One obvious solution it to make yy_act a global. I tried that, and saw - * a 5% performance hit in a non-yylineno scanner, because yy_act is - * normally declared as a register variable-- so it is not worth it. - */ - #define YY_LESS_LINENO(n) \ - do { \ - int yyl;\ - for ( yyl = n; yyl < yyleng; ++yyl )\ - if ( yytext[yyl] == '\n' )\ - --yylineno;\ - }while(0) - #define YY_LINENO_REWIND_TO(dst) \ - do {\ - const char *p;\ - for ( p = yy_cp-1; p >= (dst); --p)\ - if ( *p == '\n' )\ - --yylineno;\ - }while(0) - -/* Return all but the first "n" matched characters back to the input stream. */ -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - *yy_cp = yyg->yy_hold_char; \ - YY_RESTORE_YY_MORE_OFFSET \ - yyg->yy_c_buf_p = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) -#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) - -#ifndef YY_STRUCT_YY_BUFFER_STATE -#define YY_STRUCT_YY_BUFFER_STATE -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - int yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - int yy_bs_lineno; /**< The line count. */ - int yy_bs_column; /**< The column count. */ - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; - -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - - }; -#endif /* !YY_STRUCT_YY_BUFFER_STATE */ - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - * - * Returns the top of the stack, or NULL. - */ -#define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ - ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ - : NULL) -/* Same as previous macro, but useful when we know that the buffer stack is not - * NULL or when we need an lvalue. For internal use only. - */ -#define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] - -void yyrestart ( FILE *input_file , yyscan_t yyscanner ); -void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); -void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); -void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); -void yypop_buffer_state ( yyscan_t yyscanner ); - -static void yyensure_buffer_stack ( yyscan_t yyscanner ); -static void yy_load_buffer_state ( yyscan_t yyscanner ); -static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); -#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner) - -YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); -YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); - -void *yyalloc ( yy_size_t , yyscan_t yyscanner ); -void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); -void yyfree ( void * , yyscan_t yyscanner ); - -#define yy_new_buffer yy_create_buffer -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! YY_CURRENT_BUFFER ){ \ - yyensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ - } -#define yy_set_bol(at_bol) \ - { \ - if ( ! YY_CURRENT_BUFFER ){\ - yyensure_buffer_stack (yyscanner); \ - YY_CURRENT_BUFFER_LVALUE = \ - yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ - } \ - YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ - } -#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) - -/* Begin user sect3 */ - -#define smt2newwrap(yyscanner) (/*CONSTCOND*/1) -#define YY_SKIP_YYWRAP -typedef flex_uint8_t YY_CHAR; - -typedef int yy_state_type; - -#define yytext_ptr yytext_r - -static yy_state_type yy_get_previous_state ( yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans ( yy_state_type current_state , yyscan_t yyscanner); -static int yy_get_next_buffer ( yyscan_t yyscanner ); -static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - yyg->yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yyg->yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - yyg->yy_c_buf_p = yy_cp; -#define YY_NUM_RULES 91 -#define YY_END_OF_BUFFER 92 -/* This struct is not used in this scanner, - but its presence is necessary. */ -struct yy_trans_info - { - flex_int32_t yy_verify; - flex_int32_t yy_nxt; - }; -static const flex_int16_t yy_accept[559] = - { 0, - 0, 0, 0, 0, 0, 0, 92, 90, 2, 2, - 3, 75, 90, 72, 74, 72, 68, 68, 90, 1, - 72, 72, 72, 4, 72, 72, 72, 72, 72, 72, - 72, 72, 72, 72, 72, 72, 83, 81, 77, 78, - 76, 82, 91, 87, 85, 86, 84, 89, 88, 2, - 72, 0, 0, 72, 68, 0, 0, 0, 68, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 1, 72, 72, 72, 5, 72, 72, 72, - 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, - 72, 79, 80, 71, 70, 72, 72, 68, 69, 69, - - 68, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, - 9, 11, 28, 72, 72, 72, 72, 72, 72, 69, - 69, 68, 68, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 72, 72, 72, 72, 72, - 72, 72, 72, 20, 72, 72, 29, 72, 72, 72, - 72, 72, 68, 73, 73, 73, 73, 73, 73, 73, - 40, 73, 73, 61, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 73, 73, 73, 72, 72, 72, 72, - 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, - 72, 72, 72, 72, 72, 72, 72, 72, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 62, 45, - 73, 73, 73, 73, 73, 39, 73, 73, 73, 73, - 73, 72, 72, 12, 13, 72, 72, 72, 7, 8, - 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, - 72, 34, 72, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 65, - 73, 44, 73, 73, 6, 10, 72, 72, 72, 72, - - 72, 72, 72, 72, 72, 72, 72, 72, 72, 72, - 72, 72, 72, 73, 63, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - 73, 64, 72, 72, 72, 72, 72, 72, 23, 72, - 72, 72, 72, 72, 72, 31, 72, 72, 37, 72, - 72, 73, 73, 73, 73, 73, 73, 73, 73, 47, - 73, 73, 73, 73, 73, 73, 46, 73, 14, 72, - 72, 72, 72, 72, 72, 72, 72, 72, 25, 72, - 27, 72, 30, 72, 72, 72, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, - - 73, 73, 73, 59, 72, 72, 72, 19, 72, 72, - 72, 72, 24, 72, 36, 32, 38, 72, 73, 43, - 73, 73, 73, 48, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 72, 16, 72, 18, 72, - 72, 72, 72, 35, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 58, 73, 73, 73, 72, - 15, 72, 72, 72, 72, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 73, 17, - 72, 72, 72, 72, 73, 73, 73, 73, 73, 73, - 49, 73, 73, 73, 73, 73, 73, 73, 21, 22, - - 72, 26, 67, 73, 60, 73, 73, 73, 73, 54, - 52, 73, 66, 73, 73, 72, 73, 73, 73, 73, - 73, 73, 73, 73, 33, 73, 73, 42, 51, 73, - 73, 73, 73, 73, 73, 73, 73, 73, 41, 73, - 50, 73, 73, 73, 73, 55, 53, 73, 73, 73, - 73, 73, 73, 56, 73, 73, 57, 0 - } ; - -static const YY_CHAR yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 4, 5, 6, 7, 8, 8, 8, 9, 10, - 10, 8, 8, 1, 11, 12, 13, 14, 15, 16, - 16, 16, 16, 16, 16, 16, 16, 17, 18, 8, - 8, 8, 8, 8, 19, 20, 21, 22, 23, 20, - 24, 8, 25, 8, 8, 26, 27, 28, 8, 8, - 8, 29, 30, 31, 32, 8, 8, 8, 8, 8, - 1, 33, 1, 8, 34, 1, 35, 36, 37, 38, - - 39, 40, 41, 42, 43, 8, 44, 45, 46, 47, - 48, 49, 8, 50, 51, 52, 53, 54, 55, 56, - 57, 8, 1, 58, 1, 8, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static const YY_CHAR yy_meta[59] = - { 0, - 1, 1, 2, 1, 3, 1, 1, 3, 4, 1, - 3, 3, 3, 5, 5, 5, 1, 1, 5, 5, - 5, 5, 5, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 1, 3, 5, 5, 5, 5, 5, 5, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 1 - } ; - -static const flex_int16_t yy_base[565] = - { 0, - 0, 0, 57, 62, 67, 70, 666, 667, 73, 76, - 0, 667, 26, 0, 667, 69, 77, 92, 94, 0, - 642, 632, 632, 0, 611, 619, 621, 603, 610, 618, - 617, 46, 616, 58, 612, 603, 667, 667, 667, 667, - 667, 667, 80, 667, 667, 667, 667, 667, 667, 107, - 0, 73, 0, 100, 105, 108, 135, 111, 140, 0, - 85, 59, 86, 599, 604, 615, 122, 599, 96, 110, - 606, 124, 0, 626, 619, 616, 593, 604, 124, 599, - 591, 588, 587, 588, 588, 585, 600, 582, 587, 593, - 588, 667, 667, 151, 0, 153, 156, 161, 164, 167, - - 170, 585, 577, 588, 592, 576, 138, 578, 572, 576, - 576, 569, 145, 573, 154, 569, 583, 578, 571, 565, - 589, 590, 587, 572, 573, 564, 565, 140, 572, 595, - 0, 0, 0, 563, 566, 592, 553, 553, 548, 182, - 185, 188, 191, 588, 556, 554, 555, 547, 559, 554, - 541, 552, 549, 550, 549, 540, 548, 547, 533, 530, - 530, 529, 532, 526, 158, 551, 548, 548, 525, 530, - 538, 525, 519, 0, 525, 173, 0, 558, 167, 523, - 517, 527, 203, 514, 516, 516, 515, 511, 513, 512, - 547, 507, 503, 517, 503, 501, 499, 503, 502, 504, - - 497, 494, 496, 506, 496, 500, 523, 522, 516, 487, - 527, 487, 497, 484, 489, 482, 485, 482, 480, 482, - 493, 476, 479, 477, 475, 480, 465, 510, 468, 469, - 475, 469, 505, 477, 463, 475, 477, 476, 0, 0, - 499, 472, 462, 460, 471, 494, 453, 460, 451, 450, - 452, 473, 472, 0, 0, 446, 457, 484, 0, 0, - 443, 171, 441, 444, 440, 445, 437, 448, 446, 434, - 445, 0, 173, 449, 432, 430, 430, 444, 468, 435, - 438, 439, 434, 423, 434, 461, 460, 420, 431, 0, - 429, 0, 424, 419, 0, 0, 430, 453, 174, 189, - - 415, 423, 418, 412, 424, 405, 422, 408, 412, 411, - 396, 399, 399, 398, 0, 406, 396, 408, 408, 397, - 393, 391, 403, 388, 429, 388, 385, 426, 397, 384, - 382, 0, 381, 193, 379, 383, 380, 388, 0, 378, - 379, 386, 373, 385, 371, 0, 385, 373, 0, 373, - 384, 375, 369, 373, 373, 375, 366, 375, 368, 0, - 373, 185, 370, 361, 359, 355, 0, 348, 0, 356, - 350, 354, 354, 350, 347, 351, 348, 349, 0, 384, - 0, 355, 0, 346, 341, 339, 339, 342, 351, 352, - 346, 334, 334, 329, 345, 330, 332, 329, 331, 338, - - 332, 322, 337, 0, 326, 325, 321, 0, 318, 326, - 322, 319, 0, 329, 0, 0, 0, 326, 312, 0, - 352, 308, 318, 0, 317, 320, 319, 306, 318, 307, - 303, 315, 305, 299, 300, 298, 0, 296, 0, 299, - 307, 300, 296, 0, 300, 294, 298, 293, 290, 327, - 286, 293, 296, 286, 298, 0, 284, 282, 287, 277, - 0, 281, 280, 291, 275, 287, 270, 274, 278, 268, - 273, 267, 276, 271, 275, 262, 258, 259, 262, 0, - 259, 257, 261, 268, 255, 253, 254, 251, 259, 253, - 0, 253, 248, 247, 286, 249, 243, 242, 0, 0, - - 241, 0, 0, 243, 0, 248, 242, 251, 242, 0, - 0, 250, 0, 275, 242, 233, 230, 234, 234, 241, - 240, 230, 240, 228, 0, 223, 227, 0, 0, 226, - 222, 229, 223, 258, 217, 215, 227, 227, 0, 222, - 0, 192, 191, 194, 198, 0, 0, 192, 202, 197, - 188, 184, 113, 0, 101, 51, 0, 667, 244, 249, - 252, 255, 260, 62 - } ; - -static const flex_int16_t yy_def[565] = - { 0, - 558, 1, 559, 559, 560, 560, 558, 558, 558, 558, - 561, 558, 558, 561, 558, 561, 558, 558, 562, 563, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 561, 558, 564, 561, 561, 558, 558, 558, 558, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 563, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 558, 558, 558, 564, 561, 561, 561, 558, 558, - - 558, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 558, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - - 562, 562, 562, 562, 562, 562, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 561, 561, 561, 561, 561, 561, - - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - - 562, 562, 562, 562, 561, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 561, 561, 561, 561, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 561, 561, 561, 561, 561, - 561, 561, 561, 561, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 561, - 561, 561, 561, 561, 561, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 561, - 561, 561, 561, 561, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 561, 561, - - 561, 561, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 561, 562, 562, 562, 562, - 562, 562, 562, 562, 561, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 562, 562, 562, - 562, 562, 562, 562, 562, 562, 562, 0, 558, 558, - 558, 558, 558, 558 - } ; - -static const flex_int16_t yy_nxt[726] = - { 0, - 8, 9, 10, 9, 11, 12, 13, 14, 14, 15, - 16, 14, 14, 17, 18, 18, 19, 20, 14, 14, - 14, 21, 14, 14, 14, 14, 14, 22, 14, 23, - 14, 14, 8, 24, 25, 14, 26, 27, 28, 29, - 30, 14, 14, 14, 31, 14, 14, 14, 32, 33, - 34, 35, 14, 14, 36, 14, 14, 37, 39, 40, - 41, 52, 42, 39, 40, 41, 95, 42, 45, 46, - 47, 45, 46, 47, 50, 50, 50, 50, 50, 50, - 84, 53, 54, 55, 55, 92, 94, 94, 56, 43, - 57, 57, 57, 85, 43, 557, 88, 104, 86, 48, - - 89, 105, 48, 56, 58, 59, 59, 59, 50, 50, - 50, 96, 93, 54, 54, 54, 96, 97, 98, 98, - 98, 99, 100, 100, 49, 101, 101, 49, 61, 102, - 114, 62, 63, 64, 115, 106, 65, 103, 66, 556, - 67, 107, 68, 69, 70, 71, 56, 72, 57, 57, - 57, 56, 58, 59, 59, 59, 111, 116, 119, 555, - 126, 117, 120, 127, 94, 94, 140, 141, 141, 112, - 142, 142, 96, 97, 98, 98, 98, 99, 100, 100, - 100, 100, 100, 143, 143, 143, 149, 156, 159, 150, - 173, 174, 157, 205, 160, 140, 141, 141, 141, 141, - - 141, 183, 183, 183, 143, 143, 143, 216, 206, 223, - 301, 224, 312, 335, 225, 217, 183, 183, 183, 396, - 218, 219, 302, 313, 336, 220, 221, 337, 554, 370, - 397, 338, 371, 398, 553, 552, 551, 399, 550, 549, - 548, 547, 546, 372, 38, 38, 38, 38, 38, 44, - 44, 44, 44, 44, 51, 51, 51, 60, 545, 60, - 73, 544, 73, 73, 73, 543, 542, 541, 540, 539, - 538, 537, 536, 535, 534, 533, 532, 531, 530, 529, - 528, 527, 526, 525, 524, 523, 522, 521, 520, 519, - 518, 517, 516, 515, 514, 513, 512, 511, 510, 509, - - 508, 507, 506, 505, 504, 503, 502, 501, 500, 499, - 498, 497, 496, 495, 494, 493, 492, 491, 490, 489, - 488, 487, 486, 485, 484, 483, 482, 481, 480, 479, - 478, 477, 476, 475, 474, 473, 472, 471, 470, 469, - 468, 467, 466, 465, 464, 463, 462, 461, 460, 459, - 458, 457, 456, 455, 454, 453, 452, 451, 450, 449, - 448, 447, 446, 445, 444, 443, 442, 441, 440, 439, - 438, 437, 436, 435, 434, 433, 432, 431, 430, 429, - 428, 427, 426, 425, 424, 423, 422, 421, 420, 419, - 418, 417, 416, 415, 414, 413, 412, 411, 410, 409, - - 408, 407, 406, 405, 404, 403, 402, 401, 400, 395, - 394, 393, 392, 391, 390, 389, 388, 387, 386, 385, - 384, 383, 382, 381, 380, 379, 378, 377, 376, 375, - 374, 373, 369, 368, 367, 366, 365, 364, 363, 362, - 361, 360, 359, 358, 357, 356, 355, 354, 353, 352, - 351, 350, 349, 348, 347, 346, 345, 344, 343, 342, - 341, 340, 339, 334, 333, 332, 331, 330, 329, 328, - 327, 326, 325, 324, 323, 322, 321, 320, 319, 318, - 317, 316, 315, 314, 311, 310, 309, 308, 307, 306, - 305, 304, 303, 300, 299, 298, 297, 296, 295, 294, - - 293, 292, 291, 290, 289, 288, 287, 286, 285, 284, - 283, 282, 281, 280, 279, 278, 277, 276, 275, 274, - 273, 272, 271, 270, 269, 268, 267, 266, 265, 264, - 263, 262, 261, 260, 259, 258, 257, 256, 255, 254, - 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, - 243, 242, 241, 240, 239, 238, 237, 236, 235, 234, - 233, 232, 231, 230, 229, 228, 227, 226, 222, 215, - 214, 213, 212, 211, 210, 209, 208, 207, 204, 203, - 202, 201, 200, 199, 198, 197, 196, 195, 194, 193, - 192, 191, 190, 189, 188, 187, 186, 185, 184, 182, - - 181, 180, 179, 178, 177, 176, 175, 172, 171, 170, - 169, 168, 167, 166, 165, 164, 163, 162, 161, 158, - 155, 154, 153, 152, 151, 148, 147, 146, 145, 144, - 139, 138, 137, 136, 135, 134, 133, 132, 131, 130, - 129, 128, 125, 124, 123, 122, 121, 118, 113, 110, - 109, 108, 91, 90, 87, 83, 82, 81, 80, 79, - 78, 77, 76, 75, 74, 558, 7, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558 - } ; - -static const flex_int16_t yy_chk[726] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, - 3, 13, 3, 4, 4, 4, 564, 4, 5, 5, - 5, 6, 6, 6, 9, 9, 9, 10, 10, 10, - 32, 13, 16, 16, 16, 43, 52, 52, 17, 3, - 17, 17, 17, 32, 4, 556, 34, 62, 32, 5, - - 34, 62, 6, 18, 18, 18, 18, 18, 50, 50, - 50, 54, 43, 54, 54, 54, 55, 55, 55, 55, - 55, 56, 56, 56, 5, 58, 58, 6, 19, 61, - 69, 19, 19, 19, 69, 63, 19, 61, 19, 555, - 19, 63, 19, 19, 19, 19, 57, 19, 57, 57, - 57, 59, 59, 59, 59, 59, 67, 70, 72, 553, - 79, 70, 72, 79, 94, 94, 96, 96, 96, 67, - 97, 97, 98, 98, 98, 98, 98, 99, 99, 99, - 100, 100, 100, 101, 101, 101, 107, 113, 115, 107, - 128, 128, 113, 165, 115, 140, 140, 140, 141, 141, - - 141, 142, 142, 142, 143, 143, 143, 176, 165, 179, - 262, 179, 273, 299, 179, 176, 183, 183, 183, 362, - 176, 176, 262, 273, 299, 176, 176, 300, 552, 334, - 362, 300, 334, 362, 551, 550, 549, 362, 548, 545, - 544, 543, 542, 334, 559, 559, 559, 559, 559, 560, - 560, 560, 560, 560, 561, 561, 561, 562, 540, 562, - 563, 538, 563, 563, 563, 537, 536, 535, 534, 533, - 532, 531, 530, 527, 526, 524, 523, 522, 521, 520, - 519, 518, 517, 516, 515, 514, 512, 509, 508, 507, - 506, 504, 501, 498, 497, 496, 495, 494, 493, 492, - - 490, 489, 488, 487, 486, 485, 484, 483, 482, 481, - 479, 478, 477, 476, 475, 474, 473, 472, 471, 470, - 469, 468, 467, 466, 465, 464, 463, 462, 460, 459, - 458, 457, 455, 454, 453, 452, 451, 450, 449, 448, - 447, 446, 445, 443, 442, 441, 440, 438, 436, 435, - 434, 433, 432, 431, 430, 429, 428, 427, 426, 425, - 423, 422, 421, 419, 418, 414, 412, 411, 410, 409, - 407, 406, 405, 403, 402, 401, 400, 399, 398, 397, - 396, 395, 394, 393, 392, 391, 390, 389, 388, 387, - 386, 385, 384, 382, 380, 378, 377, 376, 375, 374, - - 373, 372, 371, 370, 368, 366, 365, 364, 363, 361, - 359, 358, 357, 356, 355, 354, 353, 352, 351, 350, - 348, 347, 345, 344, 343, 342, 341, 340, 338, 337, - 336, 335, 333, 331, 330, 329, 328, 327, 326, 325, - 324, 323, 322, 321, 320, 319, 318, 317, 316, 314, - 313, 312, 311, 310, 309, 308, 307, 306, 305, 304, - 303, 302, 301, 298, 297, 294, 293, 291, 289, 288, - 287, 286, 285, 284, 283, 282, 281, 280, 279, 278, - 277, 276, 275, 274, 271, 270, 269, 268, 267, 266, - 265, 264, 263, 261, 258, 257, 256, 253, 252, 251, - - 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, - 238, 237, 236, 235, 234, 233, 232, 231, 230, 229, - 228, 227, 226, 225, 224, 223, 222, 221, 220, 219, - 218, 217, 216, 215, 214, 213, 212, 211, 210, 209, - 208, 207, 206, 205, 204, 203, 202, 201, 200, 199, - 198, 197, 196, 195, 194, 193, 192, 191, 190, 189, - 188, 187, 186, 185, 184, 182, 181, 180, 178, 175, - 173, 172, 171, 170, 169, 168, 167, 166, 164, 163, - 162, 161, 160, 159, 158, 157, 156, 155, 154, 153, - 152, 151, 150, 149, 148, 147, 146, 145, 144, 139, - - 138, 137, 136, 135, 134, 130, 129, 127, 126, 125, - 124, 123, 122, 121, 120, 119, 118, 117, 116, 114, - 112, 111, 110, 109, 108, 106, 105, 104, 103, 102, - 91, 90, 89, 88, 87, 86, 85, 84, 83, 82, - 81, 80, 78, 77, 76, 75, 74, 71, 68, 66, - 65, 64, 36, 35, 33, 31, 30, 29, 28, 27, - 26, 25, 23, 22, 21, 7, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558 - } ; - -/* Table of booleans, true if rule could match eol. */ -static const flex_int32_t yy_rule_can_match_eol[92] = - { 0, -0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, - 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, }; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -#line 1 "smt2new/smt2newlexer.ll" -/********************************************************************* -Author: Antti Hyvarinen - -OpenSMT2 -- Copyright (C) 2012 - 2014 Antti Hyvarinen - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*********************************************************************/ -#line 36 "smt2new/smt2newlexer.ll" - -#include -#include -#include -#include - -#include "smt2tokens.h" -#include "smt2newcontext.h" -#include "smt2newparser.hh" - -#define YY_EXTRA_TYPE Smt2newContext* -#define YY_USER_ACTION yyget_lloc(yyscanner)->first_line = yyget_lineno(yyscanner); -#line 1065 "smt2new/smt2newlexer.cc" - -#line 1067 "smt2new/smt2newlexer.cc" - -#define INITIAL 0 -#define STR 1 -#define PSYM 2 - -#ifndef YY_NO_UNISTD_H -/* Special case for "unistd.h", since it is non-ANSI. We include it way - * down here because we want the user's section 1 to have been scanned first. - * The user has a chance to override it with an option. - */ -#include -#endif - -#ifndef YY_EXTRA_TYPE -#define YY_EXTRA_TYPE void * -#endif - -/* Holds the entire state of the reentrant scanner. */ -struct yyguts_t - { - - /* User-defined. Not touched by flex. */ - YY_EXTRA_TYPE yyextra_r; - - /* The rest are the same as the globals declared in the non-reentrant scanner. */ - FILE *yyin_r, *yyout_r; - size_t yy_buffer_stack_top; /**< index of top of stack. */ - size_t yy_buffer_stack_max; /**< capacity of stack. */ - YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ - char yy_hold_char; - int yy_n_chars; - int yyleng_r; - char *yy_c_buf_p; - int yy_init; - int yy_start; - int yy_did_buffer_switch_on_eof; - int yy_start_stack_ptr; - int yy_start_stack_depth; - int *yy_start_stack; - yy_state_type yy_last_accepting_state; - char* yy_last_accepting_cpos; - - int yylineno_r; - int yy_flex_debug_r; - - char *yytext_r; - int yy_more_flag; - int yy_more_len; - - YYSTYPE * yylval_r; - - YYLTYPE * yylloc_r; - - }; /* end struct yyguts_t */ - -static int yy_init_globals ( yyscan_t yyscanner ); - - /* This must go here because YYSTYPE and YYLTYPE are included - * from bison output in section 1.*/ - # define yylval yyg->yylval_r - - # define yylloc yyg->yylloc_r - -int yylex_init (yyscan_t* scanner); - -int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); - -/* Accessor methods to globals. - These are made visible to non-reentrant scanners for convenience. */ - -int yylex_destroy ( yyscan_t yyscanner ); - -int yyget_debug ( yyscan_t yyscanner ); - -void yyset_debug ( int debug_flag , yyscan_t yyscanner ); - -YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); - -void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); - -FILE *yyget_in ( yyscan_t yyscanner ); - -void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); - -FILE *yyget_out ( yyscan_t yyscanner ); - -void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); - - int yyget_leng ( yyscan_t yyscanner ); - -char *yyget_text ( yyscan_t yyscanner ); - -int yyget_lineno ( yyscan_t yyscanner ); - -void yyset_lineno ( int _line_number , yyscan_t yyscanner ); - -int yyget_column ( yyscan_t yyscanner ); - -void yyset_column ( int _column_no , yyscan_t yyscanner ); - -YYSTYPE * yyget_lval ( yyscan_t yyscanner ); - -void yyset_lval ( YYSTYPE * yylval_param , yyscan_t yyscanner ); - - YYLTYPE *yyget_lloc ( yyscan_t yyscanner ); - - void yyset_lloc ( YYLTYPE * yylloc_param , yyscan_t yyscanner ); - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap ( yyscan_t yyscanner ); -#else -extern int yywrap ( yyscan_t yyscanner ); -#endif -#endif - -#ifndef YY_NO_UNPUT - - static void yyunput ( int c, char *buf_ptr , yyscan_t yyscanner); - -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen ( const char * , yyscan_t yyscanner); -#endif - -#ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput ( yyscan_t yyscanner ); -#else -static int input ( yyscan_t yyscanner ); -#endif - -#endif - - static void yy_push_state ( int _new_state , yyscan_t yyscanner); - - static void yy_pop_state ( yyscan_t yyscanner ); - - static int yy_top_state ( yyscan_t yyscanner ); - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else -#define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ -#endif - -/* Copy whatever the last rule matched to the standard output. */ -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ - { \ - int c = '*'; \ - int n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - }\ -\ - -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg , yyscanner) -#endif - -/* end tables serialization structures and prototypes */ - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL_IS_OURS 1 - -extern int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner); - -#define YY_DECL int yylex \ - (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner) -#endif /* !YY_DECL */ - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK /*LINTED*/break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -/** The main scanner function which does all the work. - */ -YY_DECL -{ - yy_state_type yy_current_state; - char *yy_cp, *yy_bp; - int yy_act; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yylval = yylval_param; - - yylloc = yylloc_param; - - if ( !yyg->yy_init ) - { - yyg->yy_init = 1; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! yyg->yy_start ) - yyg->yy_start = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! YY_CURRENT_BUFFER ) { - yyensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); - } - - yy_load_buffer_state( yyscanner ); - } - - { -#line 53 "smt2new/smt2newlexer.ll" - - -#line 1362 "smt2new/smt2newlexer.cc" - - while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ - { - yy_cp = yyg->yy_c_buf_p; - - /* Support of yytext. */ - *yy_cp = yyg->yy_hold_char; - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = yyg->yy_start; -yy_match: - do - { - YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 559 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - ++yy_cp; - } - while ( yy_base[yy_current_state] != 667 ); - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - if ( yy_act == 0 ) - { /* have to back up */ - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - yy_act = yy_accept[yy_current_state]; - } - - YY_DO_BEFORE_ACTION; - - if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] ) - { - int yyl; - for ( yyl = 0; yyl < yyleng; ++yyl ) - if ( yytext[yyl] == '\n' ) - - do{ yylineno++; - yycolumn=0; - }while(0) -; - } - -do_action: /* This label is used only to access EOF actions. */ - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yyg->yy_hold_char; - yy_cp = yyg->yy_last_accepting_cpos; - yy_current_state = yyg->yy_last_accepting_state; - goto yy_find_action; - -case 1: -YY_RULE_SETUP -#line 55 "smt2new/smt2newlexer.ll" -// Eat comments - YY_BREAK -case 2: -/* rule 2 can match eol */ -YY_RULE_SETUP -#line 56 "smt2new/smt2newlexer.ll" -// Eat spaces - YY_BREAK -case 3: -YY_RULE_SETUP -#line 58 "smt2new/smt2newlexer.ll" -{ return *yyget_text(yyscanner); } - YY_BREAK -case 4: -YY_RULE_SETUP -#line 59 "smt2new/smt2newlexer.ll" -{ return *yyget_text(yyscanner); } - YY_BREAK -case 5: -YY_RULE_SETUP -#line 60 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_as }; return TK_AS; } - YY_BREAK -case 6: -YY_RULE_SETUP -#line 62 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_DECIMAL }; return TK_DECIMAL; } - YY_BREAK -case 7: -YY_RULE_SETUP -#line 63 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_exists }; return TK_EXISTS; } - YY_BREAK -case 8: -YY_RULE_SETUP -#line 64 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_forall }; return TK_FORALL; } - YY_BREAK -case 9: -YY_RULE_SETUP -#line 65 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_let }; return TK_LET; } - YY_BREAK -case 10: -YY_RULE_SETUP -#line 66 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_NUMERAL }; return TK_NUMERAL; } - YY_BREAK -case 11: -YY_RULE_SETUP -#line 67 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_par }; return TK_PAR; } - YY_BREAK -case 12: -YY_RULE_SETUP -#line 68 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_STRING}; return TK_STRING; } - YY_BREAK -case 13: -YY_RULE_SETUP -#line 70 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_assert }; return TK_ASSERT; } - YY_BREAK -case 14: -YY_RULE_SETUP -#line 71 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_checksat }; return TK_CHECKSAT; } - YY_BREAK -case 15: -YY_RULE_SETUP -#line 72 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_declaresort }; return TK_DECLARESORT; } - YY_BREAK -case 16: -YY_RULE_SETUP -#line 73 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_declarefun }; return TK_DECLAREFUN; } - YY_BREAK -case 17: -YY_RULE_SETUP -#line 74 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_declareconst} ; return TK_DECLARECONST; } - YY_BREAK -case 18: -YY_RULE_SETUP -#line 75 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_definesort }; return TK_DEFINESORT; } - YY_BREAK -case 19: -YY_RULE_SETUP -#line 76 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_definefun }; return TK_DEFINEFUN; } - YY_BREAK -case 20: -YY_RULE_SETUP -#line 77 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_exit }; return TK_EXIT; } - YY_BREAK -case 21: -YY_RULE_SETUP -#line 78 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_getassertions }; return TK_GETASSERTIONS; } - YY_BREAK -case 22: -YY_RULE_SETUP -#line 79 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_getassignment }; return TK_GETASSIGNMENT; } - YY_BREAK -case 23: -YY_RULE_SETUP -#line 80 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_getinfo }; return TK_GETINFO; } - YY_BREAK -case 24: -YY_RULE_SETUP -#line 81 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_getoption }; return TK_GETOPTION; } - YY_BREAK -case 25: -YY_RULE_SETUP -#line 82 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_getproof }; return TK_GETPROOF; } - YY_BREAK -case 26: -YY_RULE_SETUP -#line 83 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_getunsatcore }; return TK_GETUNSATCORE; } - YY_BREAK -case 27: -YY_RULE_SETUP -#line 84 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_getvalue }; return TK_GETVALUE; } - YY_BREAK -case 28: -YY_RULE_SETUP -#line 85 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_pop }; return TK_POP; } - YY_BREAK -case 29: -YY_RULE_SETUP -#line 86 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_push }; return TK_PUSH; } - YY_BREAK -case 30: -YY_RULE_SETUP -#line 87 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_setlogic }; return TK_SETLOGIC; } - YY_BREAK -case 31: -YY_RULE_SETUP -#line 88 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_setinfo }; return TK_SETINFO; } - YY_BREAK -case 32: -YY_RULE_SETUP -#line 89 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_setoption }; return TK_SETOPTION; } - YY_BREAK -case 33: -YY_RULE_SETUP -#line 90 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_getinterpolants }; return TK_GETITPS; } - YY_BREAK -case 34: -YY_RULE_SETUP -#line 91 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_theory }; return TK_THEORY; } - YY_BREAK -case 35: -YY_RULE_SETUP -#line 92 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_writestate }; return TK_WRSTATE; } - YY_BREAK -case 36: -YY_RULE_SETUP -#line 93 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_readstate }; return TK_RDSTATE; } - YY_BREAK -case 37: -YY_RULE_SETUP -#line 94 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_simplify }; return TK_SIMPLIFY; } - YY_BREAK -case 38: -YY_RULE_SETUP -#line 95 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->tok = { t_writefuns }; return TK_WRFUNS; } - YY_BREAK -case 39: -YY_RULE_SETUP -#line 97 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_SORTS; } - YY_BREAK -case 40: -YY_RULE_SETUP -#line 98 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_FUNS; } - YY_BREAK -case 41: -YY_RULE_SETUP -#line 99 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_SORTSDESCRIPTION; } - YY_BREAK -case 42: -YY_RULE_SETUP -#line 100 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_FUNSDESCRIPTION; } - YY_BREAK -case 43: -YY_RULE_SETUP -#line 101 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_DEFINITION; } - YY_BREAK -case 44: -YY_RULE_SETUP -#line 102 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_VALUES; } - YY_BREAK -case 45: -YY_RULE_SETUP -#line 103 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_NOTES; } - YY_BREAK -case 46: -YY_RULE_SETUP -#line 104 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_THEORIES; } - YY_BREAK -case 47: -YY_RULE_SETUP -#line 105 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_LANGUAGE; } - YY_BREAK -case 48: -YY_RULE_SETUP -#line 106 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_EXTENSIONS; } - YY_BREAK -case 49: -YY_RULE_SETUP -#line 107 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRINTSUCCESS; } - YY_BREAK -case 50: -YY_RULE_SETUP -#line 108 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_EXPANDDEFINITIONS; } - YY_BREAK -case 51: -YY_RULE_SETUP -#line 109 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_INTERACTIVEMODE; } - YY_BREAK -case 52: -YY_RULE_SETUP -#line 110 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRODUCEPROOFS; } - YY_BREAK -case 53: -YY_RULE_SETUP -#line 111 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRODUCEUNSATCORES; } - YY_BREAK -case 54: -YY_RULE_SETUP -#line 112 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRODUCEMODELS; } - YY_BREAK -case 55: -YY_RULE_SETUP -#line 113 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_PRODUCEASSIGNMENTS; } - YY_BREAK -case 56: -YY_RULE_SETUP -#line 114 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_REGULAROUTPUTCHANNEL; } - YY_BREAK -case 57: -YY_RULE_SETUP -#line 115 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_DIAGNOSTICOUTPUTCHANNEL; } - YY_BREAK -case 58: -YY_RULE_SETUP -#line 116 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_RANDOMSEED; } - YY_BREAK -case 59: -YY_RULE_SETUP -#line 117 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_VERBOSITY; } - YY_BREAK -case 60: -YY_RULE_SETUP -#line 118 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_ERRORBEHAVIOR; } - YY_BREAK -case 61: -YY_RULE_SETUP -#line 119 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_NAME; } - YY_BREAK -case 62: -YY_RULE_SETUP -#line 120 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_NAMED; } - YY_BREAK -case 63: -YY_RULE_SETUP -#line 121 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_AUTHORS; } - YY_BREAK -case 64: -YY_RULE_SETUP -#line 122 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_VERSION; } - YY_BREAK -case 65: -YY_RULE_SETUP -#line 123 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_STATUS; } - YY_BREAK -case 66: -YY_RULE_SETUP -#line 124 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_REASONUNKNOWN; } - YY_BREAK -case 67: -YY_RULE_SETUP -#line 125 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return KW_ALLSTATISTICS; } - YY_BREAK -case 68: -YY_RULE_SETUP -#line 128 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_NUM; } - YY_BREAK -case 69: -YY_RULE_SETUP -#line 129 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_DEC; } - YY_BREAK -case 70: -YY_RULE_SETUP -#line 130 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_HEX; } - YY_BREAK -case 71: -YY_RULE_SETUP -#line 131 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_BIN; } - YY_BREAK -case 72: -YY_RULE_SETUP -#line 133 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_SYM; } - YY_BREAK -case 73: -YY_RULE_SETUP -#line 134 "smt2new/smt2newlexer.ll" -{ yyget_lval(yyscanner)->str = strdup( yyget_text(yyscanner) ); return TK_KEY; } - YY_BREAK -case 74: -YY_RULE_SETUP -#line 136 "smt2new/smt2newlexer.ll" -{ return *yyget_text(yyscanner); } - YY_BREAK -case 75: -YY_RULE_SETUP -#line 138 "smt2new/smt2newlexer.ll" -{ yy_push_state(STR, yyscanner); } - YY_BREAK - -case 76: -YY_RULE_SETUP -#line 141 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf(' '); } - YY_BREAK -case 77: -YY_RULE_SETUP -#line 142 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf('\t'); } - YY_BREAK -case 78: -/* rule 78 can match eol */ -YY_RULE_SETUP -#line 143 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf('\n'); } - YY_BREAK -case 79: -YY_RULE_SETUP -#line 144 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf('"'); } - YY_BREAK -case 80: -YY_RULE_SETUP -#line 145 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf('\\'); } - YY_BREAK -case 81: -YY_RULE_SETUP -#line 146 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf(yyget_text(yyscanner)[0]); } - YY_BREAK -case 82: -YY_RULE_SETUP -#line 147 "smt2new/smt2newlexer.ll" -{ yylval->str = strdup(yyextra->getBuf()); yyextra->clearBuf(); - yy_pop_state(yyscanner); return TK_STR; } - YY_BREAK - -case 83: -YY_RULE_SETUP -#line 151 "smt2new/smt2newlexer.ll" -{ yy_push_state(PSYM, yyscanner); } - YY_BREAK - -case 84: -YY_RULE_SETUP -#line 154 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf(' '); } - YY_BREAK -case 85: -YY_RULE_SETUP -#line 155 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf('\t'); } - YY_BREAK -case 86: -/* rule 86 can match eol */ -YY_RULE_SETUP -#line 156 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf('\n'); } - YY_BREAK -case 87: -YY_RULE_SETUP -#line 157 "smt2new/smt2newlexer.ll" -{ yyextra->insertBuf(yyget_text(yyscanner)[0]); } - YY_BREAK -case 88: -YY_RULE_SETUP -#line 158 "smt2new/smt2newlexer.ll" -{ yylval->str = strdup(yyextra->getBuf()); yyextra->clearBuf(); - yy_pop_state(yyscanner); return TK_SYM; } - YY_BREAK -case 89: -YY_RULE_SETUP -#line 160 "smt2new/smt2newlexer.ll" -{ printf("Syntax error at line %d near %s, \\ not allowed inside | ... |\n", yyget_lineno(yyscanner), yyget_text(yyscanner)); exit(1); } - YY_BREAK - -case 90: -YY_RULE_SETUP -#line 163 "smt2new/smt2newlexer.ll" -{ printf( "Syntax error at line %d near %s\n", yyget_lineno(yyscanner), yyget_text(yyscanner) ); exit( 1 ); } - YY_BREAK -case 91: -YY_RULE_SETUP -#line 165 "smt2new/smt2newlexer.ll" -ECHO; - YY_BREAK -#line 1895 "smt2new/smt2newlexer.cc" -case YY_STATE_EOF(INITIAL): -case YY_STATE_EOF(STR): -case YY_STATE_EOF(PSYM): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yyg->yytext_ptr) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yyg->yy_hold_char; - YY_RESTORE_YY_MORE_OFFSET - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between YY_CURRENT_BUFFER and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( yyg->yy_c_buf_p <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - yyg->yy_c_buf_p = yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state , yyscanner); - - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++yyg->yy_c_buf_p; - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = yyg->yy_c_buf_p; - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_END_OF_FILE: - { - yyg->yy_did_buffer_switch_on_eof = 0; - - if ( yywrap( yyscanner ) ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - yyg->yy_c_buf_p = yyg->yytext_ptr + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = - yyg->yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - yyg->yy_c_buf_p = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars]; - - yy_current_state = yy_get_previous_state( yyscanner ); - - yy_cp = yyg->yy_c_buf_p; - yy_bp = yyg->yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ - } /* end of user's declarations */ -} /* end of yylex */ - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ -static int yy_get_next_buffer (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - char *source = yyg->yytext_ptr; - int number_to_move, i; - int ret_val; - - if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yyg->yy_c_buf_p - yyg->yytext_ptr - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr - 1); - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars = 0; - - else - { - int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE; - - int yy_c_buf_p_offset = - (int) (yyg->yy_c_buf_p - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yyrealloc( (void *) b->yy_ch_buf, - (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = NULL; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - yyg->yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - - number_to_move - 1; - - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - yyg->yy_n_chars, num_to_read ); - - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - if ( yyg->yy_n_chars == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin , yyscanner); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { - /* Extend the array by 50%, plus the number we really need. */ - int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( - (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner ); - if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); - /* "- 2" to take care of EOB's */ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); - } - - yyg->yy_n_chars += number_to_move; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR; - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - - yyg->yytext_ptr = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0]; - - return ret_val; -} - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - - static yy_state_type yy_get_previous_state (yyscan_t yyscanner) -{ - yy_state_type yy_current_state; - char *yy_cp; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_current_state = yyg->yy_start; - - for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) - { - YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 559 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - } - - return yy_current_state; -} - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) -{ - int yy_is_jam; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ - char *yy_cp = yyg->yy_c_buf_p; - - YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - yyg->yy_last_accepting_state = yy_current_state; - yyg->yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 559 ) - yy_c = yy_meta[yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 558); - - (void)yyg; - return yy_is_jam ? 0 : yy_current_state; -} - -#ifndef YY_NO_UNPUT - - static void yyunput (int c, char * yy_bp , yyscan_t yyscanner) -{ - char *yy_cp; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_cp = yyg->yy_c_buf_p; - - /* undo effects of setting up yytext */ - *yy_cp = yyg->yy_hold_char; - - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) - { /* need to shift things up to make room */ - /* +2 for EOB chars. */ - int number_to_move = yyg->yy_n_chars + 2; - char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[ - YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2]; - char *source = - &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]; - - while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) - *--dest = *--source; - - yy_cp += (int) (dest - source); - yy_bp += (int) (dest - source); - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = - yyg->yy_n_chars = (int) YY_CURRENT_BUFFER_LVALUE->yy_buf_size; - - if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 ) - YY_FATAL_ERROR( "flex scanner push-back overflow" ); - } - - *--yy_cp = (char) c; - - if ( c == '\n' ){ - --yylineno; - } - - yyg->yytext_ptr = yy_bp; - yyg->yy_hold_char = *yy_cp; - yyg->yy_c_buf_p = yy_cp; -} - -#endif - -#ifndef YY_NO_INPUT -#ifdef __cplusplus - static int yyinput (yyscan_t yyscanner) -#else - static int input (yyscan_t yyscanner) -#endif - -{ - int c; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - *yyg->yy_c_buf_p = yyg->yy_hold_char; - - if ( *yyg->yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( yyg->yy_c_buf_p < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] ) - /* This was really a NUL. */ - *yyg->yy_c_buf_p = '\0'; - - else - { /* need more input */ - int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); - ++yyg->yy_c_buf_p; - - switch ( yy_get_next_buffer( yyscanner ) ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart( yyin , yyscanner); - - /*FALLTHROUGH*/ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap( yyscanner ) ) - return 0; - - if ( ! yyg->yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(yyscanner); -#else - return input(yyscanner); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - yyg->yy_c_buf_p = yyg->yytext_ptr + offset; - break; - } - } - } - - c = *(unsigned char *) yyg->yy_c_buf_p; /* cast for 8-bit char's */ - *yyg->yy_c_buf_p = '\0'; /* preserve yytext */ - yyg->yy_hold_char = *++yyg->yy_c_buf_p; - - if ( c == '\n' ) - - do{ yylineno++; - yycolumn=0; - }while(0) -; - - return c; -} -#endif /* ifndef YY_NO_INPUT */ - -/** Immediately switch to a different input stream. - * @param input_file A readable stream. - * @param yyscanner The scanner object. - * @note This function does not reset the start condition to @c INITIAL . - */ - void yyrestart (FILE * input_file , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! YY_CURRENT_BUFFER ){ - yyensure_buffer_stack (yyscanner); - YY_CURRENT_BUFFER_LVALUE = - yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); - } - - yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); - yy_load_buffer_state( yyscanner ); -} - -/** Switch to a different input buffer. - * @param new_buffer The new input buffer. - * @param yyscanner The scanner object. - */ - void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* TODO. We should be able to replace this entire function body - * with - * yypop_buffer_state(); - * yypush_buffer_state(new_buffer); - */ - yyensure_buffer_stack (yyscanner); - if ( YY_CURRENT_BUFFER == new_buffer ) - return; - - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - YY_CURRENT_BUFFER_LVALUE = new_buffer; - yy_load_buffer_state( yyscanner ); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - yyg->yy_did_buffer_switch_on_eof = 1; -} - -static void yy_load_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; - yyg->yytext_ptr = yyg->yy_c_buf_p = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos; - yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file; - yyg->yy_hold_char = *yyg->yy_c_buf_p; -} - -/** Allocate and initialize an input buffer state. - * @param file A readable stream. - * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. - * @param yyscanner The scanner object. - * @return the allocated buffer state. - */ - YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer( b, file , yyscanner); - - return b; -} - -/** Destroy the buffer. - * @param b a buffer created with yy_create_buffer() - * @param yyscanner The scanner object. - */ - void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if ( ! b ) - return; - - if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */ - YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yyfree( (void *) b->yy_ch_buf , yyscanner ); - - yyfree( (void *) b , yyscanner ); -} - -/* Initializes or reinitializes a buffer. - * This function is sometimes called more than once on the same buffer, - * such as during a yyrestart() or at EOF. - */ - static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) - -{ - int oerrno = errno; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - yy_flush_buffer( b , yyscanner); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - - /* If b is the current buffer, then yy_init_buffer was _probably_ - * called from yyrestart() or through yy_get_next_buffer. - * In that case, we don't want to reset the lineno or column. - */ - if (b != YY_CURRENT_BUFFER){ - b->yy_bs_lineno = 1; - b->yy_bs_column = 0; - } - - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; - - errno = oerrno; -} - -/** Discard all buffered characters. On the next scan, YY_INPUT will be called. - * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. - * @param yyscanner The scanner object. - */ - void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == YY_CURRENT_BUFFER ) - yy_load_buffer_state( yyscanner ); -} - -/** Pushes the new state onto the stack. The new state becomes - * the current state. This function will allocate the stack - * if necessary. - * @param new_buffer The new state. - * @param yyscanner The scanner object. - */ -void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (new_buffer == NULL) - return; - - yyensure_buffer_stack(yyscanner); - - /* This block is copied from yy_switch_to_buffer. */ - if ( YY_CURRENT_BUFFER ) - { - /* Flush out information for old buffer. */ - *yyg->yy_c_buf_p = yyg->yy_hold_char; - YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = yyg->yy_c_buf_p; - YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars; - } - - /* Only push if top exists. Otherwise, replace top. */ - if (YY_CURRENT_BUFFER) - yyg->yy_buffer_stack_top++; - YY_CURRENT_BUFFER_LVALUE = new_buffer; - - /* copied from yy_switch_to_buffer. */ - yy_load_buffer_state( yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; -} - -/** Removes and deletes the top of the stack, if present. - * The next element becomes the new top. - * @param yyscanner The scanner object. - */ -void yypop_buffer_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if (!YY_CURRENT_BUFFER) - return; - - yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); - YY_CURRENT_BUFFER_LVALUE = NULL; - if (yyg->yy_buffer_stack_top > 0) - --yyg->yy_buffer_stack_top; - - if (YY_CURRENT_BUFFER) { - yy_load_buffer_state( yyscanner ); - yyg->yy_did_buffer_switch_on_eof = 1; - } -} - -/* Allocates the stack if it does not exist. - * Guarantees space for at least one push. - */ -static void yyensure_buffer_stack (yyscan_t yyscanner) -{ - yy_size_t num_to_alloc; - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (!yyg->yy_buffer_stack) { - - /* First allocation is just for 2 elements, since we don't know if this - * scanner will even need a stack. We use 2 instead of 1 to avoid an - * immediate realloc on the next call. - */ - num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ - yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc - (num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - - yyg->yy_buffer_stack_max = num_to_alloc; - yyg->yy_buffer_stack_top = 0; - return; - } - - if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ - - /* Increase the buffer to prepare for a possible push. */ - yy_size_t grow_size = 8 /* arbitrary grow size */; - - num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc - (yyg->yy_buffer_stack, - num_to_alloc * sizeof(struct yy_buffer_state*) - , yyscanner); - if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); - - /* zero only the new slots.*/ - memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); - yyg->yy_buffer_stack_max = num_to_alloc; - } -} - -/** Setup the input buffer state to scan directly from a user-specified character buffer. - * @param base the character buffer - * @param size the size in bytes of the character buffer - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return NULL; - - b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = NULL; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer( b , yyscanner ); - - return b; -} - -/** Setup the input buffer state to scan a string. The next call to yylex() will - * scan from a @e copy of @a str. - * @param yystr a NUL-terminated string to scan - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - * @note If you want to scan bytes that may contain NUL values, then use - * yy_scan_bytes() instead. - */ -YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) -{ - - return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); -} - -/** Setup the input buffer state to scan the given bytes. The next call to yylex() will - * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. - * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. - */ -YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) -{ - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = (yy_size_t) (_yybytes_len + 2); - buf = (char *) yyalloc( n , yyscanner ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < _yybytes_len; ++i ) - buf[i] = yybytes[i]; - - buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer( buf, n , yyscanner); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; -} - - static void yy_push_state (int _new_state , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if ( yyg->yy_start_stack_ptr >= yyg->yy_start_stack_depth ) - { - yy_size_t new_size; - - yyg->yy_start_stack_depth += YY_START_STACK_INCR; - new_size = (yy_size_t) yyg->yy_start_stack_depth * sizeof( int ); - - if ( ! yyg->yy_start_stack ) - yyg->yy_start_stack = (int *) yyalloc( new_size , yyscanner ); - - else - yyg->yy_start_stack = (int *) yyrealloc( - (void *) yyg->yy_start_stack, new_size , yyscanner ); - - if ( ! yyg->yy_start_stack ) - YY_FATAL_ERROR( "out of memory expanding start-condition stack" ); - } - - yyg->yy_start_stack[yyg->yy_start_stack_ptr++] = YY_START; - - BEGIN(_new_state); -} - - static void yy_pop_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - if ( --yyg->yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); - - BEGIN(yyg->yy_start_stack[yyg->yy_start_stack_ptr]); -} - - static int yy_top_state (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyg->yy_start_stack[yyg->yy_start_stack_ptr - 1]; -} - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); -} - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - int yyless_macro_arg = (n); \ - YY_LESS_LINENO(yyless_macro_arg);\ - yytext[yyleng] = yyg->yy_hold_char; \ - yyg->yy_c_buf_p = yytext + yyless_macro_arg; \ - yyg->yy_hold_char = *yyg->yy_c_buf_p; \ - *yyg->yy_c_buf_p = '\0'; \ - yyleng = yyless_macro_arg; \ - } \ - while ( 0 ) - -/* Accessor methods (get/set functions) to struct members. */ - -/** Get the user-defined data for this scanner. - * @param yyscanner The scanner object. - */ -YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyextra; -} - -/** Get the current line number. - * @param yyscanner The scanner object. - */ -int yyget_lineno (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yylineno; -} - -/** Get the current column number. - * @param yyscanner The scanner object. - */ -int yyget_column (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - if (! YY_CURRENT_BUFFER) - return 0; - - return yycolumn; -} - -/** Get the input stream. - * @param yyscanner The scanner object. - */ -FILE *yyget_in (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyin; -} - -/** Get the output stream. - * @param yyscanner The scanner object. - */ -FILE *yyget_out (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyout; -} - -/** Get the length of the current token. - * @param yyscanner The scanner object. - */ -int yyget_leng (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yyleng; -} - -/** Get the current token. - * @param yyscanner The scanner object. - */ - -char *yyget_text (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yytext; -} - -/** Set the user-defined data. This data is never touched by the scanner. - * @param user_defined The data to be associated with this scanner. - * @param yyscanner The scanner object. - */ -void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyextra = user_defined ; -} - -/** Set the current line number. - * @param _line_number line number - * @param yyscanner The scanner object. - */ -void yyset_lineno (int _line_number , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* lineno is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); - - yylineno = _line_number; -} - -/** Set the current column. - * @param _column_no column number - * @param yyscanner The scanner object. - */ -void yyset_column (int _column_no , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* column is only valid if an input buffer exists. */ - if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "yyset_column called with no buffer" ); - - yycolumn = _column_no; -} - -/** Set the input stream. This does not discard the current - * input buffer. - * @param _in_str A readable stream. - * @param yyscanner The scanner object. - * @see yy_switch_to_buffer - */ -void yyset_in (FILE * _in_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyin = _in_str ; -} - -void yyset_out (FILE * _out_str , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyout = _out_str ; -} - -int yyget_debug (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yy_flex_debug; -} - -void yyset_debug (int _bdebug , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yy_flex_debug = _bdebug ; -} - -/* Accessor methods for yylval and yylloc */ - -YYSTYPE * yyget_lval (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yylval; -} - -void yyset_lval (YYSTYPE * yylval_param , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yylval = yylval_param; -} - -YYLTYPE *yyget_lloc (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - return yylloc; -} - -void yyset_lloc (YYLTYPE * yylloc_param , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yylloc = yylloc_param; -} - -/* User-visible API */ - -/* yylex_init is special because it creates the scanner itself, so it is - * the ONLY reentrant function that doesn't take the scanner as the last argument. - * That's why we explicitly handle the declaration, instead of using our macros. - */ -int yylex_init(yyscan_t* ptr_yy_globals) -{ - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - return yy_init_globals ( *ptr_yy_globals ); -} - -/* yylex_init_extra has the same functionality as yylex_init, but follows the - * convention of taking the scanner as the last argument. Note however, that - * this is a *pointer* to a scanner, as it will be allocated by this call (and - * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to yyalloc in - * the yyextra field. - */ -int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) -{ - struct yyguts_t dummy_yyguts; - - yyset_extra (yy_user_defined, &dummy_yyguts); - - if (ptr_yy_globals == NULL){ - errno = EINVAL; - return 1; - } - - *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - - if (*ptr_yy_globals == NULL){ - errno = ENOMEM; - return 1; - } - - /* By setting to 0xAA, we expose bugs in - yy_init_globals. Leave at 0x00 for releases. */ - memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - yyset_extra (yy_user_defined, *ptr_yy_globals); - - return yy_init_globals ( *ptr_yy_globals ); -} - -static int yy_init_globals (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - /* Initialization is the same as for the non-reentrant scanner. - * This function is called from yylex_destroy(), so don't allocate here. - */ - - yyg->yy_buffer_stack = NULL; - yyg->yy_buffer_stack_top = 0; - yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = NULL; - yyg->yy_init = 0; - yyg->yy_start = 0; - - yyg->yy_start_stack_ptr = 0; - yyg->yy_start_stack_depth = 0; - yyg->yy_start_stack = NULL; - -/* Defined in main.c */ -#ifdef YY_STDINIT - yyin = stdin; - yyout = stdout; -#else - yyin = NULL; - yyout = NULL; -#endif - - /* For future reference: Set errno on error, since we are called by - * yylex_init() - */ - return 0; -} - -/* yylex_destroy is for both reentrant and non-reentrant scanners. */ -int yylex_destroy (yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - - /* Pop the buffer stack, destroying each element. */ - while(YY_CURRENT_BUFFER){ - yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); - YY_CURRENT_BUFFER_LVALUE = NULL; - yypop_buffer_state(yyscanner); - } - - /* Destroy the stack itself. */ - yyfree(yyg->yy_buffer_stack , yyscanner); - yyg->yy_buffer_stack = NULL; - - /* Destroy the start condition stack. */ - yyfree( yyg->yy_start_stack , yyscanner ); - yyg->yy_start_stack = NULL; - - /* Reset the globals. This is important in a non-reentrant scanner so the next time - * yylex() is called, initialization will occur. */ - yy_init_globals( yyscanner); - - /* Destroy the main struct (reentrant only). */ - yyfree ( yyscanner , yyscanner ); - yyscanner = NULL; - return 0; -} - -/* - * Internal utility routines. - */ - -#ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, const char * s2, int n , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - - int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; -} -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen (const char * s , yyscan_t yyscanner) -{ - int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; -} -#endif - -void *yyalloc (yy_size_t size , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - return malloc(size); -} - -void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return realloc(ptr, size); -} - -void yyfree (void * ptr , yyscan_t yyscanner) -{ - struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - (void)yyg; - free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ -} - -#define YYTABLES_NAME "yytables" - -#line 165 "smt2new/smt2newlexer.ll" - - -int Smt2newContext::init_scanner() -{ - if (is != NULL) { - yylex_init_extra(this, &scanner); - yyset_in(is, scanner); - } - else if (ib != NULL) { - yylex_init(&scanner); - yylex_init_extra(this, &scanner); - yy_scan_string(ib, scanner); - } - else - return -1; - return 0; -} - -void Smt2newContext::destroy_scanner() -{ - yylex_destroy(scanner); -} - - diff --git a/src/parsers/smt2new/smt2newparser.cc b/src/parsers/smt2new/smt2newparser.cc deleted file mode 100644 index 6a3c8730f..000000000 --- a/src/parsers/smt2new/smt2newparser.cc +++ /dev/null @@ -1,2887 +0,0 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ - -/* Bison implementation for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -/* C LALR(1) parser skeleton written by Richard Stallman, by - simplifying the original so-called "semantic" parser. */ - -/* All symbols defined below should begin with yy or YY, to avoid - infringing on user name space. This should be done even for local - variables, as they might otherwise be expanded by user macros. - There are some unavoidable exceptions within include files to - define necessary library symbols; they are noted "INFRINGES ON - USER NAME SPACE" below. */ - -/* Identify Bison output. */ -#define YYBISON 1 - -/* Bison version. */ -#define YYBISON_VERSION "3.0.4" - -/* Skeleton name. */ -#define YYSKELETON_NAME "yacc.c" - -/* Pure parsers. */ -#define YYPURE 1 - -/* Push parsers. */ -#define YYPUSH 0 - -/* Pull parsers. */ -#define YYPULL 1 - - -/* Substitute the variable and function names. */ -#define yyparse smt2newparse -#define yylex smt2newlex -#define yyerror smt2newerror -#define yydebug smt2newdebug -#define yynerrs smt2newnerrs - - -/* Copy the first part of user declarations. */ -#line 35 "smt2new/smt2newparser.yy" /* yacc.c:339 */ - -#include -#include -#include -#include -#include -#include -#include - -#include "smt2newcontext.h" -#include "smt2newparser.hh" -#include "smt2tokens.h" - -int smt2newlex(YYSTYPE* lvalp, YYLTYPE* llocp, void* scanner); - -void smt2newerror( YYLTYPE* locp, Smt2newContext* context, const char * s ) -{ - if (context->interactive) - printf("At interactive input: %s\n", s); - else - printf( "At line %d: %s\n", locp->first_line, s ); -// exit( 1 ); -} - -#define scanner context->scanner - -/* Overallocation to prevent stack overflow */ -#define YYMAXDEPTH 1024 * 1024 - -#line 102 "smt2new/smt2newparser.cc" /* yacc.c:339 */ - -# ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr -# else -# define YY_NULLPTR 0 -# endif -# endif - -/* Enabling verbose error messages. */ -#ifdef YYERROR_VERBOSE -# undef YYERROR_VERBOSE -# define YYERROR_VERBOSE 1 -#else -# define YYERROR_VERBOSE 1 -#endif - -/* In a future release of Bison, this section will be replaced - by #include "smt2newparser.hh". */ -#ifndef YY_SMT2NEW_SMT2NEW_SMT2NEWPARSER_HH_INCLUDED -# define YY_SMT2NEW_SMT2NEW_SMT2NEWPARSER_HH_INCLUDED -/* Debug traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif -#if YYDEBUG -extern int smt2newdebug; -#endif - -/* Token type. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - enum yytokentype - { - TK_AS = 258, - TK_DECIMAL = 259, - TK_EXISTS = 260, - TK_FORALL = 261, - TK_LET = 262, - TK_NUMERAL = 263, - TK_PAR = 264, - TK_STRING = 265, - TK_ASSERT = 266, - TK_CHECKSAT = 267, - TK_DECLARESORT = 268, - TK_DECLAREFUN = 269, - TK_DECLARECONST = 270, - TK_DEFINESORT = 271, - TK_DEFINEFUN = 272, - TK_EXIT = 273, - TK_GETASSERTIONS = 274, - TK_GETASSIGNMENT = 275, - TK_GETINFO = 276, - TK_GETOPTION = 277, - TK_GETPROOF = 278, - TK_GETUNSATCORE = 279, - TK_GETVALUE = 280, - TK_POP = 281, - TK_PUSH = 282, - TK_SETLOGIC = 283, - TK_SETINFO = 284, - TK_SETOPTION = 285, - TK_THEORY = 286, - TK_GETITPS = 287, - TK_WRSTATE = 288, - TK_RDSTATE = 289, - TK_SIMPLIFY = 290, - TK_WRFUNS = 291, - TK_NUM = 292, - TK_SYM = 293, - TK_KEY = 294, - TK_STR = 295, - TK_DEC = 296, - TK_HEX = 297, - TK_BIN = 298, - KW_SORTS = 299, - KW_FUNS = 300, - KW_SORTSDESCRIPTION = 301, - KW_FUNSDESCRIPTION = 302, - KW_DEFINITION = 303, - KW_NOTES = 304, - KW_THEORIES = 305, - KW_LANGUAGE = 306, - KW_EXTENSIONS = 307, - KW_VALUES = 308, - KW_PRINTSUCCESS = 309, - KW_EXPANDDEFINITIONS = 310, - KW_INTERACTIVEMODE = 311, - KW_PRODUCEPROOFS = 312, - KW_PRODUCEUNSATCORES = 313, - KW_PRODUCEMODELS = 314, - KW_PRODUCEASSIGNMENTS = 315, - KW_REGULAROUTPUTCHANNEL = 316, - KW_DIAGNOSTICOUTPUTCHANNEL = 317, - KW_RANDOMSEED = 318, - KW_VERBOSITY = 319, - KW_ERRORBEHAVIOR = 320, - KW_NAME = 321, - KW_NAMED = 322, - KW_AUTHORS = 323, - KW_VERSION = 324, - KW_STATUS = 325, - KW_REASONUNKNOWN = 326, - KW_ALLSTATISTICS = 327 - }; -#endif - -/* Value type. */ -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - -union YYSTYPE -{ -#line 66 "smt2new/smt2newparser.yy" /* yacc.c:355 */ - - char * str; - std::vector< std::string > * str_list; - ASTNode * snode; - std::list< ASTNode * > * snode_list; - smt2token tok; - -#line 223 "smt2new/smt2newparser.cc" /* yacc.c:355 */ -}; - -typedef union YYSTYPE YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define YYSTYPE_IS_DECLARED 1 -#endif - -/* Location type. */ -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE YYLTYPE; -struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -}; -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - - - -int smt2newparse (Smt2newContext* context); - -#endif /* !YY_SMT2NEW_SMT2NEW_SMT2NEWPARSER_HH_INCLUDED */ - -/* Copy the second part of user declarations. */ - -#line 253 "smt2new/smt2newparser.cc" /* yacc.c:358 */ - -#ifdef short -# undef short -#endif - -#ifdef YYTYPE_UINT8 -typedef YYTYPE_UINT8 yytype_uint8; -#else -typedef unsigned char yytype_uint8; -#endif - -#ifdef YYTYPE_INT8 -typedef YYTYPE_INT8 yytype_int8; -#else -typedef signed char yytype_int8; -#endif - -#ifdef YYTYPE_UINT16 -typedef YYTYPE_UINT16 yytype_uint16; -#else -typedef unsigned short int yytype_uint16; -#endif - -#ifdef YYTYPE_INT16 -typedef YYTYPE_INT16 yytype_int16; -#else -typedef short int yytype_int16; -#endif - -#ifndef YYSIZE_T -# ifdef __SIZE_TYPE__ -# define YYSIZE_T __SIZE_TYPE__ -# elif defined size_t -# define YYSIZE_T size_t -# elif ! defined YYSIZE_T -# include /* INFRINGES ON USER NAME SPACE */ -# define YYSIZE_T size_t -# else -# define YYSIZE_T unsigned int -# endif -#endif - -#define YYSIZE_MAXIMUM ((YYSIZE_T) -1) - -#ifndef YY_ -# if defined YYENABLE_NLS && YYENABLE_NLS -# if ENABLE_NLS -# include /* INFRINGES ON USER NAME SPACE */ -# define YY_(Msgid) dgettext ("bison-runtime", Msgid) -# endif -# endif -# ifndef YY_ -# define YY_(Msgid) Msgid -# endif -#endif - -#ifndef YY_ATTRIBUTE -# if (defined __GNUC__ \ - && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__))) \ - || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C -# define YY_ATTRIBUTE(Spec) __attribute__(Spec) -# else -# define YY_ATTRIBUTE(Spec) /* empty */ -# endif -#endif - -#ifndef YY_ATTRIBUTE_PURE -# define YY_ATTRIBUTE_PURE YY_ATTRIBUTE ((__pure__)) -#endif - -#ifndef YY_ATTRIBUTE_UNUSED -# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) -#endif - -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) -# endif -#endif - -/* Suppress unused-variable warnings by "using" E. */ -#if ! defined lint || defined __GNUC__ -# define YYUSE(E) ((void) (E)) -#else -# define YYUSE(E) /* empty */ -#endif - -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ -/* Suppress an incorrect diagnostic about yylval being uninitialized. */ -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ - _Pragma ("GCC diagnostic push") \ - _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\ - _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") -# define YY_IGNORE_MAYBE_UNINITIALIZED_END \ - _Pragma ("GCC diagnostic pop") -#else -# define YY_INITIAL_VALUE(Value) Value -#endif -#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN -# define YY_IGNORE_MAYBE_UNINITIALIZED_END -#endif -#ifndef YY_INITIAL_VALUE -# define YY_INITIAL_VALUE(Value) /* Nothing. */ -#endif - - -#if ! defined yyoverflow || YYERROR_VERBOSE - -/* The parser invokes alloca or malloc; define the necessary symbols. */ - -# ifdef YYSTACK_USE_ALLOCA -# if YYSTACK_USE_ALLOCA -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# elif defined __BUILTIN_VA_ARG_INCR -# include /* INFRINGES ON USER NAME SPACE */ -# elif defined _AIX -# define YYSTACK_ALLOC __alloca -# elif defined _MSC_VER -# include /* INFRINGES ON USER NAME SPACE */ -# define alloca _alloca -# else -# define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS -# include /* INFRINGES ON USER NAME SPACE */ - /* Use EXIT_SUCCESS as a witness for stdlib.h. */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# endif -# endif -# endif - -# ifdef YYSTACK_ALLOC - /* Pacify GCC's 'empty if-body' warning. */ -# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) -# ifndef YYSTACK_ALLOC_MAXIMUM - /* The OS might guarantee only one guard page at the bottom of the stack, - and a page size can be as small as 4096 bytes. So we cannot safely - invoke alloca (N) if N exceeds 4096. Use a slightly smaller number - to allow for a few compiler-allocated temporary stack slots. */ -# define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ -# endif -# else -# define YYSTACK_ALLOC YYMALLOC -# define YYSTACK_FREE YYFREE -# ifndef YYSTACK_ALLOC_MAXIMUM -# define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM -# endif -# if (defined __cplusplus && ! defined EXIT_SUCCESS \ - && ! ((defined YYMALLOC || defined malloc) \ - && (defined YYFREE || defined free))) -# include /* INFRINGES ON USER NAME SPACE */ -# ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -# endif -# endif -# ifndef YYMALLOC -# define YYMALLOC malloc -# if ! defined malloc && ! defined EXIT_SUCCESS -void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# ifndef YYFREE -# define YYFREE free -# if ! defined free && ! defined EXIT_SUCCESS -void free (void *); /* INFRINGES ON USER NAME SPACE */ -# endif -# endif -# endif -#endif /* ! defined yyoverflow || YYERROR_VERBOSE */ - - -#if (! defined yyoverflow \ - && (! defined __cplusplus \ - || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \ - && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL))) - -/* A type that is properly aligned for any stack member. */ -union yyalloc -{ - yytype_int16 yyss_alloc; - YYSTYPE yyvs_alloc; - YYLTYPE yyls_alloc; -}; - -/* The size of the maximum gap between one aligned stack and the next. */ -# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1) - -/* The size of an array large to enough to hold all stacks, each with - N elements. */ -# define YYSTACK_BYTES(N) \ - ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \ - + 2 * YYSTACK_GAP_MAXIMUM) - -# define YYCOPY_NEEDED 1 - -/* Relocate STACK from its old location to the new one. The - local variables YYSIZE and YYSTACKSIZE give the old and new number of - elements in the stack, and YYPTR gives the new location of the - stack. Advance YYPTR to a properly aligned location for the next - stack. */ -# define YYSTACK_RELOCATE(Stack_alloc, Stack) \ - do \ - { \ - YYSIZE_T yynewbytes; \ - YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ - Stack = &yyptr->Stack_alloc; \ - yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \ - yyptr += yynewbytes / sizeof (*yyptr); \ - } \ - while (0) - -#endif - -#if defined YYCOPY_NEEDED && YYCOPY_NEEDED -/* Copy COUNT objects from SRC to DST. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(Dst, Src, Count) \ - __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src))) -# else -# define YYCOPY(Dst, Src, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (Dst)[yyi] = (Src)[yyi]; \ - } \ - while (0) -# endif -# endif -#endif /* !YYCOPY_NEEDED */ - -/* YYFINAL -- State number of the termination state. */ -#define YYFINAL 3 -/* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 378 - -/* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 77 -/* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 27 -/* YYNRULES -- Number of rules. */ -#define YYNRULES 129 -/* YYNSTATES -- Number of states. */ -#define YYNSTATES 246 - -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ -#define YYUNDEFTOK 2 -#define YYMAXUTOK 327 - -#define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) - -/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ -static const yytype_uint8 yytranslate[] = -{ - 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 76, 2, 2, 2, 2, 2, 2, - 73, 74, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 75, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, - 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, - 65, 66, 67, 68, 69, 70, 71, 72 -}; - -#if YYDEBUG - /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ -static const yytype_uint16 yyrline[] = -{ - 0, 97, 97, 101, 102, 106, 112, 118, 124, 131, - 144, 156, 168, 181, 187, 193, 199, 203, 207, 211, - 215, 221, 227, 233, 237, 243, 247, 253, 259, 265, - 269, 274, 275, 279, 281, 283, 285, 289, 291, 295, - 302, 304, 308, 310, 318, 321, 324, 330, 334, 338, - 346, 349, 357, 359, 361, 363, 365, 369, 371, 375, - 377, 381, 383, 393, 394, 398, 403, 404, 408, 412, - 413, 417, 419, 421, 428, 438, 448, 458, 535, 536, - 693, 706, 712, 718, 724, 730, 736, 742, 748, 754, - 760, 766, 772, 780, 782, 784, 786, 788, 790, 792, - 794, 796, 798, 800, 802, 804, 806, 808, 810, 812, - 814, 816, 818, 820, 822, 824, 826, 828, 830, 832, - 834, 836, 840, 842, 844, 846, 848, 850, 852, 854 -}; -#endif - -#if YYDEBUG || YYERROR_VERBOSE || 1 -/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. - First, the terminals, then, starting at YYNTOKENS, nonterminals. */ -static const char *const yytname[] = -{ - "$end", "error", "$undefined", "TK_AS", "TK_DECIMAL", "TK_EXISTS", - "TK_FORALL", "TK_LET", "TK_NUMERAL", "TK_PAR", "TK_STRING", "TK_ASSERT", - "TK_CHECKSAT", "TK_DECLARESORT", "TK_DECLAREFUN", "TK_DECLARECONST", - "TK_DEFINESORT", "TK_DEFINEFUN", "TK_EXIT", "TK_GETASSERTIONS", - "TK_GETASSIGNMENT", "TK_GETINFO", "TK_GETOPTION", "TK_GETPROOF", - "TK_GETUNSATCORE", "TK_GETVALUE", "TK_POP", "TK_PUSH", "TK_SETLOGIC", - "TK_SETINFO", "TK_SETOPTION", "TK_THEORY", "TK_GETITPS", "TK_WRSTATE", - "TK_RDSTATE", "TK_SIMPLIFY", "TK_WRFUNS", "TK_NUM", "TK_SYM", "TK_KEY", - "TK_STR", "TK_DEC", "TK_HEX", "TK_BIN", "KW_SORTS", "KW_FUNS", - "KW_SORTSDESCRIPTION", "KW_FUNSDESCRIPTION", "KW_DEFINITION", "KW_NOTES", - "KW_THEORIES", "KW_LANGUAGE", "KW_EXTENSIONS", "KW_VALUES", - "KW_PRINTSUCCESS", "KW_EXPANDDEFINITIONS", "KW_INTERACTIVEMODE", - "KW_PRODUCEPROOFS", "KW_PRODUCEUNSATCORES", "KW_PRODUCEMODELS", - "KW_PRODUCEASSIGNMENTS", "KW_REGULAROUTPUTCHANNEL", - "KW_DIAGNOSTICOUTPUTCHANNEL", "KW_RANDOMSEED", "KW_VERBOSITY", - "KW_ERRORBEHAVIOR", "KW_NAME", "KW_NAMED", "KW_AUTHORS", "KW_VERSION", - "KW_STATUS", "KW_REASONUNKNOWN", "KW_ALLSTATISTICS", "'('", "')'", "'_'", - "'!'", "$accept", "script", "command_list", "command", "attribute_list", - "attribute", "attribute_value", "identifier", "sort", "sort_list", - "s_expr", "s_expr_list", "spec_const", "const_val", "numeral_list", - "qual_identifier", "var_binding_list", "var_binding", "sorted_var_list", - "sorted_var", "term_list", "term", "symbol_list", "b_value", "option", - "predef_key", "info_flag", YY_NULLPTR -}; -#endif - -# ifdef YYPRINT -/* YYTOKNUM[NUM] -- (External) token number corresponding to the - (internal) symbol number NUM (which must be that of a token). */ -static const yytype_uint16 yytoknum[] = -{ - 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, - 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, - 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, - 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, - 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, - 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326, 327, 40, 41, 95, 33 -}; -# endif - -#define YYPACT_NINF -161 - -#define yypact_value_is_default(Yystate) \ - (!!((Yystate) == (-161))) - -#define YYTABLE_NINF -1 - -#define yytable_value_is_error(Yytable_value) \ - 0 - - /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing - STATE-NUM. */ -static const yytype_int16 yypact[] = -{ - -161, 10, -58, -161, 342, -161, -1, -10, 27, 29, - 112, 32, 33, 3, 5, 11, 104, 212, 12, 13, - 1, 43, 47, 50, 246, 280, 17, 54, 65, 36, - 73, -161, -161, -161, -161, -161, -161, 0, -161, -161, - -161, 44, -161, 82, 49, -161, -161, 53, 61, 62, - -161, -161, -161, -161, -161, -161, -161, -161, -161, -161, - -161, 57, 63, -161, -161, -161, -161, -161, -161, -161, - -161, -161, -161, -161, -161, -161, -161, -161, -161, -161, - -161, -161, -161, -161, -161, -161, -161, -161, -161, -161, - -161, -161, 64, -161, -161, -1, 67, 68, 70, 87, - 71, 87, 98, 98, 98, 98, 98, 98, 98, 111, - 116, 120, 121, -161, 85, -161, 93, 97, -161, 103, - -22, 105, 106, 107, 6, 143, -1, -1, -161, 108, - -161, 109, -161, -161, -161, -161, -161, -161, -161, -161, - -161, -161, -161, -161, -161, -161, -161, -161, -161, -161, - -161, -161, -161, -161, -161, -161, -161, -161, -161, -161, - -161, -161, -161, 110, -14, 113, 113, 114, 147, 246, - -161, -161, -11, -14, -24, -48, 66, -20, -27, -161, - 115, 150, -161, -161, 152, -161, -161, -25, -161, 74, - -14, -161, 118, -161, -14, -14, -161, 119, -161, -161, - -161, -161, -161, -161, -161, -14, -161, -14, -45, -42, - -1, -30, -161, -161, 178, -161, 122, -161, 123, -1, - -161, 59, -161, 124, -1, -1, 125, -1, -161, -161, - -161, -161, -161, 126, -161, -5, -161, 127, 128, -161, - 129, -161, -161, -161, -161, -161 -}; - - /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. - Performed when YYTABLE does not specify something else to do. Zero - means the default is an error. */ -static const yytype_uint8 yydefact[] = -{ - 3, 0, 2, 1, 0, 4, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 52, 40, 56, 53, 54, 55, 0, 61, 71, - 72, 0, 16, 0, 0, 57, 58, 0, 0, 0, - 30, 17, 25, 129, 122, 123, 124, 125, 126, 127, - 128, 0, 0, 93, 94, 95, 96, 97, 99, 100, - 101, 102, 98, 103, 104, 105, 106, 107, 108, 109, - 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, - 120, 121, 0, 18, 23, 0, 0, 0, 0, 33, - 0, 35, 103, 104, 105, 106, 107, 108, 109, 110, - 111, 112, 113, 92, 0, 19, 0, 0, 29, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, - 45, 0, 78, 66, 28, 26, 27, 69, 14, 13, - 5, 38, 50, 34, 37, 7, 36, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 6, - 20, 21, 22, 0, 0, 0, 0, 0, 0, 0, - 69, 8, 0, 0, 0, 0, 0, 0, 0, 42, - 0, 0, 66, 66, 0, 63, 60, 0, 31, 0, - 0, 44, 0, 79, 0, 0, 67, 0, 70, 47, - 48, 50, 39, 51, 46, 0, 62, 0, 0, 0, - 0, 0, 59, 41, 0, 73, 0, 11, 0, 0, - 24, 0, 45, 0, 0, 0, 0, 0, 64, 77, - 32, 10, 9, 0, 49, 0, 68, 0, 0, 65, - 0, 12, 43, 76, 75, 74 -}; - - /* YYPGOTO[NTERM-NUM]. */ -static const yytype_int16 yypgoto[] = -{ - -161, -161, -161, -161, -161, -23, 94, -112, -160, -28, - -161, 4, -9, -161, -161, 169, -161, -4, -127, -108, - 38, -6, -161, 58, -161, 192, -161 -}; - - /* YYDEFGOTO[NTERM-NUM]. */ -static const yytype_int16 yydefgoto[] = -{ - -1, 1, 2, 5, 214, 100, 143, 38, 191, 172, - 203, 177, 39, 47, 187, 40, 211, 185, 175, 196, - 176, 198, 174, 148, 114, 101, 61 -}; - - /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If - positive, shift that token. If negative, reduce the rule whose - number is the opposite. If YYTABLE_NINF, syntax error. */ -static const yytype_uint8 yytable[] = -{ - 41, 46, 113, 120, 180, 121, 122, 123, 164, 120, - 3, 32, 212, 192, 193, 4, 32, 31, 199, 200, - 33, 34, 35, 36, 32, 181, 195, 32, 181, 224, - 216, 181, 225, 32, 218, 219, 31, 32, 32, 33, - 34, 35, 36, 184, 227, 222, 163, 223, 125, 213, - 194, 163, 179, 201, 202, 208, 209, 182, 183, 178, - 179, 179, 178, 190, 42, 43, 205, 44, 178, 242, - 48, 49, 37, 124, 95, 125, 126, 50, 179, 51, - 96, 125, 179, 179, 97, 52, 93, 94, 98, 137, - 144, 115, 144, 179, 116, 179, 31, 199, 200, 33, - 34, 35, 36, 31, 32, 117, 33, 34, 35, 36, - 118, 31, 32, 119, 33, 34, 35, 36, 128, 129, - 169, 170, 130, 179, 31, 141, 131, 33, 34, 35, - 36, 134, 201, 234, 132, 133, 147, 135, 136, 37, - 197, 138, 139, 53, 140, 145, 188, 37, 215, 31, - 45, 155, 33, 34, 35, 36, 156, 157, 158, 159, - 142, 149, 150, 151, 152, 153, 154, 160, 204, 54, - 55, 161, 56, 57, 58, 59, 60, 162, 165, 166, - 167, 168, 171, 173, 186, 125, 181, 184, 207, 206, - 210, 230, 217, 220, 235, 146, 231, 232, 236, 239, - 241, 243, 244, 245, 226, 221, 127, 228, 189, 92, - 0, 0, 204, 233, 0, 0, 0, 99, 237, 238, - 0, 240, 63, 64, 65, 66, 67, 68, 69, 70, - 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, - 91, 62, 229, 0, 0, 0, 63, 64, 65, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, - 87, 88, 89, 90, 91, 99, 0, 0, 0, 0, - 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, - 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, - 83, 84, 85, 86, 87, 88, 89, 90, 91, 99, - 0, 0, 0, 0, 63, 64, 65, 66, 67, 68, - 69, 70, 71, 72, 102, 103, 104, 105, 106, 107, - 108, 109, 110, 111, 112, 84, 85, 86, 87, 88, - 89, 90, 91, 6, 7, 8, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 0, 26, 27, 28, 29, 30 -}; - -static const yytype_int16 yycheck[] = -{ - 6, 10, 25, 3, 164, 5, 6, 7, 120, 3, - 0, 38, 37, 173, 38, 73, 38, 37, 38, 39, - 40, 41, 42, 43, 38, 73, 74, 38, 73, 74, - 190, 73, 74, 38, 194, 195, 37, 38, 38, 40, - 41, 42, 43, 73, 74, 205, 73, 207, 75, 74, - 74, 73, 164, 73, 74, 182, 183, 165, 166, 73, - 172, 173, 73, 74, 74, 38, 178, 38, 73, 74, - 38, 38, 73, 73, 73, 75, 76, 74, 190, 74, - 37, 75, 194, 195, 37, 74, 74, 74, 38, 95, - 99, 74, 101, 205, 40, 207, 37, 38, 39, 40, - 41, 42, 43, 37, 38, 40, 40, 41, 42, 43, - 74, 37, 38, 40, 40, 41, 42, 43, 74, 37, - 126, 127, 73, 235, 37, 38, 73, 40, 41, 42, - 43, 74, 73, 74, 73, 73, 38, 74, 74, 73, - 74, 74, 74, 39, 74, 74, 169, 73, 74, 37, - 38, 40, 40, 41, 42, 43, 40, 37, 37, 74, - 73, 103, 104, 105, 106, 107, 108, 74, 177, 65, - 66, 74, 68, 69, 70, 71, 72, 74, 73, 73, - 73, 38, 74, 74, 37, 75, 73, 73, 38, 74, - 38, 214, 74, 74, 222, 101, 74, 74, 74, 74, - 74, 74, 74, 74, 210, 201, 37, 211, 170, 17, - -1, -1, 221, 219, -1, -1, -1, 39, 224, 225, - -1, 227, 44, 45, 46, 47, 48, 49, 50, 51, - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 39, 74, -1, -1, -1, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, - 68, 69, 70, 71, 72, 39, -1, -1, -1, -1, - 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, - 64, 65, 66, 67, 68, 69, 70, 71, 72, 39, - -1, -1, -1, -1, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, - 70, 71, 72, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, - 28, 29, 30, -1, 32, 33, 34, 35, 36 -}; - - /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = -{ - 0, 78, 79, 0, 73, 80, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 32, 33, 34, 35, - 36, 37, 38, 40, 41, 42, 43, 73, 84, 89, - 92, 98, 74, 38, 38, 38, 89, 90, 38, 38, - 74, 74, 74, 39, 65, 66, 68, 69, 70, 71, - 72, 103, 39, 44, 45, 46, 47, 48, 49, 50, - 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, - 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, - 71, 72, 102, 74, 74, 73, 37, 37, 38, 39, - 82, 102, 54, 55, 56, 57, 58, 59, 60, 61, - 62, 63, 64, 82, 101, 74, 40, 40, 74, 40, - 3, 5, 6, 7, 73, 75, 76, 92, 74, 37, - 73, 73, 73, 73, 74, 74, 74, 98, 74, 74, - 74, 38, 73, 83, 89, 74, 83, 38, 100, 100, - 100, 100, 100, 100, 100, 40, 40, 37, 37, 74, - 74, 74, 74, 73, 84, 73, 73, 73, 38, 98, - 98, 74, 86, 74, 99, 95, 97, 88, 73, 84, - 85, 73, 96, 96, 73, 94, 37, 91, 82, 97, - 74, 85, 85, 38, 74, 74, 96, 74, 98, 38, - 39, 73, 74, 87, 89, 84, 74, 38, 95, 95, - 38, 93, 37, 74, 81, 74, 85, 74, 85, 85, - 74, 88, 85, 85, 74, 74, 98, 74, 94, 74, - 82, 74, 74, 98, 74, 86, 74, 98, 98, 74, - 98, 74, 74, 74, 74, 74 -}; - - /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */ -static const yytype_uint8 yyr1[] = -{ - 0, 77, 78, 79, 79, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 81, 81, 82, 82, 82, 82, 83, 83, 83, - 84, 84, 85, 85, 86, 86, 87, 87, 87, 87, - 88, 88, 89, 89, 89, 89, 89, 90, 90, 91, - 91, 92, 92, 93, 93, 94, 95, 95, 96, 97, - 97, 98, 98, 98, 98, 98, 98, 98, 99, 99, - 100, 101, 101, 101, 101, 101, 101, 101, 101, 101, - 101, 101, 101, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 102, 102, 102, 102, 102, 102, 102, 102, - 102, 102, 103, 103, 103, 103, 103, 103, 103, 103 -}; - - /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN. */ -static const yytype_uint8 yyr2[] = -{ - 0, 2, 1, 0, 2, 4, 4, 4, 5, 8, - 8, 7, 9, 4, 4, 4, 3, 3, 3, 3, - 4, 4, 4, 3, 7, 3, 4, 4, 4, 3, - 3, 0, 2, 1, 2, 1, 2, 1, 1, 3, - 1, 5, 1, 5, 2, 0, 1, 1, 1, 3, - 0, 2, 1, 1, 1, 1, 1, 1, 1, 2, - 1, 1, 5, 0, 2, 4, 0, 2, 4, 0, - 2, 1, 1, 5, 8, 8, 8, 6, 0, 2, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 -}; - - -#define yyerrok (yyerrstatus = 0) -#define yyclearin (yychar = YYEMPTY) -#define YYEMPTY (-2) -#define YYEOF 0 - -#define YYACCEPT goto yyacceptlab -#define YYABORT goto yyabortlab -#define YYERROR goto yyerrorlab - - -#define YYRECOVERING() (!!yyerrstatus) - -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (&yylloc, context, YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) - -/* Error token number */ -#define YYTERROR 1 -#define YYERRCODE 256 - - -/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. - If N is 0, then set CURRENT to the empty location which ends - the previous symbol: RHS[0] (always defined). */ - -#ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - do \ - if (N) \ - { \ - (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ - (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ - (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ - (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ - } \ - else \ - { \ - (Current).first_line = (Current).last_line = \ - YYRHSLOC (Rhs, 0).last_line; \ - (Current).first_column = (Current).last_column = \ - YYRHSLOC (Rhs, 0).last_column; \ - } \ - while (0) -#endif - -#define YYRHSLOC(Rhs, K) ((Rhs)[K]) - - -/* Enable debugging if requested. */ -#if YYDEBUG - -# ifndef YYFPRINTF -# include /* INFRINGES ON USER NAME SPACE */ -# define YYFPRINTF fprintf -# endif - -# define YYDPRINTF(Args) \ -do { \ - if (yydebug) \ - YYFPRINTF Args; \ -} while (0) - - -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ - -#ifndef YY_LOCATION_PRINT -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL - -/* Print *YYLOCP on YYO. Private, do not rely on its existence. */ - -YY_ATTRIBUTE_UNUSED -static unsigned -yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) -{ - unsigned res = 0; - int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; - if (0 <= yylocp->first_line) - { - res += YYFPRINTF (yyo, "%d", yylocp->first_line); - if (0 <= yylocp->first_column) - res += YYFPRINTF (yyo, ".%d", yylocp->first_column); - } - if (0 <= yylocp->last_line) - { - if (yylocp->first_line < yylocp->last_line) - { - res += YYFPRINTF (yyo, "-%d", yylocp->last_line); - if (0 <= end_col) - res += YYFPRINTF (yyo, ".%d", end_col); - } - else if (0 <= end_col && yylocp->first_column < end_col) - res += YYFPRINTF (yyo, "-%d", end_col); - } - return res; - } - -# define YY_LOCATION_PRINT(File, Loc) \ - yy_location_print_ (File, &(Loc)) - -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif -#endif - - -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ -do { \ - if (yydebug) \ - { \ - YYFPRINTF (stderr, "%s ", Title); \ - yy_symbol_print (stderr, \ - Type, Value, Location, context); \ - YYFPRINTF (stderr, "\n"); \ - } \ -} while (0) - - -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ - -static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, Smt2newContext* context) -{ - FILE *yyo = yyoutput; - YYUSE (yyo); - YYUSE (yylocationp); - YYUSE (context); - if (!yyvaluep) - return; -# ifdef YYPRINT - if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - YYUSE (yytype); -} - - -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ - -static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp, Smt2newContext* context) -{ - YYFPRINTF (yyoutput, "%s %s (", - yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - - YY_LOCATION_PRINT (yyoutput, *yylocationp); - YYFPRINTF (yyoutput, ": "); - yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp, context); - YYFPRINTF (yyoutput, ")"); -} - -/*------------------------------------------------------------------. -| yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (included). | -`------------------------------------------------------------------*/ - -static void -yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop) -{ - YYFPRINTF (stderr, "Stack now"); - for (; yybottom <= yytop; yybottom++) - { - int yybot = *yybottom; - YYFPRINTF (stderr, " %d", yybot); - } - YYFPRINTF (stderr, "\n"); -} - -# define YY_STACK_PRINT(Bottom, Top) \ -do { \ - if (yydebug) \ - yy_stack_print ((Bottom), (Top)); \ -} while (0) - - -/*------------------------------------------------. -| Report that the YYRULE is going to be reduced. | -`------------------------------------------------*/ - -static void -yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule, Smt2newContext* context) -{ - unsigned long int yylno = yyrline[yyrule]; - int yynrhs = yyr2[yyrule]; - int yyi; - YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", - yyrule - 1, yylno); - /* The symbols being reduced. */ - for (yyi = 0; yyi < yynrhs; yyi++) - { - YYFPRINTF (stderr, " $%d = ", yyi + 1); - yy_symbol_print (stderr, - yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) - , &(yylsp[(yyi + 1) - (yynrhs)]) , context); - YYFPRINTF (stderr, "\n"); - } -} - -# define YY_REDUCE_PRINT(Rule) \ -do { \ - if (yydebug) \ - yy_reduce_print (yyssp, yyvsp, yylsp, Rule, context); \ -} while (0) - -/* Nonzero means print parse trace. It is left uninitialized so that - multiple parsers can coexist. */ -int yydebug; -#else /* !YYDEBUG */ -# define YYDPRINTF(Args) -# define YY_SYMBOL_PRINT(Title, Type, Value, Location) -# define YY_STACK_PRINT(Bottom, Top) -# define YY_REDUCE_PRINT(Rule) -#endif /* !YYDEBUG */ - - -/* YYINITDEPTH -- initial size of the parser's stacks. */ -#ifndef YYINITDEPTH -# define YYINITDEPTH 200 -#endif - -/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only - if the built-in stack extension method is used). - - Do not make this value too large; the results are undefined if - YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) - evaluated with infinite-precision integer arithmetic. */ - -#ifndef YYMAXDEPTH -# define YYMAXDEPTH 10000 -#endif - - -#if YYERROR_VERBOSE - -# ifndef yystrlen -# if defined __GLIBC__ && defined _STRING_H -# define yystrlen strlen -# else -/* Return the length of YYSTR. */ -static YYSIZE_T -yystrlen (const char *yystr) -{ - YYSIZE_T yylen; - for (yylen = 0; yystr[yylen]; yylen++) - continue; - return yylen; -} -# endif -# endif - -# ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE -# define yystpcpy stpcpy -# else -/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in - YYDEST. */ -static char * -yystpcpy (char *yydest, const char *yysrc) -{ - char *yyd = yydest; - const char *yys = yysrc; - - while ((*yyd++ = *yys++) != '\0') - continue; - - return yyd - 1; -} -# endif -# endif - -# ifndef yytnamerr -/* Copy to YYRES the contents of YYSTR after stripping away unnecessary - quotes and backslashes, so that it's suitable for yyerror. The - heuristic is that double-quoting is unnecessary unless the string - contains an apostrophe, a comma, or backslash (other than - backslash-backslash). YYSTR is taken from yytname. If YYRES is - null, do not copy; instead, return the length of what the result - would have been. */ -static YYSIZE_T -yytnamerr (char *yyres, const char *yystr) -{ - if (*yystr == '"') - { - YYSIZE_T yyn = 0; - char const *yyp = yystr; - - for (;;) - switch (*++yyp) - { - case '\'': - case ',': - goto do_not_strip_quotes; - - case '\\': - if (*++yyp != '\\') - goto do_not_strip_quotes; - /* Fall through. */ - default: - if (yyres) - yyres[yyn] = *yyp; - yyn++; - break; - - case '"': - if (yyres) - yyres[yyn] = '\0'; - return yyn; - } - do_not_strip_quotes: ; - } - - if (! yyres) - return yystrlen (yystr); - - return yystpcpy (yyres, yystr) - yyres; -} -# endif - -/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message - about the unexpected token YYTOKEN for the state stack whose top is - YYSSP. - - Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is - not large enough to hold the message. In that case, also set - *YYMSG_ALLOC to the required number of bytes. Return 2 if the - required number of bytes is too large to store. */ -static int -yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, - yytype_int16 *yyssp, int yytoken) -{ - YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); - YYSIZE_T yysize = yysize0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - /* Internationalized format string. */ - const char *yyformat = YY_NULLPTR; - /* Arguments of yyformat. */ - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - /* Number of reported tokens (one for the "unexpected", one per - "expected"). */ - int yycount = 0; - - /* There are many possibilities here to consider: - - If this state is a consistent state with a default action, then - the only way this function was invoked is if the default action - is an error action. In that case, don't check for expected - tokens because there are none. - - The only way there can be no lookahead present (in yychar) is if - this state is a consistent state with a default action. Thus, - detecting the absence of a lookahead is sufficient to determine - that there is no unexpected or expected token to report. In that - case, just report a simple "syntax error". - - Don't assume there isn't a lookahead just because this state is a - consistent state with a default action. There might have been a - previous inconsistent state, consistent state with a non-default - action, or user semantic action that manipulated yychar. - - Of course, the expected token list depends on states to have - correct lookahead information, and it depends on the parser not - to perform extra reductions after fetching a lookahead from the - scanner and before detecting a syntax error. Thus, state merging - (from LALR or IELR) and default reductions corrupt the expected - token list. However, the list is correct for canonical LR with - one exception: it will still contain any token that will not be - accepted due to an error action in a later state. - */ - if (yytoken != YYEMPTY) - { - int yyn = yypact[*yyssp]; - yyarg[yycount++] = yytname[yytoken]; - if (!yypact_value_is_default (yyn)) - { - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. In other words, skip the first -YYN actions for - this state because they are default actions. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yyx; - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR - && !yytable_value_is_error (yytable[yyx + yyn])) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - break; - } - yyarg[yycount++] = yytname[yyx]; - { - YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - } - } - } - - switch (yycount) - { -# define YYCASE_(N, S) \ - case N: \ - yyformat = S; \ - break - YYCASE_(0, YY_("syntax error")); - YYCASE_(1, YY_("syntax error, unexpected %s")); - YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); - YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); - YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); - YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); -# undef YYCASE_ - } - - { - YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) - return 2; - yysize = yysize1; - } - - if (*yymsg_alloc < yysize) - { - *yymsg_alloc = 2 * yysize; - if (! (yysize <= *yymsg_alloc - && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) - *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; - return 1; - } - - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - { - char *yyp = *yymsg; - int yyi = 0; - while ((*yyp = *yyformat) != '\0') - if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyformat += 2; - } - else - { - yyp++; - yyformat++; - } - } - return 0; -} -#endif /* YYERROR_VERBOSE */ - -/*-----------------------------------------------. -| Release the memory associated to this symbol. | -`-----------------------------------------------*/ - -static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp, Smt2newContext* context) -{ - YYUSE (yyvaluep); - YYUSE (yylocationp); - YYUSE (context); - if (!yymsg) - yymsg = "Deleting"; - YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); - - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - YYUSE (yytype); - YY_IGNORE_MAYBE_UNINITIALIZED_END -} - - - - -/*----------. -| yyparse. | -`----------*/ - -int -yyparse (Smt2newContext* context) -{ -/* The lookahead symbol. */ -int yychar; - - -/* The semantic value of the lookahead symbol. */ -/* Default value used for initialization, for pacifying older GCCs - or non-GCC compilers. */ -YY_INITIAL_VALUE (static YYSTYPE yyval_default;) -YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); - -/* Location data for the lookahead symbol. */ -static YYLTYPE yyloc_default -# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL - = { 1, 1, 1, 1 } -# endif -; -YYLTYPE yylloc = yyloc_default; - - /* Number of syntax errors so far. */ - int yynerrs; - - int yystate; - /* Number of tokens to shift before error messages enabled. */ - int yyerrstatus; - - /* The stacks and their tools: - 'yyss': related to states. - 'yyvs': related to semantic values. - 'yyls': related to locations. - - Refer to the stacks through separate pointers, to allow yyoverflow - to reallocate them elsewhere. */ - - /* The state stack. */ - yytype_int16 yyssa[YYINITDEPTH]; - yytype_int16 *yyss; - yytype_int16 *yyssp; - - /* The semantic value stack. */ - YYSTYPE yyvsa[YYINITDEPTH]; - YYSTYPE *yyvs; - YYSTYPE *yyvsp; - - /* The location stack. */ - YYLTYPE yylsa[YYINITDEPTH]; - YYLTYPE *yyls; - YYLTYPE *yylsp; - - /* The locations where the error started and ended. */ - YYLTYPE yyerror_range[3]; - - YYSIZE_T yystacksize; - - int yyn; - int yyresult; - /* Lookahead token as an internal (translated) token number. */ - int yytoken = 0; - /* The variables used to return semantic value and location from the - action routines. */ - YYSTYPE yyval; - YYLTYPE yyloc; - -#if YYERROR_VERBOSE - /* Buffer for error messages, and its allocated size. */ - char yymsgbuf[128]; - char *yymsg = yymsgbuf; - YYSIZE_T yymsg_alloc = sizeof yymsgbuf; -#endif - -#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N), yylsp -= (N)) - - /* The number of symbols on the RHS of the reduced rule. - Keep to zero when no symbol should be popped. */ - int yylen = 0; - - yyssp = yyss = yyssa; - yyvsp = yyvs = yyvsa; - yylsp = yyls = yylsa; - yystacksize = YYINITDEPTH; - - YYDPRINTF ((stderr, "Starting parse\n")); - - yystate = 0; - yyerrstatus = 0; - yynerrs = 0; - yychar = YYEMPTY; /* Cause a token to be read. */ - yylsp[0] = yylloc; - goto yysetstate; - -/*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | -`------------------------------------------------------------*/ - yynewstate: - /* In all cases, when you get here, the value and location stacks - have just been pushed. So pushing a state here evens the stacks. */ - yyssp++; - - yysetstate: - *yyssp = yystate; - - if (yyss + yystacksize - 1 <= yyssp) - { - /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; - -#ifdef yyoverflow - { - /* Give user a chance to reallocate the stack. Use copies of - these so that the &'s don't force the real ones into - memory. */ - YYSTYPE *yyvs1 = yyvs; - yytype_int16 *yyss1 = yyss; - YYLTYPE *yyls1 = yyls; - - /* Each stack pointer address is followed by the size of the - data in use in that stack, in bytes. This used to be a - conditional around just the two extra args, but that might - be undefined if yyoverflow is a macro. */ - yyoverflow (YY_("memory exhausted"), - &yyss1, yysize * sizeof (*yyssp), - &yyvs1, yysize * sizeof (*yyvsp), - &yyls1, yysize * sizeof (*yylsp), - &yystacksize); - - yyls = yyls1; - yyss = yyss1; - yyvs = yyvs1; - } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else - /* Extend the stack our own way. */ - if (YYMAXDEPTH <= yystacksize) - goto yyexhaustedlab; - yystacksize *= 2; - if (YYMAXDEPTH < yystacksize) - yystacksize = YYMAXDEPTH; - - { - yytype_int16 *yyss1 = yyss; - union yyalloc *yyptr = - (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); - if (! yyptr) - goto yyexhaustedlab; - YYSTACK_RELOCATE (yyss_alloc, yyss); - YYSTACK_RELOCATE (yyvs_alloc, yyvs); - YYSTACK_RELOCATE (yyls_alloc, yyls); -# undef YYSTACK_RELOCATE - if (yyss1 != yyssa) - YYSTACK_FREE (yyss1); - } -# endif -#endif /* no yyoverflow */ - - yyssp = yyss + yysize - 1; - yyvsp = yyvs + yysize - 1; - yylsp = yyls + yysize - 1; - - YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); - - if (yyss + yystacksize - 1 <= yyssp) - YYABORT; - } - - YYDPRINTF ((stderr, "Entering state %d\n", yystate)); - - if (yystate == YYFINAL) - YYACCEPT; - - goto yybackup; - -/*-----------. -| yybackup. | -`-----------*/ -yybackup: - - /* Do appropriate processing given the current state. Read a - lookahead token if we need one and don't already have one. */ - - /* First try to decide what to do without reference to lookahead token. */ - yyn = yypact[yystate]; - if (yypact_value_is_default (yyn)) - goto yydefault; - - /* Not known => get a lookahead token if don't already have one. */ - - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ - if (yychar == YYEMPTY) - { - YYDPRINTF ((stderr, "Reading a token: ")); - yychar = yylex (&yylval, &yylloc, scanner); - } - - if (yychar <= YYEOF) - { - yychar = yytoken = YYEOF; - YYDPRINTF ((stderr, "Now at end of input.\n")); - } - else - { - yytoken = YYTRANSLATE (yychar); - YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); - } - - /* If the proper action on seeing token YYTOKEN is to reduce or to - detect an error, take that action. */ - yyn += yytoken; - if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) - goto yydefault; - yyn = yytable[yyn]; - if (yyn <= 0) - { - if (yytable_value_is_error (yyn)) - goto yyerrlab; - yyn = -yyn; - goto yyreduce; - } - - /* Count tokens shifted since error; after three, turn off error - status. */ - if (yyerrstatus) - yyerrstatus--; - - /* Shift the lookahead token. */ - YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); - - /* Discard the shifted token. */ - yychar = YYEMPTY; - - yystate = yyn; - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - *++yyvsp = yylval; - YY_IGNORE_MAYBE_UNINITIALIZED_END - *++yylsp = yylloc; - goto yynewstate; - - -/*-----------------------------------------------------------. -| yydefault -- do the default action for the current state. | -`-----------------------------------------------------------*/ -yydefault: - yyn = yydefact[yystate]; - if (yyn == 0) - goto yyerrlab; - goto yyreduce; - - -/*-----------------------------. -| yyreduce -- Do a reduction. | -`-----------------------------*/ -yyreduce: - /* yyn is the number of a rule to reduce with. */ - yylen = yyr2[yyn]; - - /* If YYLEN is nonzero, implement the default value of the action: - '$$ = $1'. - - Otherwise, the following line sets YYVAL to garbage. - This behavior is undocumented and Bison - users should not rely upon it. Assigning to YYVAL - unconditionally makes the parser a bit smaller, and it avoids a - GCC warning that YYVAL may be used uninitialized. */ - yyval = yyvsp[1-yylen]; - - /* Default location. */ - YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); - YY_REDUCE_PRINT (yyn); - switch (yyn) - { - case 2: -#line 97 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { ASTNode *n = new ASTNode(CMDL_T, strdup("main-script")); n->children = (yyvsp[0].snode_list); context->insertRoot(n); } -#line 1642 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 3: -#line 101 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode_list) = new std::list(); } -#line 1648 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 4: -#line 103 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (*(yyvsp[-1].snode_list)).push_back((yyvsp[0].snode)); (yyval.snode_list) = (yyvsp[-1].snode_list); } -#line 1654 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 5: -#line 107 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(SYM_T, (yyvsp[-1].str))); - } -#line 1664 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 6: -#line 113 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 1674 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 7: -#line 119 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 1684 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 8: -#line 125 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-3].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(SYM_T, (yyvsp[-2].str))); - (yyval.snode)->children->push_back(new ASTNode(NUM_T, (yyvsp[-1].str))); - } -#line 1695 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 9: -#line 132 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-6].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(SYM_T, (yyvsp[-5].str))); - - ASTNode* syml = new ASTNode(SYML_T, NULL); - syml->children = (yyvsp[-3].snode_list); - (yyval.snode)->children->push_back(syml); - - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 1711 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 10: -#line 145 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-6].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(SYM_T, (yyvsp[-5].str))); - - ASTNode* sortl = new ASTNode(SORTL_T, NULL); - sortl->children = (yyvsp[-3].snode_list); - (yyval.snode)->children->push_back(sortl); - - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 1727 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 11: -#line 157 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-5].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[-4].snode)); - - ASTNode* sortl = new ASTNode(SORTL_T, NULL); - sortl->children = new std::list(); - (yyval.snode)->children->push_back(sortl); - - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 1743 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 12: -#line 169 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-7].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(SYM_T, (yyvsp[-6].str))); - - ASTNode* svl = new ASTNode(SVL_T, NULL); - svl->children = (yyvsp[-4].snode_list); - (yyval.snode)->children->push_back(svl); - - (yyval.snode)->children->push_back((yyvsp[-2].snode)); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 1760 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 13: -#line 182 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(NUM_T, (yyvsp[-1].str))); - } -#line 1770 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 14: -#line 188 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(NUM_T, (yyvsp[-1].str))); - } -#line 1780 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 15: -#line 194 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 1790 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 16: -#line 200 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-1].tok)); - } -#line 1798 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 17: -#line 204 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-1].tok)); - } -#line 1806 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 18: -#line 208 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-1].tok)); - } -#line 1814 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 19: -#line 212 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-1].tok)); - } -#line 1822 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 20: -#line 216 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(UATTR_T, (yyvsp[-1].str))); - } -#line 1832 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 21: -#line 222 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(UATTR_T, (yyvsp[-1].str))); - } -#line 1842 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 22: -#line 228 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(UATTR_T, (yyvsp[-1].str))); - } -#line 1852 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 23: -#line 234 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-1].tok)); - } -#line 1860 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 24: -#line 238 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-5].tok)); - (yyval.snode)->children = (yyvsp[-2].snode_list); - (yyval.snode)->children->push_front((yyvsp[-3].snode)); - } -#line 1870 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 25: -#line 244 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-1].tok)); - } -#line 1878 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 26: -#line 248 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(UATTR_T, (yyvsp[-1].str))); - } -#line 1888 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 27: -#line 254 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(PATTR_T, (yyvsp[-1].str))); - } -#line 1898 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 28: -#line 260 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-2].tok)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 1908 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 29: -#line 266 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-1].tok)); - } -#line 1916 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 30: -#line 270 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(CMD_T, (yyvsp[-1].tok)); } -#line 1922 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 31: -#line 274 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode_list) = new std::list(); } -#line 1928 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 32: -#line 276 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyvsp[-1].snode_list)->push_back((yyvsp[0].snode)); (yyval.snode_list) = (yyvsp[-1].snode_list); } -#line 1934 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 33: -#line 280 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(UATTR_T, (yyvsp[0].str)); } -#line 1940 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 34: -#line 282 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(UATTR_T, (yyvsp[-1].str)); (yyval.snode)->children = new std::list(); (yyval.snode)->children->push_back((yyvsp[0].snode)); } -#line 1946 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 35: -#line 284 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(PATTR_T, (yyvsp[0].str)); } -#line 1952 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 36: -#line 286 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(PATTR_T, (yyvsp[-1].str)); (yyval.snode)->children = new std::list(); (yyval.snode)->children->push_back((yyvsp[0].snode)); } -#line 1958 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 37: -#line 290 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(SPECC_T, NULL); (yyval.snode)->children = new std::list(); (yyval.snode)->children->push_back((yyvsp[0].snode)); } -#line 1964 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 38: -#line 292 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(SYM_T, (yyvsp[0].str)); - } -#line 1972 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 39: -#line 296 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(SEXPRL_T, NULL); - (yyval.snode)->children = (yyvsp[-1].snode_list); - } -#line 1981 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 40: -#line 303 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(SYM_T, (yyvsp[0].str)); } -#line 1987 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 41: -#line 305 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(SYM_T, (yyvsp[-2].str)); (yyval.snode)->children = (yyvsp[-1].snode_list); } -#line 1993 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 42: -#line 309 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(ID_T, NULL); (yyval.snode)->children = new std::list(); (yyval.snode)->children->push_back((yyvsp[0].snode)); } -#line 1999 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 43: -#line 311 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(LID_T, NULL); - (yyval.snode)->children = (yyvsp[-1].snode_list); - (yyval.snode)->children->push_front((yyvsp[-2].snode)); - } -#line 2009 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 44: -#line 319 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyvsp[-1].snode_list)->push_back((yyvsp[0].snode)); (yyval.snode_list) = (yyvsp[-1].snode_list); } -#line 2015 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 45: -#line 321 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode_list) = new std::list(); } -#line 2021 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 46: -#line 325 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(SPECC_T, NULL); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2031 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 47: -#line 331 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(SYM_T, (yyvsp[0].str)); - } -#line 2039 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 48: -#line 335 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(UATTR_T, (yyvsp[0].str)); - } -#line 2047 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 49: -#line 339 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(SEXPRL_T, NULL); - (yyval.snode)->children = (yyvsp[-1].snode_list); - } -#line 2056 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 50: -#line 346 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode_list) = new std::list(); - } -#line 2064 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 51: -#line 350 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyvsp[-1].snode_list)->push_back((yyvsp[0].snode)); - (yyval.snode_list) = (yyvsp[-1].snode_list); - } -#line 2073 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 52: -#line 358 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(NUM_T, (yyvsp[0].str)); } -#line 2079 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 53: -#line 360 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(DEC_T, (yyvsp[0].str)); } -#line 2085 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 54: -#line 362 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(HEX_T, (yyvsp[0].str)); } -#line 2091 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 55: -#line 364 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(BIN_T, (yyvsp[0].str)); } -#line 2097 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 56: -#line 366 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(STR_T, (yyvsp[0].str)); } -#line 2103 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 57: -#line 370 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(SYM_T, (yyvsp[0].str)); } -#line 2109 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 58: -#line 372 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = (yyvsp[0].snode); } -#line 2115 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 59: -#line 376 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyvsp[-1].snode_list)->push_back(new ASTNode(NUM_T, (yyvsp[0].str))); (yyval.snode_list) = (yyvsp[-1].snode_list); } -#line 2121 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 60: -#line 378 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode_list) = new std::list(); (yyval.snode_list)->push_back(new ASTNode(NUM_T, (yyvsp[0].str))); } -#line 2127 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 61: -#line 382 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = (yyvsp[0].snode); } -#line 2133 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 62: -#line 384 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(AS_T, NULL); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[-2].snode)); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 2144 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 63: -#line 393 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode_list) = new std::list(); } -#line 2150 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 64: -#line 395 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyvsp[-1].snode_list)->push_back((yyvsp[0].snode)); (yyval.snode_list) = (yyvsp[-1].snode_list); } -#line 2156 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 65: -#line 399 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(VARB_T, (yyvsp[-2].str)); (yyval.snode)->children = new std::list(); (yyval.snode)->children->push_back((yyvsp[-1].snode)); } -#line 2162 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 66: -#line 403 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode_list) = new std::list(); } -#line 2168 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 67: -#line 405 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyvsp[-1].snode_list)->push_back((yyvsp[0].snode)); (yyval.snode_list) = (yyvsp[-1].snode_list); } -#line 2174 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 68: -#line 409 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(SV_T, (yyvsp[-2].str)); (yyval.snode)->children = new std::list(); (yyval.snode)->children->push_back((yyvsp[-1].snode)); } -#line 2180 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 69: -#line 412 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode_list) = new std::list(); } -#line 2186 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 70: -#line 414 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyvsp[-1].snode_list)->push_back((yyvsp[0].snode)); (yyval.snode_list) = (yyvsp[-1].snode_list); } -#line 2192 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 71: -#line 418 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(TERM_T, NULL); (yyval.snode)->children = new std::list(); (yyval.snode)->children->push_back((yyvsp[0].snode)); } -#line 2198 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 72: -#line 420 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(QID_T, NULL); (yyval.snode)->children = new std::list(); (yyval.snode)->children->push_back((yyvsp[0].snode)); } -#line 2204 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 73: -#line 422 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(LQID_T, NULL); - (yyval.snode)->children = (yyvsp[-1].snode_list); - (yyval.snode)->children->push_front((yyvsp[-2].snode)); - (yyval.snode)->children->push_front((yyvsp[-3].snode)); - } -#line 2215 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 74: -#line 429 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(LET_T, NULL); - (yyval.snode)->children = new std::list(); - (yyvsp[-3].snode_list)->push_front((yyvsp[-4].snode)); - ASTNode* vbl = new ASTNode(VARBL_T, NULL); - vbl->children = (yyvsp[-3].snode_list); - (yyval.snode)->children->push_back(vbl); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 2229 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 75: -#line 439 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(FORALL_T, NULL); - (yyval.snode)->children = new std::list(); - (yyvsp[-3].snode_list)->push_front((yyvsp[-4].snode)); - ASTNode* svl = new ASTNode(SVL_T, NULL); - svl->children = (yyvsp[-3].snode_list); - (yyval.snode)->children->push_back(svl); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 2243 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 76: -#line 449 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(EXISTS_T, NULL); - (yyval.snode)->children = new std::list(); - (yyvsp[-3].snode_list)->push_front((yyvsp[-4].snode)); - ASTNode* svl = new ASTNode(SVL_T, NULL); - svl->children = (yyvsp[-3].snode_list); - (yyval.snode)->children->push_back(svl); - (yyval.snode)->children->push_back((yyvsp[-1].snode)); - } -#line 2257 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 77: -#line 459 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(BANG_T, NULL); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_front((yyvsp[-3].snode)); - ASTNode *atrs = new ASTNode(GATTRL_T, NULL); - (yyvsp[-1].snode_list)->push_front((yyvsp[-2].snode)); - atrs->children = (yyvsp[-1].snode_list); - (yyval.snode)->children->push_back(atrs); - } -#line 2271 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 78: -#line 535 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode_list) = new std::list(); } -#line 2277 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 79: -#line 537 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyvsp[-1].snode_list)->push_back(new ASTNode(SYM_T, (yyvsp[0].str))); (yyval.snode_list) = (yyvsp[-1].snode_list); } -#line 2283 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 80: -#line 694 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - if (strcmp((yyvsp[0].str), "true") == 0) - (yyval.snode) = new ASTNode(BOOL_T, strdup("true")); - else if (strcmp((yyvsp[0].str), "false") == 0) - (yyval.snode) = new ASTNode(BOOL_T, strdup("false")); - else { - printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", (yyvsp[0].str)); - YYERROR; - } - } -#line 2298 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 81: -#line 707 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2308 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 82: -#line 713 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2318 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 83: -#line 719 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2328 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 84: -#line 725 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2338 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 85: -#line 731 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2348 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 86: -#line 737 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2358 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 87: -#line 743 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2368 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 88: -#line 749 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(STR_T, (yyvsp[0].str))); - } -#line 2378 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 89: -#line 755 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(STR_T, (yyvsp[0].str))); - } -#line 2388 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 90: -#line 761 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(NUM_T, (yyvsp[0].str))); - } -#line 2398 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 91: -#line 767 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, (yyvsp[-1].str)); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(NUM_T, (yyvsp[0].str))); - } -#line 2408 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 92: -#line 773 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(OPTION_T, NULL); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back((yyvsp[0].snode)); - } -#line 2418 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 93: -#line 781 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2424 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 94: -#line 783 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2430 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 95: -#line 785 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2436 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 96: -#line 787 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2442 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 97: -#line 789 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2448 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 98: -#line 791 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2454 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 99: -#line 793 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2460 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 100: -#line 795 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2466 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 101: -#line 797 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2472 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 102: -#line 799 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2478 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 103: -#line 801 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2484 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 104: -#line 803 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2490 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 105: -#line 805 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2496 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 106: -#line 807 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2502 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 107: -#line 809 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2508 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 108: -#line 811 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2514 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 109: -#line 813 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2520 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 110: -#line 815 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2526 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 111: -#line 817 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2532 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 112: -#line 819 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2538 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 113: -#line 821 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2544 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 114: -#line 823 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2550 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 115: -#line 825 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2556 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 116: -#line 827 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2562 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 117: -#line 829 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2568 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 118: -#line 831 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2574 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 119: -#line 833 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2580 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 120: -#line 835 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2586 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 121: -#line 837 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.str) = (yyvsp[0].str); } -#line 2592 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 122: -#line 841 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(INFO_T, (yyvsp[0].str)); } -#line 2598 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 123: -#line 843 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(INFO_T, (yyvsp[0].str)); } -#line 2604 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 124: -#line 845 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(INFO_T, (yyvsp[0].str)); } -#line 2610 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 125: -#line 847 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(INFO_T, (yyvsp[0].str)); } -#line 2616 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 126: -#line 849 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(INFO_T, (yyvsp[0].str)); } -#line 2622 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 127: -#line 851 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(INFO_T, (yyvsp[0].str)); } -#line 2628 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 128: -#line 853 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { (yyval.snode) = new ASTNode(INFO_T, (yyvsp[0].str)); } -#line 2634 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - case 129: -#line 855 "smt2new/smt2newparser.yy" /* yacc.c:1646 */ - { - (yyval.snode) = new ASTNode(INFO_T, NULL); - (yyval.snode)->children = new std::list(); - (yyval.snode)->children->push_back(new ASTNode(GATTR_T, (yyvsp[0].str))); - } -#line 2644 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - break; - - -#line 2648 "smt2new/smt2newparser.cc" /* yacc.c:1646 */ - default: break; - } - /* User semantic actions sometimes alter yychar, and that requires - that yytoken be updated with the new translation. We take the - approach of translating immediately before every use of yytoken. - One alternative is translating here after every semantic action, - but that translation would be missed if the semantic action invokes - YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or - if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an - incorrect destructor might then be invoked immediately. In the - case of YYERROR or YYBACKUP, subsequent parser actions might lead - to an incorrect destructor call or verbose syntax error message - before the lookahead is translated. */ - YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); - - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - - *++yyvsp = yyval; - *++yylsp = yyloc; - - /* Now 'shift' the result of the reduction. Determine what state - that goes to, based on the state we popped back to and the rule - number reduced by. */ - - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; - - goto yynewstate; - - -/*--------------------------------------. -| yyerrlab -- here on detecting error. | -`--------------------------------------*/ -yyerrlab: - /* Make sure we have latest lookahead translation. See comments at - user semantic actions for why this is necessary. */ - yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); - - /* If not already recovering from an error, report this error. */ - if (!yyerrstatus) - { - ++yynerrs; -#if ! YYERROR_VERBOSE - yyerror (&yylloc, context, YY_("syntax error")); -#else -# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ - yyssp, yytoken) - { - char const *yymsgp = YY_("syntax error"); - int yysyntax_error_status; - yysyntax_error_status = YYSYNTAX_ERROR; - if (yysyntax_error_status == 0) - yymsgp = yymsg; - else if (yysyntax_error_status == 1) - { - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); - if (!yymsg) - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - yysyntax_error_status = 2; - } - else - { - yysyntax_error_status = YYSYNTAX_ERROR; - yymsgp = yymsg; - } - } - yyerror (&yylloc, context, yymsgp); - if (yysyntax_error_status == 2) - goto yyexhaustedlab; - } -# undef YYSYNTAX_ERROR -#endif - } - - yyerror_range[1] = yylloc; - - if (yyerrstatus == 3) - { - /* If just tried and failed to reuse lookahead token after an - error, discard it. */ - - if (yychar <= YYEOF) - { - /* Return failure if at end of input. */ - if (yychar == YYEOF) - YYABORT; - } - else - { - yydestruct ("Error: discarding", - yytoken, &yylval, &yylloc, context); - yychar = YYEMPTY; - } - } - - /* Else will try to reuse lookahead token after shifting the error - token. */ - goto yyerrlab1; - - -/*---------------------------------------------------. -| yyerrorlab -- error raised explicitly by YYERROR. | -`---------------------------------------------------*/ -yyerrorlab: - - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - - yyerror_range[1] = yylsp[1-yylen]; - /* Do not reclaim the symbols of the rule whose action triggered - this YYERROR. */ - YYPOPSTACK (yylen); - yylen = 0; - YY_STACK_PRINT (yyss, yyssp); - yystate = *yyssp; - goto yyerrlab1; - - -/*-------------------------------------------------------------. -| yyerrlab1 -- common code for both syntax error and YYERROR. | -`-------------------------------------------------------------*/ -yyerrlab1: - yyerrstatus = 3; /* Each real token shifted decrements this. */ - - for (;;) - { - yyn = yypact[yystate]; - if (!yypact_value_is_default (yyn)) - { - yyn += YYTERROR; - if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) - { - yyn = yytable[yyn]; - if (0 < yyn) - break; - } - } - - /* Pop the current state because it cannot handle the error token. */ - if (yyssp == yyss) - YYABORT; - - yyerror_range[1] = *yylsp; - yydestruct ("Error: popping", - yystos[yystate], yyvsp, yylsp, context); - YYPOPSTACK (1); - yystate = *yyssp; - YY_STACK_PRINT (yyss, yyssp); - } - - YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN - *++yyvsp = yylval; - YY_IGNORE_MAYBE_UNINITIALIZED_END - - yyerror_range[2] = yylloc; - /* Using YYLLOC is tempting, but would change the location of - the lookahead. YYLOC is available though. */ - YYLLOC_DEFAULT (yyloc, yyerror_range, 2); - *++yylsp = yyloc; - - /* Shift the error token. */ - YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); - - yystate = yyn; - goto yynewstate; - - -/*-------------------------------------. -| yyacceptlab -- YYACCEPT comes here. | -`-------------------------------------*/ -yyacceptlab: - yyresult = 0; - goto yyreturn; - -/*-----------------------------------. -| yyabortlab -- YYABORT comes here. | -`-----------------------------------*/ -yyabortlab: - yyresult = 1; - goto yyreturn; - -#if !defined yyoverflow || YYERROR_VERBOSE -/*-------------------------------------------------. -| yyexhaustedlab -- memory exhaustion comes here. | -`-------------------------------------------------*/ -yyexhaustedlab: - yyerror (&yylloc, context, YY_("memory exhausted")); - yyresult = 2; - /* Fall through. */ -#endif - -yyreturn: - if (yychar != YYEMPTY) - { - /* Make sure we have latest lookahead translation. See comments at - user semantic actions for why this is necessary. */ - yytoken = YYTRANSLATE (yychar); - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval, &yylloc, context); - } - /* Do not reclaim the symbols of the rule whose action triggered - this YYABORT or YYACCEPT. */ - YYPOPSTACK (yylen); - YY_STACK_PRINT (yyss, yyssp); - while (yyssp != yyss) - { - yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp, yylsp, context); - YYPOPSTACK (1); - } -#ifndef yyoverflow - if (yyss != yyssa) - YYSTACK_FREE (yyss); -#endif -#if YYERROR_VERBOSE - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); -#endif - return yyresult; -} -#line 862 "smt2new/smt2newparser.yy" /* yacc.c:1906 */ - - -//======================================================================================= -// Auxiliary Routines - diff --git a/src/parsers/smt2new/smt2newparser.hh b/src/parsers/smt2new/smt2newparser.hh deleted file mode 100644 index 9cbb1ec9c..000000000 --- a/src/parsers/smt2new/smt2newparser.hh +++ /dev/null @@ -1,160 +0,0 @@ -/* A Bison parser, made by GNU Bison 3.0.4. */ - -/* Bison interface for Yacc-like parsers in C - - Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* As a special exception, you may create a larger work that contains - part or all of the Bison parser skeleton and distribute that work - under terms of your choice, so long as that work isn't itself a - parser generator using the skeleton or a modified version thereof - as a parser skeleton. Alternatively, if you modify or redistribute - the parser skeleton itself, you may (at your option) remove this - special exception, which will cause the skeleton and the resulting - Bison output files to be licensed under the GNU General Public - License without this special exception. - - This special exception was added by the Free Software Foundation in - version 2.2 of Bison. */ - -#ifndef YY_SMT2NEW_SMT2NEW_SMT2NEWPARSER_HH_INCLUDED -# define YY_SMT2NEW_SMT2NEW_SMT2NEWPARSER_HH_INCLUDED -/* Debug traces. */ -#ifndef YYDEBUG -# define YYDEBUG 0 -#endif -#if YYDEBUG -extern int smt2newdebug; -#endif - -/* Token type. */ -#ifndef YYTOKENTYPE -# define YYTOKENTYPE - enum yytokentype - { - TK_AS = 258, - TK_DECIMAL = 259, - TK_EXISTS = 260, - TK_FORALL = 261, - TK_LET = 262, - TK_NUMERAL = 263, - TK_PAR = 264, - TK_STRING = 265, - TK_ASSERT = 266, - TK_CHECKSAT = 267, - TK_DECLARESORT = 268, - TK_DECLAREFUN = 269, - TK_DECLARECONST = 270, - TK_DEFINESORT = 271, - TK_DEFINEFUN = 272, - TK_EXIT = 273, - TK_GETASSERTIONS = 274, - TK_GETASSIGNMENT = 275, - TK_GETINFO = 276, - TK_GETOPTION = 277, - TK_GETPROOF = 278, - TK_GETUNSATCORE = 279, - TK_GETVALUE = 280, - TK_POP = 281, - TK_PUSH = 282, - TK_SETLOGIC = 283, - TK_SETINFO = 284, - TK_SETOPTION = 285, - TK_THEORY = 286, - TK_GETITPS = 287, - TK_WRSTATE = 288, - TK_RDSTATE = 289, - TK_SIMPLIFY = 290, - TK_WRFUNS = 291, - TK_NUM = 292, - TK_SYM = 293, - TK_KEY = 294, - TK_STR = 295, - TK_DEC = 296, - TK_HEX = 297, - TK_BIN = 298, - KW_SORTS = 299, - KW_FUNS = 300, - KW_SORTSDESCRIPTION = 301, - KW_FUNSDESCRIPTION = 302, - KW_DEFINITION = 303, - KW_NOTES = 304, - KW_THEORIES = 305, - KW_LANGUAGE = 306, - KW_EXTENSIONS = 307, - KW_VALUES = 308, - KW_PRINTSUCCESS = 309, - KW_EXPANDDEFINITIONS = 310, - KW_INTERACTIVEMODE = 311, - KW_PRODUCEPROOFS = 312, - KW_PRODUCEUNSATCORES = 313, - KW_PRODUCEMODELS = 314, - KW_PRODUCEASSIGNMENTS = 315, - KW_REGULAROUTPUTCHANNEL = 316, - KW_DIAGNOSTICOUTPUTCHANNEL = 317, - KW_RANDOMSEED = 318, - KW_VERBOSITY = 319, - KW_ERRORBEHAVIOR = 320, - KW_NAME = 321, - KW_NAMED = 322, - KW_AUTHORS = 323, - KW_VERSION = 324, - KW_STATUS = 325, - KW_REASONUNKNOWN = 326, - KW_ALLSTATISTICS = 327 - }; -#endif - -/* Value type. */ -#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED - -union YYSTYPE -{ -#line 66 "smt2new/smt2newparser.yy" /* yacc.c:1909 */ - - char * str; - std::vector< std::string > * str_list; - ASTNode * snode; - std::list< ASTNode * > * snode_list; - smt2token tok; - -#line 135 "smt2new/smt2newparser.hh" /* yacc.c:1909 */ -}; - -typedef union YYSTYPE YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 -# define YYSTYPE_IS_DECLARED 1 -#endif - -/* Location type. */ -#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED -typedef struct YYLTYPE YYLTYPE; -struct YYLTYPE -{ - int first_line; - int first_column; - int last_line; - int last_column; -}; -# define YYLTYPE_IS_DECLARED 1 -# define YYLTYPE_IS_TRIVIAL 1 -#endif - - - -int smt2newparse (Smt2newContext* context); - -#endif /* !YY_SMT2NEW_SMT2NEW_SMT2NEWPARSER_HH_INCLUDED */ From 973f962e5eb996d14ca49a38c5d1953436987f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 28 Jul 2022 15:17:14 +0200 Subject: [PATCH 04/76] parser: last attempt with custom name It starts to look like using a reentrant parser with custom name is not supported by flex/bison combination. This is the last commit where I still have an attempt at writing the system like that. --- src/parsers/smt2new/smt2newparser.yy | 35 +++++++++++++++++----------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 25205ed39..998f0e4ad 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -25,12 +25,32 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. %define api.pure +%lex-param { void * myScanner } %define parse.error verbose %define api.prefix {smt2new} +%code provides +{ + // Tell Flex the expected prototype of yylex. + //#define YY_DECL int smt2newlex (SMT2NEWSTYPE *yylval, SMT2NEWLTYPE *yylloc) + // Declare the scanner. + //YY_DECL; + + int smt2newlex(SMT2NEWSTYPE* lvalp, SMT2NEWLTYPE* llocp, void * myScanner); + + void smt2newerror(SMT2NEWLTYPE* locp, Smt2newContext* context, const char * s ) + { + if (context->interactive) + printf("At interactive input: %s\n", s); + else + printf("At line %d: %s\n", locp->first_line, s); + } + + #define myScanner context->scanner +} + %locations %defines %parse-param { Smt2newContext* context } -%lex-param { void* scanner } %{ #include @@ -40,7 +60,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include "smt2newcontext.h" -#include "smt2newparser.hh" #include "smt2tokens.h" using ASTNode_up = std::unique_ptr; @@ -50,18 +69,6 @@ using string_up = std::unique_ptr; std::unique_ptr mkUniqueStr(std::string const & s) { return std::make_unique(s); } -int smt2newlex(YYSTYPE* lvalp, YYLTYPE* llocp, void* scanner); - -void smt2newerror( YYLTYPE* locp, Smt2newContext* context, const char * s ) -{ - if (context->interactive) - printf("At interactive input: %s\n", s); - else - printf( "At line %d: %s\n", locp->first_line, s ); -// exit( 1 ); -} - -#define scanner context->scanner /* Overallocation to prevent stack overflow */ #define YYMAXDEPTH 1024 * 1024 From f843bbc648744d70e9da6461ece26139ac551825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 28 Jul 2022 18:00:34 +0200 Subject: [PATCH 05/76] Itp-Regression: fix interpolation algorithm number --- regression_itp/dec-far1.smt2 | 2 +- regression_itp/dec-far2.smt2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/regression_itp/dec-far1.smt2 b/regression_itp/dec-far1.smt2 index e1933980f..6f39ed34c 100644 --- a/regression_itp/dec-far1.smt2 +++ b/regression_itp/dec-far1.smt2 @@ -1,7 +1,7 @@ (set-option :produce-interpolants true) (set-option :certify-interpolants 1) (set-logic QF_LRA) -(set-option :interpolation-lra-algorithm 4) ; decomposed Farkas +(set-option :interpolation-lra-algorithm 11) ; decomposed Farkas (declare-fun x1 () Real) (declare-fun x2 () Real) (declare-fun x3 () Real) diff --git a/regression_itp/dec-far2.smt2 b/regression_itp/dec-far2.smt2 index f9147c3c5..1aa35fd63 100644 --- a/regression_itp/dec-far2.smt2 +++ b/regression_itp/dec-far2.smt2 @@ -1,7 +1,7 @@ (set-option :produce-interpolants true) (set-option :certify-interpolants 1) (set-logic QF_LRA) -(set-option :interpolation-lra-algorithm 4) ; decomposed Farkas +(set-option :interpolation-lra-algorithm 11) ; decomposed Farkas (declare-fun x1 () Real) (declare-fun x2 () Real) (declare-fun x3 () Real) From 5a44c519742aff374e2a5b1a8fecd9483960fa8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 28 Jul 2022 18:02:03 +0200 Subject: [PATCH 06/76] Interpret: fix option parsing --- src/api/Interpret.cc | 9 ++++++--- src/options/SMTConfig.cc | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 48d1d8600..dea47ad1b 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -50,7 +50,7 @@ void Interpret::setInfo(ASTNode const & n) { assert(n.getType() == ASTType::UATTR_T || n.getType() == ASTType::PATTR_T); std::string name; - if (n.hasValue()) { + if (not n.hasValue()) { ASTNode const & an = *(*n.children)[0]; assert(an.getType() == ASTType::UATTR_T || an.getType() == ASTType::PATTR_T); name = an.getValue(); @@ -64,7 +64,7 @@ void Interpret::setInfo(ASTNode const & n) { void Interpret::getInfo(ASTNode const & n) { assert(n.getType() == ASTType::INFO_T); assert(n.hasValue() or n.children->size() == 1); - std::string const & name = n.hasValue() ? (*(*n.children)[0]).getValue() : n.getValue(); + std::string const & name = n.hasValue() ? n.getValue() : (*(*n.children)[0]).getValue(); const Info& value = config.getInfo(name); @@ -136,10 +136,13 @@ void Interpret::interp(ASTNode const & n) { break; } case t_setinfo: - case t_setoption : { setInfo(*(*n.children)[0]); notify_success(); break; + case t_setoption : { + setOption(*(*n.children)[0]); + notify_success(); + break; } case t_getinfo: { getInfo(*(*n.children)[0]); diff --git a/src/options/SMTConfig.cc b/src/options/SMTConfig.cc index 5805653eb..8bfabfa10 100644 --- a/src/options/SMTConfig.cc +++ b/src/options/SMTConfig.cc @@ -180,7 +180,7 @@ std::string ConfValue::toString() const { Info::Info(ASTNode const & n) { assert(n.getType() == ASTType::UATTR_T or n.getType() == ASTType::PATTR_T); - if (n.children->empty()) { + if (not n.children or n.children->empty()) { value.type = O_EMPTY; return; } else { @@ -235,7 +235,7 @@ SMTOption::SMTOption(ASTNode const & n) { assert(child.getType() == ASTType::UATTR_T or child.getType() == ASTType::PATTR_T); // The option is an attribute - if (child.children->empty()) { + if (not child.children or child.children->empty()) { value.type = O_EMPTY; return; } else { From 3fddeae6865cf913af91d4c1776f1063d8a4c1ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 28 Jul 2022 18:03:04 +0200 Subject: [PATCH 07/76] Parser: remove the prefix It looks like flex + bison combination does not support at the same time having a custom name for a parser and a reentrant parser. This commit removes the custom name for a parser so that we can use reentrancy. --- src/api/Interpret.cc | 6 +++--- src/bin/opensmt.cc | 2 +- src/parsers/smt2new/smt2newcontext.h | 2 +- src/parsers/smt2new/smt2newlexer.ll | 1 - src/parsers/smt2new/smt2newparser.yy | 6 ++---- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index dea47ad1b..7ed377bdc 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -1009,7 +1009,7 @@ void Interpret::execute(ASTNode const & r) { int Interpret::interpFile(FILE* in) { Smt2newContext context(in); - int rval = smt2newparse(&context); + int rval = yyparse(&context); if (rval != 0) return rval; @@ -1020,7 +1020,7 @@ int Interpret::interpFile(FILE* in) { int Interpret::interpFile(char *content){ Smt2newContext context(content); - int rval = smt2newparse(&context); + int rval = yyparse(&context); if (rval != 0) return rval; ASTNode const & r = context.getRoot(); @@ -1122,7 +1122,7 @@ int Interpret::interpPipe() { i = -1; // will be incremented to 0 by the loop condition. Smt2newContext context(buf_out); - int rval = smt2newparse(&context); + int rval = yyparse(&context); if (rval != 0) notify_formatted(true, "scanner"); else { diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc index 6db12ffd8..9c90c6b6f 100644 --- a/src/bin/opensmt.cc +++ b/src/bin/opensmt.cc @@ -203,7 +203,7 @@ void interpretInteractive(Interpret & interpret) { // Parsing should be done from a string that I get from the readline // library. Smt2newContext context(parse_buf); - int rval = smt2newparse(&context); + int rval = yyparse(&context); if (rval != 0) interpret.reportError("scanner"); else { diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 7aae37260..7185a06e2 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -104,6 +104,6 @@ class Smt2newContext { } }; -int smt2newparse(Smt2newContext*); +int yyparse(Smt2newContext*); #endif diff --git a/src/parsers/smt2new/smt2newlexer.ll b/src/parsers/smt2new/smt2newlexer.ll index 46e0a626c..84c1c9cc7 100644 --- a/src/parsers/smt2new/smt2newlexer.ll +++ b/src/parsers/smt2new/smt2newlexer.ll @@ -24,7 +24,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *********************************************************************/ -%option prefix="smt2new" %option reentrant %option bison-bridge %option bison-locations diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 998f0e4ad..9c0e24257 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -27,7 +27,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. %define api.pure %lex-param { void * myScanner } %define parse.error verbose -%define api.prefix {smt2new} %code provides { // Tell Flex the expected prototype of yylex. @@ -35,10 +34,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // Declare the scanner. //YY_DECL; - int smt2newlex(SMT2NEWSTYPE* lvalp, SMT2NEWLTYPE* llocp, void * myScanner); + int yylex(YYSTYPE* lvalp, YYLTYPE* llocp, void * myScanner); - void smt2newerror(SMT2NEWLTYPE* locp, Smt2newContext* context, const char * s ) - { + inline void yyerror(YYLTYPE* locp, Smt2newContext* context, const char * s ) { if (context->interactive) printf("At interactive input: %s\n", s); else From 69680372589f0463b6a50fc93a8ca6334756f856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 28 Jul 2022 18:04:37 +0200 Subject: [PATCH 08/76] Interpret: fix signature --- src/bin/opensmt.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc index 9c90c6b6f..28d6da176 100644 --- a/src/bin/opensmt.cc +++ b/src/bin/opensmt.cc @@ -207,7 +207,7 @@ void interpretInteractive(Interpret & interpret) { if (rval != 0) interpret.reportError("scanner"); else { - const ASTNode* r = context.getRoot(); + ASTNode const & r = context.getRoot(); interpret.execute(r); done = interpret.gotExit(); } From c3f44f01fd1308259b9c8e171610783776ff2250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 28 Jul 2022 18:04:52 +0200 Subject: [PATCH 09/76] Parser: fix memory leak --- src/parsers/smt2new/smt2newparser.yy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 9c0e24257..a6f74aff8 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -82,6 +82,7 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma %destructor { delete $$; } %destructor { delete $$; } +%destructor { if ($$) { delete $$; } } %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO From dac5cff1c10e2cfb8567188d2fc4a8b714453bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 28 Jul 2022 18:05:12 +0200 Subject: [PATCH 10/76] Parser: small style fix --- src/parsers/smt2new/smt2newparser.yy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index a6f74aff8..f5e4fc67c 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -311,7 +311,8 @@ attribute_value: spec_const { auto tmp = std::make_unique(); tmp->push_back(ASTNode_up($1)); - $$ = new ASTNode(ASTType::SPECC_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); } + $$ = new ASTNode(ASTType::SPECC_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); + } | symbol { $$ = $1; From e301ce84930aebf72cdc151617e118906eab8670 Mon Sep 17 00:00:00 2001 From: Antti Hyvarinen Date: Fri, 26 Aug 2022 11:40:09 +0200 Subject: [PATCH 11/76] splitting: update to new parser --- src/parallel/SplitterInterpret.cc | 28 ++++------------------------ src/parallel/SplitterInterpret.h | 3 +-- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/parallel/SplitterInterpret.cc b/src/parallel/SplitterInterpret.cc index 6fcdd1962..30390a7a9 100644 --- a/src/parallel/SplitterInterpret.cc +++ b/src/parallel/SplitterInterpret.cc @@ -12,7 +12,7 @@ * Usage: Parallel solver ***********************************************************/ -void SplitterInterpret::writeSplits(const char* filename) +void SplitterInterpret::writeSplits(std::string const & filename) { try { dynamic_cast(getMainSolver()).writeSplits(filename); @@ -26,9 +26,9 @@ sstat SplitterInterpret::checkSat() { if (not search) return s_Undef; - char* name = config.dump_state(); + auto name = config.dump_state(); sstat res = Interpret::checkSat(); - if (res == s_Undef and strcmp(config.output_dir(),"") != 0) { + if (res == s_Undef and not config.output_dir().empty()) { writeSplits(name); } return res; @@ -44,24 +44,4 @@ sstat SplitterInterpret::interpSMTContent(char *content, vec SplitterInterpret::createMainSolver(const char* logic_name) { - if (config.sat_split_type() != spt_none) { - auto th = MainSolver::createTheory(*logic, config); - auto tm = std::make_unique(*logic); - auto thandler = new THandler(*th, *tm); - return std::make_unique(std::move(th), - std::move(tm), - std::unique_ptr(thandler), - MainSplitter::createInnerSolver(config, *thandler, channel), - *logic, - config, - std::string(logic_name) - + " splitter"); - } else - return std::make_unique(*logic, config, std::string(logic_name) + " solver"); -} - - - +} \ No newline at end of file diff --git a/src/parallel/SplitterInterpret.h b/src/parallel/SplitterInterpret.h index 8037c47c3..ee35a6b55 100644 --- a/src/parallel/SplitterInterpret.h +++ b/src/parallel/SplitterInterpret.h @@ -17,8 +17,7 @@ class SplitterInterpret : public Interpret { bool search = true; protected: - void writeSplits(const char* filename); - std::unique_ptr createMainSolver(const char* logic_name) override; + void writeSplits(std::string const & filename); sstat checkSat() override; void exit() override { return; } From ebaa1c77ac926432d2b362d674f76a4cba7c26a0 Mon Sep 17 00:00:00 2001 From: Antti Hyvarinen Date: Mon, 29 Aug 2022 15:14:29 +0200 Subject: [PATCH 12/76] tmp: parse only --- src/api/Interpret.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 7ed377bdc..e0f3d30ae 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -1012,7 +1012,7 @@ int Interpret::interpFile(FILE* in) { int rval = yyparse(&context); if (rval != 0) return rval; - + return 0; const ASTNode & r = context.getRoot(); execute(r); return rval; From 9a39656181a3df8b50699628d97b41f943582083 Mon Sep 17 00:00:00 2001 From: Antti Hyvarinen Date: Tue, 30 Aug 2022 10:51:29 +0200 Subject: [PATCH 13/76] tmp: parser ideas --- src/api/handwritten.h | 195 +++++++++++++++++++++++++++++++++++++ src/bin/opensmt.cc | 9 +- src/parsers/handwritten.cc | 5 + 3 files changed, 208 insertions(+), 1 deletion(-) create mode 100644 src/api/handwritten.h create mode 100644 src/parsers/handwritten.cc diff --git a/src/api/handwritten.h b/src/api/handwritten.h new file mode 100644 index 000000000..d5da59985 --- /dev/null +++ b/src/api/handwritten.h @@ -0,0 +1,195 @@ +// +// Created by Antti Hyvarinen on 29.08.22. +// + +#ifndef OPENSMT_HANDWRITTEN_H +#define OPENSMT_HANDWRITTEN_H +#include +#include +#include +#include +#include + +class OsmtParserException: public std::exception { + std::string msg; +public: + OsmtParserException(const std::string & msg) : msg(msg) {} + virtual const char* what() const noexcept override { return msg.c_str(); } +}; + +struct SExpr { + std::variant> data; + std::string toString() const { + if (auto str_p = std::get_if(&data)) { + return *str_p; + } else if (auto vec_p = std::get_if>(&data)) { + std::string out = "("; + for (int i = 0; i != vec_p->size(); ++i) { + out += (*vec_p)[i]->toString() + (i == vec_p->size()-1 ? "" : " "); + } + out += ")"; + return out; + } + assert(false); + return {}; + } +}; + +class SExprParser { + std::istream & input; + char token = 0; + std::vector stack; + uint32_t line = 0; + uint32_t column = 0; + + static bool isWhiteSpace(char token) { + return (token == ' ' or token == '\t' or token == '\r' or token == '\n'); + } + + char get() { + auto c = static_cast(input.get()); + if (c == '\n') { ++ line; column = 0; } + ++ column; + return c; + } + + void advance(bool comments = true) { + token = get(); + if (comments and token == ';') { + while (token != '\n' and token != 0) { + token = static_cast(get()); + } + } + } + + void skipWhitespace() { + while (isWhiteSpace(token)) { + advance(); + } + } + + std::string parseToken() { + std::string result; + skipWhitespace(); + bool inQuotedSymbol = token == '|'; + bool inString = token == '"'; + if (inQuotedSymbol) { + advance(false); + } + while (token != 0) { + char c = token; + if (inQuotedSymbol and c == '|') { + advance(); + break; + } else if (inString and result.size() > 1 and c == '"') { + inString = false; + } else if (not inQuotedSymbol and not inString and (isWhiteSpace(token) or c == '(' or c == ')')) { + break; + } + result.push_back(c); + advance(not inString and not inQuotedSymbol); + } + return result; + } + + void parseError(std::string const & error) { + throw OsmtParserException("At line " + std::to_string(line) + ", column " + std::to_string(column) + ": " + error); + } + +public: + SExprParser(std::istream & input) : input(input), token(' '), line(1) {} + + bool isEOF() { + skipWhitespace(); + return input.eof(); + } + + SExpr * parseExpr() { + while (not isEOF()) { + skipWhitespace(); + if (token == '(') { + stack.emplace_back(new SExpr{std::vector()}); + advance(); + skipWhitespace(); + } else if (token == ')') { + if (stack.empty()) { + parseError("Unexpected `" + std::string(1, token) + "`"); + } else if (stack.size() == 1) { + advance(); + skipWhitespace(); + break; + } else { + // Copy the contents of this stack to the SExpr in the previous frame. + auto & prevData = std::get>((stack.rbegin()[1])->data); + prevData.emplace_back(stack.back()); + assert(stack.size() > 1); + stack.pop_back(); + advance(); + skipWhitespace(); + } + } else { + if (stack.empty()) { + parseError("Expected `(` or `;`, got " + std::string(1, token)); + } + assert(not stack.empty()); + auto & currentData = std::get>(stack.back()->data); + currentData.emplace_back(new SExpr{parseToken()}); + } + } + if (stack.size() != 1) { + parseError("Unexpected EOF"); + } + assert(stack.size() == 1); + auto res = stack[0]; + stack.pop_back(); + return res; + } +}; + +class HandWrittenParser { + std::istream & input; + +public: + HandWrittenParser(std::istream & input) : input(input) {} + template void traverse(SExpr * root, F & op) { + struct Qel { SExpr * node; uint32_t processed; }; + std::vector queue; + queue.emplace_back(Qel{root, static_cast(0)}); + while (not queue.empty()) { + auto & [node, processed] = queue.back(); + auto children = std::get_if>(&node->data); + if (children and processed < children->size()) { + ++ processed; + queue.emplace_back(Qel{(*children)[processed-1], 0}); + continue; + } + assert(not children or processed == children->size()); + assert(node); + op(*node); + queue.pop_back(); + } + } + void parse() { + SExprParser parser(input); + class Counter { + uint32_t count = 0; + public: + void operator() (SExpr &) { + ++ count; + } + uint32_t getCount() const { return count; } + }; + Counter counter; + while (not parser.isEOF()) { + try { + auto sexpr = parser.parseExpr(); + traverse(sexpr, counter); + } catch (OsmtParserException const & e) { + std::cout << e.what() << std::endl; + break; + } + } + std::cout << std::to_string(counter.getCount()) << std::endl; + } +}; +#endif // OPENSMT_HANDWRITTEN_H \ No newline at end of file diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc index 28d6da176..0612348aa 100644 --- a/src/bin/opensmt.cc +++ b/src/bin/opensmt.cc @@ -26,6 +26,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "Interpret.h" +#include "handwritten.h" #include #include @@ -145,7 +146,13 @@ int main( int argc, char * argv[] ) opensmt_error( "SMTLIB 1.2 format is not supported in this version, sorry" ); } else if ( extension != NULL && strcmp( extension, ".smt2" ) == 0 ) { - interpreter.interpFile(fin); + std::filebuf fb; + fb.open(filename, std::ios::in); + std::istream is(&fb); + HandWrittenParser parser(is); + parser.parse(); + +// interpreter.interpFile(fin); } else opensmt_error2( filename, " extension not recognized. Please use one in { smt2, cnf } or stdin (smtlib2 is assumed)" ); diff --git a/src/parsers/handwritten.cc b/src/parsers/handwritten.cc new file mode 100644 index 000000000..80b22d315 --- /dev/null +++ b/src/parsers/handwritten.cc @@ -0,0 +1,5 @@ +// +// Created by Antti Hyvarinen on 29.08.22. +// + +#include "handwritten.h" From 0babe45316e2a43de7b20bcda7b20c9617f35256 Mon Sep 17 00:00:00 2001 From: aehyvari Date: Wed, 31 Aug 2022 18:55:26 +0200 Subject: [PATCH 14/76] SMTConfig: add missing header --- src/options/SMTConfig.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index 42559ae63..1bd28c8f9 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -37,6 +37,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include enum class ASTType { CMD_T , CMDL_T From 3ced3d66426e454d1fb2eaacd73d57ff5098f2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Wed, 14 Sep 2022 10:31:58 +0200 Subject: [PATCH 15/76] tmp: disable checking --- src/api/Interpret.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index e0f3d30ae..bc47bd3e8 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -1013,9 +1013,9 @@ int Interpret::interpFile(FILE* in) { if (rval != 0) return rval; return 0; - const ASTNode & r = context.getRoot(); - execute(r); - return rval; +// const ASTNode & r = context.getRoot(); +// execute(r); +// return rval; } int Interpret::interpFile(char *content){ @@ -1023,8 +1023,8 @@ int Interpret::interpFile(char *content){ int rval = yyparse(&context); if (rval != 0) return rval; - ASTNode const & r = context.getRoot(); - execute(r); +// ASTNode const & r = context.getRoot(); +// execute(r); return rval; } @@ -1126,8 +1126,8 @@ int Interpret::interpPipe() { if (rval != 0) notify_formatted(true, "scanner"); else { - ASTNode const & r = context.getRoot(); - execute(r); +// ASTNode const & r = context.getRoot(); +// execute(r); done = f_exit; } free(buf_out); From c41a867cae92f2e07e7984031e09fffe74610a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Wed, 14 Sep 2022 10:35:16 +0200 Subject: [PATCH 16/76] Handwritten-parser: An attempt at more semantic parsing [WiP] --- src/api/handwritten.h | 80 ++++++++++++++++++++++++++++++++------ src/api/smt2tokens.h | 39 ++++++++++++++++++- src/parsers/handwritten.cc | 5 --- 3 files changed, 107 insertions(+), 17 deletions(-) delete mode 100644 src/parsers/handwritten.cc diff --git a/src/api/handwritten.h b/src/api/handwritten.h index d5da59985..0b70dab35 100644 --- a/src/api/handwritten.h +++ b/src/api/handwritten.h @@ -4,12 +4,15 @@ #ifndef OPENSMT_HANDWRITTEN_H #define OPENSMT_HANDWRITTEN_H +#include "smt2tokens.h" + #include #include #include #include #include + class OsmtParserException: public std::exception { std::string msg; public: @@ -17,14 +20,25 @@ class OsmtParserException: public std::exception { virtual const char* what() const noexcept override { return msg.c_str(); } }; +class Expr {}; +class EmptyExpr : public Expr {}; +class DeclareFun : public Expr {}; + +struct Token { + std::string name; + osmttokens::token token; + opensmt::pair pos = {0, 0}; + Expr * parsedType = nullptr; +}; + struct SExpr { - std::variant> data; + std::variant> data; std::string toString() const { - if (auto str_p = std::get_if(&data)) { - return *str_p; + if (auto token_p = std::get_if(&data)) { + return (token_p->name); } else if (auto vec_p = std::get_if>(&data)) { std::string out = "("; - for (int i = 0; i != vec_p->size(); ++i) { + for (unsigned long i = 0; i != vec_p->size(); ++i) { out += (*vec_p)[i]->toString() + (i == vec_p->size()-1 ? "" : " "); } out += ")"; @@ -68,11 +82,22 @@ class SExprParser { } } - std::string parseToken() { + osmttokens::token resolveToken(std::string const & name) { + if (osmttokens::nameToToken.find(name) != osmttokens::nameToToken.end()) { + return osmttokens::nameToToken.at(name); + } else { + return osmttokens::t_none; + } + } + + Token parseToken() { std::string result; skipWhitespace(); + opensmt::pair tokenStartPos {line, column}; bool inQuotedSymbol = token == '|'; bool inString = token == '"'; + bool isString = inString; + if (inQuotedSymbol) { advance(false); } @@ -89,7 +114,8 @@ class SExprParser { result.push_back(c); advance(not inString and not inQuotedSymbol); } - return result; + osmttokens::token type = isString ? osmttokens::t_STRING : resolveToken(result); + return {result, type, tokenStartPos}; } void parseError(std::string const & error) { @@ -165,7 +191,7 @@ class HandWrittenParser { } assert(not children or processed == children->size()); assert(node); - op(*node); + op(node); queue.pop_back(); } } @@ -174,22 +200,54 @@ class HandWrittenParser { class Counter { uint32_t count = 0; public: - void operator() (SExpr &) { + void operator() (SExpr *) { ++ count; } uint32_t getCount() const { return count; } }; - Counter counter; + class Deleter { + public: + void operator() (SExpr * e) { + delete e; + } + }; + + class Printer { + void error(Token * token, std::string const & msg) { + std::cout << "At line " + << std::to_string(token->pos.first) + << " column " + << std::to_string(token->pos.second) + << ", " + << token->name << " " << msg << std::endl; + } + public: + Expr * operator() (SExpr * e) { + if (auto expr_p = std::get_if>(&e->data)) { + if (expr_p->empty()) { return new EmptyExpr(); } + if (auto token_p = std::get_if(&((*expr_p)[0])->data)) { + if (token_p->token == osmttokens::t_declarefun) { + if (expr_p->size() != 3) { error(token_p, "expected 3 arguments"); } + } + } + } + return nullptr; + } + }; +// Counter counter; + Printer printer; + Deleter deleter; while (not parser.isEOF()) { try { auto sexpr = parser.parseExpr(); - traverse(sexpr, counter); + traverse(sexpr, printer); + traverse(sexpr, deleter); } catch (OsmtParserException const & e) { std::cout << e.what() << std::endl; break; } } - std::cout << std::to_string(counter.getCount()) << std::endl; +// std::cout << std::to_string(counter.getCount()) << std::endl; } }; #endif // OPENSMT_HANDWRITTEN_H \ No newline at end of file diff --git a/src/api/smt2tokens.h b/src/api/smt2tokens.h index 42aa1e683..20b6035d8 100644 --- a/src/api/smt2tokens.h +++ b/src/api/smt2tokens.h @@ -150,7 +150,44 @@ namespace osmttokens { {t_let, "let"}, {t_echo, "echo"} }; - + inline const std::unordered_map nameToToken = { + {"none", t_none}, + {"as", t_as}, + {"decimal", t_DECIMAL}, + {"numeral", t_NUMERAL}, + {"par", t_par}, + {"string", t_STRING}, + {"exists", t_exists}, + {"forall", t_forall}, + {"assert", t_assert}, + {"check-sat", t_checksat}, + {"declare-sort", t_declaresort}, + {"define-sort", t_definesort}, + {"declare-fun", t_declarefun}, + {"declare-const", t_declareconst}, + {"define-fun", t_definefun}, + {"exit", t_exit}, + {"get-assertions", t_getassertions}, + {"get-assignment", t_getassignment}, + {"get-info", t_getinfo}, + {"set-info", t_setinfo}, + {"get-option", t_getoption}, + {"set-option", t_setoption}, + {"get-proof", t_getproof}, + {"get-unsat-core", t_getunsatcore}, + {"get-value", t_getvalue}, + {"get-model", t_getmodel}, + {"pop", t_pop}, + {"push", t_push}, + {"set-logic", t_setlogic}, + {"get-interpolants", t_getinterpolants}, + {"theory", t_theory}, + {"write-state", t_writestate}, + {"read-state", t_readstate}, + {"simplify", t_simplify}, + {"let", t_let}, + {"echo", t_echo} + }; struct smt2token { token x; }; diff --git a/src/parsers/handwritten.cc b/src/parsers/handwritten.cc deleted file mode 100644 index 80b22d315..000000000 --- a/src/parsers/handwritten.cc +++ /dev/null @@ -1,5 +0,0 @@ -// -// Created by Antti Hyvarinen on 29.08.22. -// - -#include "handwritten.h" From f45b1f521e38adef7f8430af5e7c4e345206db36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Wed, 14 Sep 2022 10:36:24 +0200 Subject: [PATCH 17/76] parser: A first version of new bison-parser --- src/bin/opensmt.cc | 6 +- src/parsers/smt2new/smt2newcontext.h | 229 ++++++++++- src/parsers/smt2new/smt2newparser.yy | 543 +++++++++------------------ 3 files changed, 391 insertions(+), 387 deletions(-) diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc index 0612348aa..5c4567b9f 100644 --- a/src/bin/opensmt.cc +++ b/src/bin/opensmt.cc @@ -26,7 +26,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "Interpret.h" -#include "handwritten.h" #include #include @@ -149,10 +148,7 @@ int main( int argc, char * argv[] ) std::filebuf fb; fb.open(filename, std::ios::in); std::istream is(&fb); - HandWrittenParser parser(is); - parser.parse(); - -// interpreter.interpFile(fin); + interpreter.interpFile(fin); } else opensmt_error2( filename, " extension not recognized. Please use one in { smt2, cnf } or stdin (smtlib2 is assumed)" ); diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 7185a06e2..5720f6fb5 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -30,6 +30,223 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include "SMTConfig.h" +enum class ConstType { + numeral, + decimal, + hexadecimal, + binary, + string +}; + +class GeneralNode {}; + +struct SpecConstNode : public GeneralNode { + ConstType type; + std::string value; +}; + +struct SymbolNode : public GeneralNode { + std::variant name; + bool quoted; +}; + +struct SExpr : public GeneralNode { + std::variant> data; +}; + +struct AttributeValueNode : public GeneralNode { + std::variant> value; + AttributeValueNode(SpecConstNode && n) : value(std::move(n)) {} + AttributeValueNode(SymbolNode && n) : value(std::move(n)) {} + AttributeValueNode(std::vector n) : value(std::move(n)) {} +}; + +struct AttributeNode : public GeneralNode { + bool predefined = false; + std::string name; + AttributeValueNode value; +}; + +struct IdentifierNode : public GeneralNode { + SymbolNode symbol; + std::vector numeralList; +}; + + +class OptionNode : public GeneralNode { }; + +struct PrintSuccess : public OptionNode { bool value; }; +struct ExpandDefinitions : public OptionNode { bool value; }; +struct InteractiveMode : public OptionNode { bool value; }; +struct ProduceProofs : public OptionNode { bool value; }; +struct ProduceUnsatCores : public OptionNode { bool value; }; +struct ProduceModels : public OptionNode { bool value; }; +struct ProduceAssignments : public OptionNode { bool value; }; +struct RegularOutputChannel : public OptionNode { std::string value; }; +struct DiagnosticOutputChannel : public OptionNode { std::string value; }; +struct RandomSeed : public OptionNode { int value; }; +struct Verbosity : public OptionNode { int value; }; +struct Attribute : public OptionNode { AttributeNode value; }; + +class CommandNode : public GeneralNode {}; + +class SetLogic : public CommandNode { + SymbolNode logic; +public: + SetLogic(SymbolNode && logic) : logic(std::move(logic)) {} +}; + +class SetOption : public CommandNode { + OptionNode option; +public: + SetOption(OptionNode && option) : option(std::move(option)) {} +}; + +class SetInfo : public CommandNode { + AttributeNode attribute; +public: + SetInfo(AttributeNode && attribute) : attribute(std::move(attribute)) {} +}; + +class DeclareSort : public CommandNode { + SymbolNode symbol; + std::string num; +public: + DeclareSort(SymbolNode && symbol, std::string && num) : symbol(std::move(symbol)), num(std::move(num)) {} +}; + +struct SortNode : public GeneralNode { + IdentifierNode identifier; +}; + + +struct ComplexSortNode : public SortNode { + SortNode * sort; + std::vector sortList; +}; + +struct QualIdentifierNode : public GeneralNode { + IdentifierNode identifier; + SortNode * returnSort = nullptr; +}; + +class DefineSort : public CommandNode { + SymbolNode name; + std::vector argumentSorts; + SortNode sort; +public: + DefineSort(SymbolNode && name, std::vector && argumentSorts, SortNode && sort) + : name(std::move(name)) + , argumentSorts(std::move(argumentSorts)) + , sort(std::move(sort)) + {} +}; + +class DeclareFun : public CommandNode { + SymbolNode name; + std::vector argumentSorts; + SortNode returnSort; +public: + DeclareFun(SymbolNode && name, std::vector && argumentSorts, SortNode && returnSort) + : name(std::move(name)) + , argumentSorts(std::move(argumentSorts)) + , returnSort(std::move(returnSort)) + {} +}; + +class DeclareConst : public CommandNode { + std::variant name; + SortNode sort; +public: + DeclareConst(SymbolNode && name, SortNode && sort) : name(std::move(name)), sort(std::move(sort)) {} + DeclareConst(SpecConstNode && name, SortNode && sort) : name(std::move(name)), sort(std::move(sort)) {} +}; + +class TermNode : public GeneralNode {}; + +class NormalTermNode : public TermNode { + std::variant head; + SortNode * returnSort = nullptr; + std::vector arguments; +public: + NormalTermNode(SpecConstNode && head) : head(std::move(head)) {} + NormalTermNode(IdentifierNode && head, SortNode * returnSort, std::vector && arguments) + : head(std::move(head)) + , returnSort(returnSort) + , arguments(std::move(arguments)) + {} + SortNode * getSortIfKnown() { return returnSort; } +}; + +struct VarBindingNode : public GeneralNode { + SymbolNode symbol; + TermNode term; +}; + +struct LetTermNode : public TermNode { + TermNode term; + std::vector bindings; +}; + +struct SortedVarNode : public GeneralNode { + SymbolNode symbol; + SortNode sort; +}; + +struct ForallNode : public TermNode { + TermNode term; + std::vector bindings; +}; + +struct ExistsNode : public TermNode { + TermNode term; + std::vector bindings; +}; + +struct AnnotationNode : public TermNode { + TermNode term; + std::vector attributes; +}; + +struct DefineFun : public CommandNode { + SymbolNode name; + std::vector args; + SortNode returnSort; + TermNode term; +}; + +struct PushNode : public CommandNode { int num; }; + +struct PopNode : public CommandNode { int num; }; + +struct AssertNode : public CommandNode { TermNode term; }; + +struct CheckSatNode : public CommandNode {}; + +struct GetAssertions : public CommandNode {}; + +struct GetProof : public CommandNode {}; + +struct GetInterpolants : public CommandNode { std::vector configuration; }; + +struct GetUnsatCore : public CommandNode {}; + +struct GetValue : public CommandNode { std::vector terms; }; + +struct GetModel : public CommandNode {}; + +struct GetAssignment : public CommandNode {}; + +struct GetOption : public CommandNode { std::string key; }; + +struct GetInfo : public CommandNode { std::string key; }; + +struct Simplify : public CommandNode {}; + +struct Exit : public CommandNode {}; + +struct Echo : public CommandNode { std::string text; }; + class Smt2newContext { private: int init_scanner(); @@ -37,19 +254,18 @@ class Smt2newContext { char* buffer; int buffer_sz; int buffer_cap; - std::unique_ptr root; + std::vector root; public: void* scanner; int result; FILE* is; char* ib; bool interactive; - inline ASTNode const & getRoot() { return *root; }; + inline std::vector const & getRoot() { return root; }; Smt2newContext(FILE* in) : buffer_sz(0) , buffer_cap(1) - , root(nullptr) , result(0) , is(in) , ib(nullptr) @@ -62,7 +278,6 @@ class Smt2newContext { Smt2newContext(char* in_s) : buffer_sz(0) , buffer_cap(1) - , root(nullptr) , result(0) , is(nullptr) , ib(in_s) @@ -94,14 +309,10 @@ class Smt2newContext { buffer_sz = 0; } - void insertRoot(std::unique_ptr n) { + void insertRoot(std::vector && n) { root = std::move(n); } - void prettyPrint(std::ostream& o) { - o << "Starting print" << std::endl; - root->print(o, 0); - } }; int yyparse(Smt2newContext*); diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index f5e4fc67c..e2eab04a8 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -74,15 +74,36 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma %union { - std::string * str; - ASTNode * snode; + SortNode * n_sort; + IdentifierNode * n_identifier; + QualIdentifierNode * n_qualIdentifier; + VarBindingNode * n_varBinding; + std::vector * n_varBindingList; + std::vector * n_sortList; + std::vector * n_numeralList; + AttributeNode * n_attribute; + AttributeValueNode * n_attributeValue; + SpecConstNode * n_specConst; + SExpr * sexpr; + SymbolNode * n_symbol; + CommandNode * n_command; + TermNode * n_term; + SortedVarNode * n_sortedVar; + std::vector * n_sortedVarList; + std::vector * n_termList; + std::vector * n_attributeList; + std::vector * n_commandList; + std::vector * n_symbolList; + std::vector * sexpr_list; + std::string * str; + bool n_bool; + OptionNode * n_option; + ASTNode * snode; std::vector> * snode_list; - osmttokens::smt2token tok; + osmttokens::smt2token tok; } %destructor { delete $$; } -%destructor { delete $$; } -%destructor { if ($$) { delete $$; } } %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO @@ -94,437 +115,265 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma %type TK_NUM TK_SYM TK_QSYM TK_KEY TK_STR TK_DEC TK_HEX TK_BIN %type KW_SORTS KW_FUNS KW_SORTSDESCRIPTION KW_FUNSDESCRIPTION KW_DEFINITION KW_NOTES KW_THEORIES KW_EXTENSIONS KW_VALUES KW_PRINTSUCCESS KW_EXPANDDEFINITIONS KW_INTERACTIVEMODE KW_PRODUCEPROOFS KW_PRODUCEUNSATCORES KW_PRODUCEMODELS KW_PRODUCEASSIGNMENTS KW_REGULAROUTPUTCHANNEL KW_DIAGNOSTICOUTPUTCHANNEL KW_RANDOMSEED KW_VERBOSITY KW_ERRORBEHAVIOR KW_NAME KW_NAMED KW_AUTHORS KW_VERSION KW_STATUS KW_REASONUNKNOWN KW_ALLSTATISTICS predef_key -%type symbol identifier sort command attribute attribute_value s_expr spec_const qual_identifier var_binding sorted_var term const_val -%type sort_list command_list s_expr_list numeral_list term_list var_binding_list attribute_list sorted_var_list symbol_list -%type b_value option info_flag +%type sort +%type identifier +%type qual_identifier +%type var_binding +%type term +%type sorted_var +%type command +%type symbol const_val +%type s_expr +%type spec_const +%type attribute +%type attribute_value +%type sort_list +%type var_binding_list +%type term_list +%type attribute_list +%type sorted_var_list +%type symbol_list +%type command_list +%type s_expr_list +%type numeral_list +%type b_value +%type info_flag +%type option %start script %% -script: command_list { context->insertRoot(std::make_unique(ASTType::CMDL_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr("main-script"), ASTVec_up($1))); }; +script: command_list { context->insertRoot(std::move(*$1)); }; symbol: TK_SYM - { $$ = new ASTNode(ASTType::SYM_T, {osmttokens::t_none}, string_up($1)); } + { $$ = new SymbolNode{{}, {std::move(*$1)}, false}; } | TK_QSYM - { $$ = new ASTNode(ASTType::QSYM_T, {osmttokens::t_none}, string_up($1)); } + { $$ = new SymbolNode {{}, {std::move(*$1)}, true}; } ; command_list: - { $$ = new ASTVec(); } + { $$ = new std::vector(); } | command_list command - { (*$1).emplace_back(ASTNode_up($2)); $$ = $1; } + { (*$1).emplace_back($2); $$ = $1; } ; command: '(' TK_SETLOGIC symbol ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::CMD_T, $2, mkUniqueStr(""), std::move(tmp)); - } + { $$ = new SetLogic(std::move(*$3)); } | '(' TK_SETOPTION option ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::CMD_T, $2, mkUniqueStr(""), std::move(tmp)); - } + { $$ = new SetOption(std::move(*$3)); } | '(' TK_SETINFO attribute ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::CMD_T, $2, mkUniqueStr(""), std::move(tmp)); - } + { $$ = new SetInfo(std::move(*$3)); } | '(' TK_DECLARESORT symbol TK_NUM ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($4))); - $$ = new ASTNode(ASTType::CMD_T, - $2, - mkUniqueStr(""), - std::move(tmp)); - } + { $$ = new DeclareSort(std::move(*$3), std::move(*$4)); } | '(' TK_DEFINESORT symbol '(' symbol_list ')' sort ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - tmp->push_back(std::make_unique(ASTType::SYML_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr(""), ASTVec_up($5))); - tmp->push_back(ASTNode_up($7)); - $$ = new ASTNode(ASTType::CMD_T, $2, mkUniqueStr(""), std::move(tmp)); - } - + { $$ = new DefineSort(std::move(*$3), std::move(*$5), std::move(*$7)); } | '(' TK_DECLAREFUN symbol '(' sort_list ')' sort ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - tmp->push_back(std::make_unique(ASTType::SORTL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($5))); - tmp->push_back(ASTNode_up($7)); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new DeclareFun(std::move(*$3), std::move(*$5), std::move(*$7)); } | '(' TK_DECLARECONST const_val sort ')' - { - // todo: drop the second child? - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - tmp->push_back(std::make_unique(ASTType::SORTL_T)); - tmp->push_back(ASTNode_up($4)); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new DeclareConst(std::move(*$3), std::move(*$4)); } | '(' TK_DEFINEFUN symbol '(' sorted_var_list ')' sort term ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - tmp->push_back(std::make_unique(ASTType::SVL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($5))); - tmp->push_back(ASTNode_up($7)); - tmp->push_back(ASTNode_up($8)); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new DefineFun {{}, std::move(*$3), std::move(*$5), std::move(*$7), std::move(*$8)}; } | '(' TK_PUSH TK_NUM ')' - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new PushNode {{}, std::stoi(*$3)}; delete $3; } | '(' TK_POP TK_NUM ')' - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new PopNode {{}, std::stoi(*$3)}; delete $3; } | '(' TK_ASSERT term ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new AssertNode{{}, std::move(*$3)}; } | '(' TK_CHECKSAT ')' - { - $$ = new ASTNode(ASTType::CMD_T, $2); - } + { $$ = new CheckSatNode(); } | '(' TK_GETASSERTIONS ')' - { - $$ = new ASTNode(ASTType::CMD_T, $2); - } + { $$ = new GetAssertions(); } | '(' TK_GETPROOF ')' - { - $$ = new ASTNode(ASTType::CMD_T, $2); - } + { $$ = new GetProof() ; } | '(' TK_GETITPS term_list ')' - { - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, ASTVec_up($3)); - } - | '(' TK_WRSTATE TK_STR ')' - { - // todo: TK_{WR,RD}STATE and TK_WRFUNS is not implemented and is not part of the standard - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } - | '(' TK_RDSTATE TK_STR ')' - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } - | '(' TK_WRFUNS TK_STR ')' - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new GetInterpolants {{}, std::move(*$3)}; } | '(' TK_GETUNSATCORE ')' - { - $$ = new ASTNode(ASTType::CMD_T, $2); - } - | '(' TK_GETVALUE '(' term term_list ')' ')' - { - // todo: insert first $4 and then extend with $5? - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, ASTVec_up($5)); - $$->children->insert($$->children->begin(), ASTNode_up($4)); - } + { $$ = new GetUnsatCore(); } + | '(' TK_GETVALUE '(' term_list ')' ')' + { $$ = new GetValue { {}, std::move(*$4) }; } | '(' TK_GETMODEL ')' - { - $$ = new ASTNode(ASTType::CMD_T, $2); - } + { $$ = new GetModel(); } | '(' TK_GETASSIGNMENT ')' - { - $$ = new ASTNode(ASTType::CMD_T, $2); - } + { $$ = new GetAssignment(); } | '(' TK_GETOPTION TK_KEY ')' - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new GetOption{ {}, std::move(*$3) }; } | '(' TK_GETOPTION predef_key ')' - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::PATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new GetOption{ {}, std::move(*$3) }; } | '(' TK_GETINFO info_flag ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new GetInfo{ {}, std::move(*$3) }; } | '(' TK_SIMPLIFY ')' - { - $$ = new ASTNode(ASTType::CMD_T, $2); - } + { $$ = new Simplify(); } | '(' TK_EXIT ')' - { $$ = new ASTNode(ASTType::CMD_T, $2); } + { $$ = new Exit(); } | '(' TK_ECHO TK_STR ')' - { - // todo: consider using ASTNode's string instead of vector - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($3))); - $$ = new ASTNode(ASTType::CMD_T, $2, nullptr, std::move(tmp)); - } + { $$ = new Echo{ {}, std::move(*$3) }; } ; attribute_list: - { $$ = new ASTVec{}; } + { $$ = new std::vector(); } | attribute_list attribute - { $1->emplace_back(ASTNode_up($2)); $$ = $1; } + { $1->emplace_back(std::move(*$2)); $$ = $1; } ; attribute: TK_KEY - { $$ = new ASTNode(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = new AttributeNode { {}, false, std::move(*$1), AttributeValueNode{std::vector{}} }; } | TK_KEY attribute_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new AttributeNode { {}, false, std::move(*$1), std::move(*$2) }; } | predef_key - { $$ = new ASTNode(ASTType::PATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = new AttributeNode { {}, true, std::move(*$1), AttributeValueNode{std::vector{}} }; } | predef_key attribute_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::PATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new AttributeNode { {}, true, std::move(*$1), std::move(*$2) }; } ; attribute_value: spec_const - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($1)); - $$ = new ASTNode(ASTType::SPECC_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } + { $$ = new AttributeValueNode {std::move(*$1)}; } | symbol - { - $$ = $1; - } + { $$ = new AttributeValueNode {std::move(*$1)}; } | '(' s_expr_list ')' - { - $$ = new ASTNode(ASTType::SEXPRL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($2)); - } + { $$ = new AttributeValueNode {std::move(*$2)}; } ; identifier: symbol - { $$ = $1; } + { $$ = new IdentifierNode {{}, std::move(*$1), {}}; } | '(' '_' symbol numeral_list ')' - { - $$ = $3; - $$->children = ASTVec_up($4); - } + { $$ = new IdentifierNode {{}, std::move(*$3), std::move(*$4)}; } ; sort: identifier - { $$ = $1; } + { $$ = new SortNode {{}, std::move(*$1)}; } | '(' identifier sort sort_list ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::LID_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - for (auto & c : *$4) { - $$->children->push_back(std::move(c)); - } - delete $4; - } + { $$ = new ComplexSortNode {{{}, std::move(*$2)}, $3, std::move(*$4)}; } ; sort_list: sort_list sort - { $1->emplace_back(ASTNode_up($2)); $$ = $1; } + { $1->emplace_back($2); $$ = $1; } | - { $$ = new ASTVec(); } + { $$ = new std::vector(); } ; s_expr: spec_const - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($1)); - $$ = new ASTNode(ASTType::SPECC_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } + { $$ = new SExpr{{}, std::move(*$1)}; } | symbol - { - $$ = $1; - } + { $$ = new SExpr{{}, std::move(*$1)}; } | TK_KEY - { - $$ = new ASTNode(ASTType::UATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); - } + { $$ = new SExpr{{}, std::move(*$1)}; } | '(' s_expr_list ')' - { - $$ = new ASTNode(ASTType::SEXPRL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($2)); - } + { $$ = new SExpr{{}, std::move(*$2)}; } ; s_expr_list: - { - $$ = new ASTVec(); - } + { $$ = new std::vector(); } | s_expr_list s_expr { - $1->emplace_back(ASTNode_up($2)); + $1->emplace_back($2); $$ = $1; } ; spec_const: TK_NUM - { $$ = new ASTNode(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = new SpecConstNode{{}, ConstType::numeral, std::move(*$1)}; } | TK_DEC - { $$ = new ASTNode(ASTType::DEC_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = new SpecConstNode{{}, ConstType::decimal, std::move(*$1)}; } | TK_HEX - { $$ = new ASTNode(ASTType::HEX_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = new SpecConstNode{{}, ConstType::hexadecimal, std::move(*$1)}; } | TK_BIN - { $$ = new ASTNode(ASTType::BIN_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = new SpecConstNode{{}, ConstType::binary, std::move(*$1)}; } | TK_STR - { $$ = new ASTNode(ASTType::STR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = new SpecConstNode{{}, ConstType::string, std::move(*$1)}; } ; const_val: symbol { $$ = $1; } | spec_const - { $$ = $1; } + { $$ = new SymbolNode {{}, std::move(*$1), false}; } ; numeral_list: numeral_list TK_NUM - { $1->emplace_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); $$ = $1; } + { $1->push_back(std::string(*$2)); delete $2; } | TK_NUM - { $$ = new ASTVec(); $$->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1))); } + { $$ = new std::vector{std::string(std::move(*$1))}; } ; qual_identifier: identifier - { $$ = $1; } + { $$ = new QualIdentifierNode {{}, std::move(*$1)}; } | '(' TK_AS identifier sort ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - tmp->push_back(ASTNode_up($4)); - $$ = new ASTNode(ASTType::AS_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } + { $$ = new QualIdentifierNode {{}, std::move(*$3), $4}; } ; var_binding_list: var_binding - { $$ = new ASTVec(); $$->push_back(ASTNode_up($1)); } + { $$ = new std::vector; $$->push_back(std::move(*$1)); } | var_binding_list var_binding - { $1->emplace_back(ASTNode_up($2)); $$ = $1; } + { $1->emplace_back(std::move(*$2)); $$ = $1; } ; var_binding: '(' symbol term ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::VARB_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr($2->getValue()), std::move(tmp)); - delete $2; - } + { $$ = new VarBindingNode { {}, std::move(*$2), std::move(*$3) }; } ; sorted_var_list: - { $$ = new ASTVec(); } + { $$ = new std::vector(); } | sorted_var_list sorted_var - { $1->emplace_back(ASTNode_up($2)); $$ = $1; } + { $1->emplace_back(std::move(*$2)); $$ = $1; } ; sorted_var: '(' symbol sort ')' - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::SV_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr($2->getValue()), std::move(tmp)); - delete $2; - } + { $$ = new SortedVarNode {{}, std::move(*$2), std::move(*$3)}; } term_list: - { $$ = new ASTVec(); } + { $$ = new std::vector(); } | term_list term - { $1->emplace_back(ASTNode_up($2)); $$ = $1; } + { $1->emplace_back($2); $$ = $1; } ; term: spec_const - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($1)); - $$ = new ASTNode(ASTType::TERM_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } + { $$ = new NormalTermNode(std::move(*$1)); } | qual_identifier - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($1)); - $$ = new ASTNode(ASTType::QID_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } + { $$ = new NormalTermNode(std::move($1->identifier), $1->returnSort, {}); delete $1; } | '(' qual_identifier term term_list ')' { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - tmp->push_back(ASTNode_up($3)); - $$ = new ASTNode(ASTType::LQID_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); + auto tmp = std::vector(); + tmp.push_back($3); for (auto & c : (*$4)) { - $$->children->emplace_back(std::move(c)); + tmp.emplace_back(std::move(c)); } delete $4; + $$ = new NormalTermNode(std::move($2->identifier), $2->returnSort, std::move(tmp)); } | '(' TK_LET '(' var_binding_list ')' term ')' - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::VARBL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($4))); - tmp->push_back(ASTNode_up($6)); - $$ = new ASTNode(ASTType::LET_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } - | '(' TK_FORALL '(' sorted_var_list ')' term ')' - { - // todo: AST traversal must ensure that sorted_var_list is non-empty - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::SVL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($4))); - tmp->push_back(ASTNode_up($6)); - $$ = new ASTNode(ASTType::FORALL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } - | '(' TK_EXISTS '(' sorted_var_list ')' term ')' - { - // todo: AST traversal must ensure that sorted_var_list is non-empty - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::SVL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($4))); - tmp->push_back(ASTNode_up($6)); - $$ = new ASTNode(ASTType::EXISTS_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } - | '(' '!' term attribute_list ')' - { - // todo: AST traversal must ensure that attribute_list is non-empty - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($3)); - tmp->push_back(std::make_unique(ASTType::GATTRL_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, ASTVec_up($4))); - $$ = new ASTNode(ASTType::BANG_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } + { $$ = new LetTermNode {{}, std::move(*$6), std::move(*$4)}; } + | '(' TK_FORALL '(' sorted_var_list ')' term ')' // todo: AST traversal must ensure that sorted_var_list is non-empty + { $$ = new ForallNode {{}, std::move(*$6), std::move(*$4)}; } + | '(' TK_EXISTS '(' sorted_var_list ')' term ')' // todo: AST traversal must ensure that sorted_var_list is non-empty + { $$ = new ExistsNode {{}, std::move(*$6), std::move(*$4)}; } + | '(' '!' term attribute_list ')' // todo: AST traversal must ensure that attribute_list is non-empty + { $$ = new AnnotationNode {{}, std::move(*$3), std::move(*$4)}; } ; symbol_list: - { $$ = new ASTVec(); } + { $$ = new std::vector(); } | symbol_list symbol - { $1->emplace_back(ASTNode_up($2)); $$ = $1; } + { $1->emplace_back(std::move(*$2)); $$ = $1; } ; b_value: symbol { - std::string const & str = $1->getValue(); - if (str == "true" or str == "false") { - $$ = new ASTNode(ASTType::BOOL_T, osmttokens::smt2token{osmttokens::t_none}, mkUniqueStr(str)); delete $1; - } - else { - printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", str.c_str()); + if (std::string const * str_p = std::get_if(&($1->name))) { + if (*str_p == "true") { + $$ = true; + } else if (*str_p == "false") { + $$ = false; + } else { + printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", str_p->c_str()); + delete $1; + YYERROR; + } + delete $1; + } else { + SpecConstNode const * node = std::get_if(&($1->name)); + assert(node); + printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", node->value.c_str()); delete $1; YYERROR; } @@ -532,77 +381,29 @@ b_value: symbol ; option: KW_PRINTSUCCESS b_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new PrintSuccess {{}, $2}; (void)$1; } | KW_EXPANDDEFINITIONS b_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new ExpandDefinitions {{}, $2}; (void)$1; } | KW_INTERACTIVEMODE b_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new InteractiveMode {{}, $2}; (void)$1; } | KW_PRODUCEPROOFS b_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new ProduceProofs {{}, $2}; (void)$1; } | KW_PRODUCEUNSATCORES b_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new ProduceUnsatCores {{}, $2}; (void)$1; } | KW_PRODUCEMODELS b_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new ProduceModels {{}, $2}; (void)$1; } | KW_PRODUCEASSIGNMENTS b_value - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($2)); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new ProduceAssignments {{}, $2}; (void)$1;} | KW_REGULAROUTPUTCHANNEL TK_STR - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::STR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new RegularOutputChannel {{}, std::move(*$2)}; (void)$1; } | KW_DIAGNOSTICOUTPUTCHANNEL TK_STR - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::STR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new DiagnosticOutputChannel {{}, std::move(*$2)}; (void)$1; } | KW_RANDOMSEED TK_NUM - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new RandomSeed {{}, std::stoi(*$2) }; free $2; (void)$1; } | KW_VERBOSITY TK_NUM - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::NUM_T, osmttokens::smt2token{osmttokens::t_none}, string_up($2))); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1), std::move(tmp)); - } + { $$ = new Verbosity {{}, std::stoi(*$2) }; free $2; (void)$1; } | attribute - { - auto tmp = std::make_unique(); - tmp->push_back(ASTNode_up($1)); - $$ = new ASTNode(ASTType::OPTION_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } + { $$ = new Attribute {{}, std::move(*$1) }; } ; predef_key: KW_SORTS @@ -664,25 +465,21 @@ predef_key: KW_SORTS ; info_flag: KW_ERRORBEHAVIOR - { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = $1; } | KW_NAME - { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = $1; } | KW_AUTHORS - { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = $1; } | KW_VERSION - { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = $1; } | KW_STATUS - { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = $1; } | KW_REASONUNKNOWN - { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = $1; } | KW_ALLSTATISTICS - { $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1)); } + { $$ = $1; } | TK_KEY - { - auto tmp = std::make_unique(); - tmp->push_back(std::make_unique(ASTType::GATTR_T, osmttokens::smt2token{osmttokens::t_none}, string_up($1))); - $$ = new ASTNode(ASTType::INFO_T, osmttokens::smt2token{osmttokens::t_none}, nullptr, std::move(tmp)); - } + { $$ = $1; } ; %% From be020fa221c79b0be73f621259f361ea08094693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Wed, 14 Sep 2022 10:40:03 +0200 Subject: [PATCH 18/76] parser: add a missing header --- src/parsers/smt2new/smt2newcontext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 5720f6fb5..3874f5108 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -28,6 +28,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #define SMT2NEWCONTEXT_H #include +#include #include "SMTConfig.h" enum class ConstType { From de543e2967e4901351425ddb6c52427e82c477b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Wed, 14 Sep 2022 14:41:45 +0200 Subject: [PATCH 19/76] parser: prefer struct to class --- src/parsers/smt2new/smt2newcontext.h | 58 ++++------------------------ src/parsers/smt2new/smt2newparser.yy | 30 +++++++------- 2 files changed, 23 insertions(+), 65 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 3874f5108..85ef46ddd 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -57,9 +57,6 @@ struct SExpr : public GeneralNode { struct AttributeValueNode : public GeneralNode { std::variant> value; - AttributeValueNode(SpecConstNode && n) : value(std::move(n)) {} - AttributeValueNode(SymbolNode && n) : value(std::move(n)) {} - AttributeValueNode(std::vector n) : value(std::move(n)) {} }; struct AttributeNode : public GeneralNode { @@ -91,29 +88,13 @@ struct Attribute : public OptionNode { AttributeNode value; }; class CommandNode : public GeneralNode {}; -class SetLogic : public CommandNode { - SymbolNode logic; -public: - SetLogic(SymbolNode && logic) : logic(std::move(logic)) {} -}; - -class SetOption : public CommandNode { - OptionNode option; -public: - SetOption(OptionNode && option) : option(std::move(option)) {} -}; - -class SetInfo : public CommandNode { - AttributeNode attribute; -public: - SetInfo(AttributeNode && attribute) : attribute(std::move(attribute)) {} -}; +struct SetLogic : public CommandNode { SymbolNode logic; }; +struct SetOption : public CommandNode { OptionNode option; }; +struct SetInfo : public CommandNode { AttributeNode attribute; }; -class DeclareSort : public CommandNode { +struct DeclareSort : public CommandNode { SymbolNode symbol; std::string num; -public: - DeclareSort(SymbolNode && symbol, std::string && num) : symbol(std::move(symbol)), num(std::move(num)) {} }; struct SortNode : public GeneralNode { @@ -131,52 +112,29 @@ struct QualIdentifierNode : public GeneralNode { SortNode * returnSort = nullptr; }; -class DefineSort : public CommandNode { +struct DefineSort : public CommandNode { SymbolNode name; std::vector argumentSorts; SortNode sort; -public: - DefineSort(SymbolNode && name, std::vector && argumentSorts, SortNode && sort) - : name(std::move(name)) - , argumentSorts(std::move(argumentSorts)) - , sort(std::move(sort)) - {} }; -class DeclareFun : public CommandNode { +struct DeclareFun : public CommandNode { SymbolNode name; std::vector argumentSorts; SortNode returnSort; -public: - DeclareFun(SymbolNode && name, std::vector && argumentSorts, SortNode && returnSort) - : name(std::move(name)) - , argumentSorts(std::move(argumentSorts)) - , returnSort(std::move(returnSort)) - {} }; -class DeclareConst : public CommandNode { +struct DeclareConst : public CommandNode { std::variant name; SortNode sort; -public: - DeclareConst(SymbolNode && name, SortNode && sort) : name(std::move(name)), sort(std::move(sort)) {} - DeclareConst(SpecConstNode && name, SortNode && sort) : name(std::move(name)), sort(std::move(sort)) {} }; class TermNode : public GeneralNode {}; -class NormalTermNode : public TermNode { +struct NormalTermNode : public TermNode { std::variant head; SortNode * returnSort = nullptr; std::vector arguments; -public: - NormalTermNode(SpecConstNode && head) : head(std::move(head)) {} - NormalTermNode(IdentifierNode && head, SortNode * returnSort, std::vector && arguments) - : head(std::move(head)) - , returnSort(returnSort) - , arguments(std::move(arguments)) - {} - SortNode * getSortIfKnown() { return returnSort; } }; struct VarBindingNode : public GeneralNode { diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index e2eab04a8..a55571926 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -159,19 +159,19 @@ command_list: ; command: '(' TK_SETLOGIC symbol ')' - { $$ = new SetLogic(std::move(*$3)); } + { $$ = new SetLogic {{}, std::move(*$3)}; } | '(' TK_SETOPTION option ')' - { $$ = new SetOption(std::move(*$3)); } + { $$ = new SetOption {{}, std::move(*$3)}; } | '(' TK_SETINFO attribute ')' - { $$ = new SetInfo(std::move(*$3)); } + { $$ = new SetInfo {{}, std::move(*$3)}; } | '(' TK_DECLARESORT symbol TK_NUM ')' - { $$ = new DeclareSort(std::move(*$3), std::move(*$4)); } + { $$ = new DeclareSort {{}, std::move(*$3), std::move(*$4)}; } | '(' TK_DEFINESORT symbol '(' symbol_list ')' sort ')' - { $$ = new DefineSort(std::move(*$3), std::move(*$5), std::move(*$7)); } + { $$ = new DefineSort {{}, std::move(*$3), std::move(*$5), std::move(*$7)}; } | '(' TK_DECLAREFUN symbol '(' sort_list ')' sort ')' - { $$ = new DeclareFun(std::move(*$3), std::move(*$5), std::move(*$7)); } + { $$ = new DeclareFun {{}, std::move(*$3), std::move(*$5), std::move(*$7)}; } | '(' TK_DECLARECONST const_val sort ')' - { $$ = new DeclareConst(std::move(*$3), std::move(*$4)); } + { $$ = new DeclareConst {{}, std::move(*$3), std::move(*$4)}; } | '(' TK_DEFINEFUN symbol '(' sorted_var_list ')' sort term ')' { $$ = new DefineFun {{}, std::move(*$3), std::move(*$5), std::move(*$7), std::move(*$8)}; } | '(' TK_PUSH TK_NUM ')' @@ -217,21 +217,21 @@ attribute_list: ; attribute: TK_KEY - { $$ = new AttributeNode { {}, false, std::move(*$1), AttributeValueNode{std::vector{}} }; } + { $$ = new AttributeNode { {}, false, std::move(*$1), {{}, std::vector{}} }; } | TK_KEY attribute_value { $$ = new AttributeNode { {}, false, std::move(*$1), std::move(*$2) }; } | predef_key - { $$ = new AttributeNode { {}, true, std::move(*$1), AttributeValueNode{std::vector{}} }; } + { $$ = new AttributeNode { {}, true, std::move(*$1), {{}, std::vector{}} }; } | predef_key attribute_value { $$ = new AttributeNode { {}, true, std::move(*$1), std::move(*$2) }; } ; attribute_value: spec_const - { $$ = new AttributeValueNode {std::move(*$1)}; } + { $$ = new AttributeValueNode {{}, std::move(*$1)}; } | symbol - { $$ = new AttributeValueNode {std::move(*$1)}; } + { $$ = new AttributeValueNode {{}, std::move(*$1)}; } | '(' s_expr_list ')' - { $$ = new AttributeValueNode {std::move(*$2)}; } + { $$ = new AttributeValueNode {{}, std::move(*$2)}; } ; identifier: symbol @@ -328,9 +328,9 @@ term_list: ; term: spec_const - { $$ = new NormalTermNode(std::move(*$1)); } + { $$ = new NormalTermNode {{}, std::move(*$1), nullptr, std::vector{}}; } | qual_identifier - { $$ = new NormalTermNode(std::move($1->identifier), $1->returnSort, {}); delete $1; } + { $$ = new NormalTermNode {{}, std::move($1->identifier), $1->returnSort, {}}; delete $1; } | '(' qual_identifier term term_list ')' { auto tmp = std::vector(); @@ -339,7 +339,7 @@ term: spec_const tmp.emplace_back(std::move(c)); } delete $4; - $$ = new NormalTermNode(std::move($2->identifier), $2->returnSort, std::move(tmp)); + $$ = new NormalTermNode {{}, std::move($2->identifier), $2->returnSort, std::move(tmp)}; } | '(' TK_LET '(' var_binding_list ')' term ')' { $$ = new LetTermNode {{}, std::move(*$6), std::move(*$4)}; } From 7ad34ef8c40918ad34444190edf96c07a7965d97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Wed, 14 Sep 2022 15:13:56 +0200 Subject: [PATCH 20/76] parser: Some destructors --- src/parsers/smt2new/smt2newcontext.h | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 85ef46ddd..8d34a908a 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -53,10 +53,37 @@ struct SymbolNode : public GeneralNode { struct SExpr : public GeneralNode { std::variant> data; + ~SExpr() { + struct Qel { + SExpr * node; + uint32_t processed; + }; + std::vector queue; + queue.emplace_back(Qel{this, static_cast(0)}); + while (not queue.empty()) { + auto & [node, processed] = queue.back(); + auto children = std::get_if>(&node->data); + if (children and processed < children->size()) { + ++processed; + queue.emplace_back(Qel{(*children)[processed - 1], 0}); + } + assert(not children or processed == children->size()); + assert(node); + delete node; + queue.pop_back(); + } + } }; struct AttributeValueNode : public GeneralNode { std::variant> value; + ~AttributeValueNode() { + if (auto vec = std::get_if>(&value)) { + for (auto el : *vec) { + delete el; + } + } + } }; struct AttributeNode : public GeneralNode { From b62fa94c8e1fded681d436e4fed20b446044c8ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Tue, 20 Sep 2022 10:11:09 +0200 Subject: [PATCH 21/76] parser: more memory management --- src/parsers/smt2new/smt2newcontext.cc | 79 +++++++---- src/parsers/smt2new/smt2newcontext.h | 186 ++++++++++++++++---------- src/parsers/smt2new/smt2newparser.yy | 143 ++++++++++---------- 3 files changed, 239 insertions(+), 169 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.cc b/src/parsers/smt2new/smt2newcontext.cc index 66e6b93cd..3f188e9f8 100644 --- a/src/parsers/smt2new/smt2newcontext.cc +++ b/src/parsers/smt2new/smt2newcontext.cc @@ -1,30 +1,53 @@ -/********************************************************************* -Author: Antti Hyvarinen +/* +* Copyright (c) 2021, Antti Hyvarinen +* +* SPDX-License-Identifier: MIT +*/ -OpenSMT2 -- Copyright (C) 2012 - 2014 Antti Hyvarinen - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*********************************************************************/ - - -#include #include "smt2newcontext.h" - - +namespace { + struct Qel { + TermNode* node; + uint32_t processed; + }; + bool checkProcessedProperty(Qel & element) { + auto & [termNode, processed] = element; + assert(termNode); + if (auto normalTermNode = dynamic_cast(termNode)) { + return processed == normalTermNode->arguments->size(); + } else if (auto letTermNode = dynamic_cast(termNode)) { + return processed == letTermNode->arguments->size() + letTermNode->bindings->size(); + } + assert(false); + return false; + } +} + +TermNode::~TermNode() { + std::vector queue; + queue.emplace_back(Qel{this, static_cast(0)}); + while (not queue.empty()) { + auto & [termNode, processed] = queue.back(); + auto & children = *(termNode->arguments); + if (processed < children.size()) { + ++ processed; + queue.emplace_back(Qel{children[processed - 1], 0}); + } else if (auto letTermNode = dynamic_cast(termNode)) { + auto & bindings = *(letTermNode->bindings); + assert(children.size() == 1); + if (processed < bindings.size()+1) { + ++ processed; + queue.emplace_back(Qel{bindings[processed -1]->term, 0}); + } + } + assert(termNode); + assert(checkProcessedProperty(queue.back())); + + for (auto child : *arguments) { + assert(child->arguments->empty()); + delete child; + } + termNode->arguments->clear(); // delete is not called on the pointers + queue.pop_back(); + } +} diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 8d34a908a..5b5456728 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -43,16 +43,16 @@ class GeneralNode {}; struct SpecConstNode : public GeneralNode { ConstType type; - std::string value; + std::unique_ptr value; }; struct SymbolNode : public GeneralNode { - std::variant name; - bool quoted; + std::variant,std::unique_ptr> name; + bool quoted; }; struct SExpr : public GeneralNode { - std::variant> data; + std::variant,std::unique_ptr,std::unique_ptr,std::unique_ptr>> data; ~SExpr() { struct Qel { SExpr * node; @@ -62,12 +62,12 @@ struct SExpr : public GeneralNode { queue.emplace_back(Qel{this, static_cast(0)}); while (not queue.empty()) { auto & [node, processed] = queue.back(); - auto children = std::get_if>(&node->data); - if (children and processed < children->size()) { + auto children = std::get_if>>(&node->data); + if (children and processed < (*children)->size()) { ++processed; - queue.emplace_back(Qel{(*children)[processed - 1], 0}); + queue.emplace_back(Qel{(**children)[processed - 1], 0}); } - assert(not children or processed == children->size()); + assert(not children or processed == (*children)->size()); assert(node); delete node; queue.pop_back(); @@ -76,10 +76,13 @@ struct SExpr : public GeneralNode { }; struct AttributeValueNode : public GeneralNode { - std::variant> value; + std::variant, std::unique_ptr, std::unique_ptr>> value; + AttributeValueNode(std::unique_ptr && node) : value(std::move(node)) {} + AttributeValueNode(std::unique_ptr && node) : value(std::move(node)) {} + AttributeValueNode(std::unique_ptr> && node) : value(std::move(node)) {} ~AttributeValueNode() { - if (auto vec = std::get_if>(&value)) { - for (auto el : *vec) { + if (auto vec = std::get_if>>(&value)) { + for (auto el : (**vec)) { delete el; } } @@ -88,13 +91,13 @@ struct AttributeValueNode : public GeneralNode { struct AttributeNode : public GeneralNode { bool predefined = false; - std::string name; - AttributeValueNode value; + std::unique_ptr name; + std::unique_ptr value; }; struct IdentifierNode : public GeneralNode { - SymbolNode symbol; - std::vector numeralList; + std::unique_ptr symbol; + std::unique_ptr> numeralList; }; @@ -115,97 +118,142 @@ struct Attribute : public OptionNode { AttributeNode value; }; class CommandNode : public GeneralNode {}; -struct SetLogic : public CommandNode { SymbolNode logic; }; -struct SetOption : public CommandNode { OptionNode option; }; -struct SetInfo : public CommandNode { AttributeNode attribute; }; +struct SetLogic : public CommandNode { std::unique_ptr logic; }; +struct SetOption : public CommandNode { std::unique_ptr option; }; +struct SetInfo : public CommandNode { std::unique_ptr attribute; }; struct DeclareSort : public CommandNode { - SymbolNode symbol; - std::string num; + std::unique_ptr symbol; + std::unique_ptr num; }; struct SortNode : public GeneralNode { - IdentifierNode identifier; -}; - + std::unique_ptr identifier; + std::unique_ptr> sortList; -struct ComplexSortNode : public SortNode { - SortNode * sort; - std::vector sortList; + ~SortNode() { + struct Qel { + SortNode * node; + uint32_t processed; + }; + std::vector queue; + queue.emplace_back(Qel{this, static_cast(0)}); + while (not queue.empty()) { + auto & [node, processed] = queue.back(); + auto & children = *node->sortList; + if (processed < children.size()) { + ++processed; + queue.emplace_back(Qel{children[processed - 1], 0}); + } + assert(processed == children.size()); + assert(node); + for (auto child : *sortList) { + assert(child->sortList->empty()); + delete child; + } + node->sortList->clear(); // delete is not called on the pointers + queue.pop_back(); + } + } }; struct QualIdentifierNode : public GeneralNode { - IdentifierNode identifier; - SortNode * returnSort = nullptr; + std::unique_ptr identifier; + std::unique_ptr returnSort = nullptr; }; struct DefineSort : public CommandNode { - SymbolNode name; - std::vector argumentSorts; - SortNode sort; + std::unique_ptr name; + std::unique_ptr>> argumentSorts; + std::unique_ptr sort; }; struct DeclareFun : public CommandNode { - SymbolNode name; - std::vector argumentSorts; - SortNode returnSort; + std::unique_ptr name; + std::unique_ptr> argumentSorts; + std::unique_ptr returnSort; + ~DeclareFun() { + for (auto sort : *argumentSorts) { + delete sort; + } + } }; struct DeclareConst : public CommandNode { - std::variant name; - SortNode sort; + std::variant,std::unique_ptr> name; + std::unique_ptr sort; }; -class TermNode : public GeneralNode {}; - -struct NormalTermNode : public TermNode { - std::variant head; - SortNode * returnSort = nullptr; - std::vector arguments; +struct SortedVarNode : public GeneralNode { + std::unique_ptr symbol; + std::unique_ptr sort; }; +struct TermNode; + struct VarBindingNode : public GeneralNode { - SymbolNode symbol; - TermNode term; + std::unique_ptr symbol; + TermNode * term; }; -struct LetTermNode : public TermNode { - TermNode term; - std::vector bindings; +struct TermNode : public GeneralNode { + std::unique_ptr> arguments; + TermNode(std::unique_ptr> && arguments) : arguments(std::move(arguments)) {} + virtual ~TermNode(); }; -struct SortedVarNode : public GeneralNode { - SymbolNode symbol; - SortNode sort; +struct NormalTermNode : public TermNode { + std::variant,std::unique_ptr> head; + std::unique_ptr returnSort = nullptr; + // Todo: understand why I need this constructor + NormalTermNode(std::unique_ptr> && arguments, + std::variant, + std::unique_ptr> && head, + std::unique_ptr && returnSort) + : TermNode(std::move(arguments)), head(std::move(head)), returnSort(std::move(returnSort)) {} +}; + +struct LetTermNode : public TermNode { + std::unique_ptr>> bindings; + LetTermNode(TermNode * term, std::unique_ptr>> && bindings) + : TermNode{std::make_unique>(std::vector{term})} + , bindings(std::move(bindings)) + {} }; struct ForallNode : public TermNode { - TermNode term; - std::vector bindings; + std::unique_ptr> quantified; + ForallNode(TermNode * term, std::unique_ptr> && quantified) + : TermNode{std::make_unique>(std::vector{term})} + , quantified(std::move(quantified)) {} }; struct ExistsNode : public TermNode { - TermNode term; - std::vector bindings; + std::unique_ptr> quantified; + ExistsNode(TermNode * term, std::unique_ptr> && quantified) + : TermNode{std::make_unique>(std::vector{term})} + , quantified(std::move(quantified)) {} }; struct AnnotationNode : public TermNode { - TermNode term; - std::vector attributes; + std::unique_ptr> attributes; + AnnotationNode(TermNode * term, std::unique_ptr> && attributes) + : TermNode{std::make_unique>(std::vector{term})} + , attributes(std::move(attributes)) {} }; struct DefineFun : public CommandNode { - SymbolNode name; - std::vector args; - SortNode returnSort; - TermNode term; + std::unique_ptr name; + std::unique_ptr> args; + std::unique_ptr returnSort; + std::unique_ptr term; }; struct PushNode : public CommandNode { int num; }; struct PopNode : public CommandNode { int num; }; -struct AssertNode : public CommandNode { TermNode term; }; +struct AssertNode : public CommandNode { std::unique_ptr term; }; struct CheckSatNode : public CommandNode {}; @@ -213,25 +261,25 @@ struct GetAssertions : public CommandNode {}; struct GetProof : public CommandNode {}; -struct GetInterpolants : public CommandNode { std::vector configuration; }; +struct GetInterpolants : public CommandNode { std::unique_ptr> configuration; }; struct GetUnsatCore : public CommandNode {}; -struct GetValue : public CommandNode { std::vector terms; }; +struct GetValue : public CommandNode { std::unique_ptr> terms; }; struct GetModel : public CommandNode {}; struct GetAssignment : public CommandNode {}; -struct GetOption : public CommandNode { std::string key; }; +struct GetOption : public CommandNode { std::unique_ptr key; }; -struct GetInfo : public CommandNode { std::string key; }; +struct GetInfo : public CommandNode { std::unique_ptr key; }; struct Simplify : public CommandNode {}; struct Exit : public CommandNode {}; -struct Echo : public CommandNode { std::string text; }; +struct Echo : public CommandNode { std::unique_ptr text; }; class Smt2newContext { private: @@ -240,14 +288,14 @@ class Smt2newContext { char* buffer; int buffer_sz; int buffer_cap; - std::vector root; + std::unique_ptr> root; public: void* scanner; int result; FILE* is; char* ib; bool interactive; - inline std::vector const & getRoot() { return root; }; + inline std::vector const & getRoot() { return *root; }; Smt2newContext(FILE* in) : buffer_sz(0) @@ -295,7 +343,7 @@ class Smt2newContext { buffer_sz = 0; } - void insertRoot(std::vector && n) { + void insertRoot(std::unique_ptr> && n) { root = std::move(n); } diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index a55571926..95ad20965 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -78,7 +78,7 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma IdentifierNode * n_identifier; QualIdentifierNode * n_qualIdentifier; VarBindingNode * n_varBinding; - std::vector * n_varBindingList; + std::vector> * n_varBindingList; std::vector * n_sortList; std::vector * n_numeralList; AttributeNode * n_attribute; @@ -93,7 +93,7 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma std::vector * n_termList; std::vector * n_attributeList; std::vector * n_commandList; - std::vector * n_symbolList; + std::vector> * n_symbolList; std::vector * sexpr_list; std::string * str; bool n_bool; @@ -144,12 +144,12 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma %% -script: command_list { context->insertRoot(std::move(*$1)); }; +script: command_list { context->insertRoot(std::unique_ptr>($1)); }; symbol: TK_SYM - { $$ = new SymbolNode{{}, {std::move(*$1)}, false}; } + { $$ = new SymbolNode {{}, {std::unique_ptr($1)}, false}; } | TK_QSYM - { $$ = new SymbolNode {{}, {std::move(*$1)}, true}; } + { $$ = new SymbolNode {{}, {std::unique_ptr($1)}, true}; } ; command_list: @@ -159,27 +159,27 @@ command_list: ; command: '(' TK_SETLOGIC symbol ')' - { $$ = new SetLogic {{}, std::move(*$3)}; } + { $$ = new SetLogic {{}, std::unique_ptr($3)}; } | '(' TK_SETOPTION option ')' - { $$ = new SetOption {{}, std::move(*$3)}; } + { $$ = new SetOption {{}, std::unique_ptr($3)}; } | '(' TK_SETINFO attribute ')' - { $$ = new SetInfo {{}, std::move(*$3)}; } + { $$ = new SetInfo {{}, std::unique_ptr($3)}; } | '(' TK_DECLARESORT symbol TK_NUM ')' - { $$ = new DeclareSort {{}, std::move(*$3), std::move(*$4)}; } + { $$ = new DeclareSort {{}, std::unique_ptr($3), std::unique_ptr($4)}; } | '(' TK_DEFINESORT symbol '(' symbol_list ')' sort ')' - { $$ = new DefineSort {{}, std::move(*$3), std::move(*$5), std::move(*$7)}; } + { $$ = new DefineSort {{}, std::unique_ptr($3), std::unique_ptr>>($5), std::unique_ptr($7)}; } | '(' TK_DECLAREFUN symbol '(' sort_list ')' sort ')' - { $$ = new DeclareFun {{}, std::move(*$3), std::move(*$5), std::move(*$7)}; } + { $$ = new DeclareFun {{}, std::unique_ptr($3), std::unique_ptr>($5), std::unique_ptr($7)}; } | '(' TK_DECLARECONST const_val sort ')' - { $$ = new DeclareConst {{}, std::move(*$3), std::move(*$4)}; } + { $$ = new DeclareConst {{}, std::unique_ptr($3), std::unique_ptr($4)}; } | '(' TK_DEFINEFUN symbol '(' sorted_var_list ')' sort term ')' - { $$ = new DefineFun {{}, std::move(*$3), std::move(*$5), std::move(*$7), std::move(*$8)}; } + { $$ = new DefineFun {{}, std::unique_ptr($3), std::unique_ptr>($5), std::unique_ptr($7), std::unique_ptr($8)}; } | '(' TK_PUSH TK_NUM ')' { $$ = new PushNode {{}, std::stoi(*$3)}; delete $3; } | '(' TK_POP TK_NUM ')' { $$ = new PopNode {{}, std::stoi(*$3)}; delete $3; } | '(' TK_ASSERT term ')' - { $$ = new AssertNode{{}, std::move(*$3)}; } + { $$ = new AssertNode{{}, std::unique_ptr($3)}; } | '(' TK_CHECKSAT ')' { $$ = new CheckSatNode(); } | '(' TK_GETASSERTIONS ')' @@ -187,27 +187,27 @@ command: '(' TK_SETLOGIC symbol ')' | '(' TK_GETPROOF ')' { $$ = new GetProof() ; } | '(' TK_GETITPS term_list ')' - { $$ = new GetInterpolants {{}, std::move(*$3)}; } + { $$ = new GetInterpolants {{}, std::unique_ptr>($3)}; } | '(' TK_GETUNSATCORE ')' { $$ = new GetUnsatCore(); } | '(' TK_GETVALUE '(' term_list ')' ')' - { $$ = new GetValue { {}, std::move(*$4) }; } + { $$ = new GetValue { {}, std::unique_ptr>($4) }; } | '(' TK_GETMODEL ')' { $$ = new GetModel(); } | '(' TK_GETASSIGNMENT ')' { $$ = new GetAssignment(); } | '(' TK_GETOPTION TK_KEY ')' - { $$ = new GetOption{ {}, std::move(*$3) }; } + { $$ = new GetOption{ {}, std::unique_ptr($3) }; } | '(' TK_GETOPTION predef_key ')' - { $$ = new GetOption{ {}, std::move(*$3) }; } + { $$ = new GetOption{ {}, std::unique_ptr($3) }; } | '(' TK_GETINFO info_flag ')' - { $$ = new GetInfo{ {}, std::move(*$3) }; } + { $$ = new GetInfo{ {}, std::unique_ptr($3) }; } | '(' TK_SIMPLIFY ')' { $$ = new Simplify(); } | '(' TK_EXIT ')' { $$ = new Exit(); } | '(' TK_ECHO TK_STR ')' - { $$ = new Echo{ {}, std::move(*$3) }; } + { $$ = new Echo{ {}, std::unique_ptr($3) }; } ; attribute_list: @@ -217,33 +217,36 @@ attribute_list: ; attribute: TK_KEY - { $$ = new AttributeNode { {}, false, std::move(*$1), {{}, std::vector{}} }; } + { $$ = new AttributeNode { {}, false, std::unique_ptr($1), std::make_unique(std::make_unique>()) }; } | TK_KEY attribute_value - { $$ = new AttributeNode { {}, false, std::move(*$1), std::move(*$2) }; } + { $$ = new AttributeNode { {}, false, std::unique_ptr($1), std::unique_ptr($2) }; } | predef_key - { $$ = new AttributeNode { {}, true, std::move(*$1), {{}, std::vector{}} }; } + { $$ = new AttributeNode { {}, true, std::unique_ptr($1), std::make_unique(std::make_unique>()) }; } | predef_key attribute_value - { $$ = new AttributeNode { {}, true, std::move(*$1), std::move(*$2) }; } + { $$ = new AttributeNode { {}, true, std::unique_ptr($1), std::unique_ptr($2) }; } ; attribute_value: spec_const - { $$ = new AttributeValueNode {{}, std::move(*$1)}; } + { $$ = new AttributeValueNode(std::unique_ptr($1)); } | symbol - { $$ = new AttributeValueNode {{}, std::move(*$1)}; } + { $$ = new AttributeValueNode(std::unique_ptr($1)); } | '(' s_expr_list ')' - { $$ = new AttributeValueNode {{}, std::move(*$2)}; } + { $$ = new AttributeValueNode(std::unique_ptr>($2)); } ; identifier: symbol - { $$ = new IdentifierNode {{}, std::move(*$1), {}}; } + { $$ = new IdentifierNode {{}, std::unique_ptr($1), {}}; } | '(' '_' symbol numeral_list ')' - { $$ = new IdentifierNode {{}, std::move(*$3), std::move(*$4)}; } + { $$ = new IdentifierNode {{}, std::unique_ptr($3), std::unique_ptr>($4)}; } ; sort: identifier - { $$ = new SortNode {{}, std::move(*$1)}; } - | '(' identifier sort sort_list ')' - { $$ = new ComplexSortNode {{{}, std::move(*$2)}, $3, std::move(*$4)}; } + { $$ = new SortNode {{}, std::unique_ptr($1), std::make_unique>()}; } + | '(' identifier sort_list sort ')' + { + $3->push_back($4); + $$ = new SortNode {{}, std::unique_ptr($2), std::unique_ptr>($3)}; + } ; sort_list: sort_list sort @@ -253,13 +256,13 @@ sort_list: sort_list sort ; s_expr: spec_const - { $$ = new SExpr{{}, std::move(*$1)}; } + { $$ = new SExpr{{}, std::unique_ptr($1)}; } | symbol - { $$ = new SExpr{{}, std::move(*$1)}; } + { $$ = new SExpr{{}, std::unique_ptr($1)}; } | TK_KEY - { $$ = new SExpr{{}, std::move(*$1)}; } + { $$ = new SExpr{{}, std::unique_ptr($1)}; } | '(' s_expr_list ')' - { $$ = new SExpr{{}, std::move(*$2)}; } + { $$ = new SExpr{{}, std::unique_ptr>($2)}; } ; s_expr_list: @@ -273,43 +276,43 @@ s_expr_list: spec_const: TK_NUM - { $$ = new SpecConstNode{{}, ConstType::numeral, std::move(*$1)}; } + { $$ = new SpecConstNode{{}, ConstType::numeral, std::unique_ptr($1)}; } | TK_DEC - { $$ = new SpecConstNode{{}, ConstType::decimal, std::move(*$1)}; } + { $$ = new SpecConstNode{{}, ConstType::decimal, std::unique_ptr($1)}; } | TK_HEX - { $$ = new SpecConstNode{{}, ConstType::hexadecimal, std::move(*$1)}; } + { $$ = new SpecConstNode{{}, ConstType::hexadecimal, std::unique_ptr($1)}; } | TK_BIN - { $$ = new SpecConstNode{{}, ConstType::binary, std::move(*$1)}; } + { $$ = new SpecConstNode{{}, ConstType::binary, std::unique_ptr($1)}; } | TK_STR - { $$ = new SpecConstNode{{}, ConstType::string, std::move(*$1)}; } + { $$ = new SpecConstNode{{}, ConstType::string, std::unique_ptr($1)}; } ; const_val: symbol { $$ = $1; } | spec_const - { $$ = new SymbolNode {{}, std::move(*$1), false}; } + { $$ = new SymbolNode {{}, std::unique_ptr($1), false}; } ; numeral_list: numeral_list TK_NUM - { $1->push_back(std::string(*$2)); delete $2; } + { $1->emplace_back(std::move(*$2)); } | TK_NUM - { $$ = new std::vector{std::string(std::move(*$1))}; } + { $$ = new std::vector{std::string(std::move(*$1))}; } ; qual_identifier: identifier - { $$ = new QualIdentifierNode {{}, std::move(*$1)}; } + { $$ = new QualIdentifierNode {{}, std::unique_ptr($1)}; } | '(' TK_AS identifier sort ')' - { $$ = new QualIdentifierNode {{}, std::move(*$3), $4}; } + { $$ = new QualIdentifierNode {{}, std::unique_ptr($3), std::unique_ptr($4)}; } ; var_binding_list: var_binding - { $$ = new std::vector; $$->push_back(std::move(*$1)); } + { $$ = new std::vector>; $$->push_back(std::unique_ptr($1)); } | var_binding_list var_binding - { $1->emplace_back(std::move(*$2)); $$ = $1; } + { $1->emplace_back(std::unique_ptr($2)); $$ = $1; } ; var_binding: '(' symbol term ')' - { $$ = new VarBindingNode { {}, std::move(*$2), std::move(*$3) }; } + { $$ = new VarBindingNode { {}, std::unique_ptr($2), $3 }; } ; sorted_var_list: @@ -319,7 +322,7 @@ sorted_var_list: ; sorted_var: '(' symbol sort ')' - { $$ = new SortedVarNode {{}, std::move(*$2), std::move(*$3)}; } + { $$ = new SortedVarNode {{}, std::unique_ptr($2), std::unique_ptr($3)}; } term_list: { $$ = new std::vector(); } @@ -328,52 +331,48 @@ term_list: ; term: spec_const - { $$ = new NormalTermNode {{}, std::move(*$1), nullptr, std::vector{}}; } + { $$ = new NormalTermNode {{}, std::unique_ptr($1), nullptr}; } | qual_identifier - { $$ = new NormalTermNode {{}, std::move($1->identifier), $1->returnSort, {}}; delete $1; } - | '(' qual_identifier term term_list ')' + { $$ = new NormalTermNode {{}, std::unique_ptr($1->identifier.release()), std::unique_ptr($1->returnSort.release())}; delete $1; } + | '(' qual_identifier term_list term ')' { - auto tmp = std::vector(); - tmp.push_back($3); - for (auto & c : (*$4)) { - tmp.emplace_back(std::move(c)); - } - delete $4; - $$ = new NormalTermNode {{}, std::move($2->identifier), $2->returnSort, std::move(tmp)}; + $3->push_back($4); + $$ = new NormalTermNode {{std::unique_ptr>($3)}, std::unique_ptr($2->identifier.release()), std::unique_ptr($2->returnSort.release())}; + delete $2; } | '(' TK_LET '(' var_binding_list ')' term ')' - { $$ = new LetTermNode {{}, std::move(*$6), std::move(*$4)}; } + { $$ = new LetTermNode {$6, std::unique_ptr>>($4)}; } | '(' TK_FORALL '(' sorted_var_list ')' term ')' // todo: AST traversal must ensure that sorted_var_list is non-empty - { $$ = new ForallNode {{}, std::move(*$6), std::move(*$4)}; } + { $$ = new ForallNode {$6, std::unique_ptr>($4)}; } | '(' TK_EXISTS '(' sorted_var_list ')' term ')' // todo: AST traversal must ensure that sorted_var_list is non-empty - { $$ = new ExistsNode {{}, std::move(*$6), std::move(*$4)}; } + { $$ = new ExistsNode {$6, std::unique_ptr>($4)}; } | '(' '!' term attribute_list ')' // todo: AST traversal must ensure that attribute_list is non-empty - { $$ = new AnnotationNode {{}, std::move(*$3), std::move(*$4)}; } + { $$ = new AnnotationNode {$3, std::unique_ptr>($4)}; } ; symbol_list: - { $$ = new std::vector(); } + { $$ = new std::vector>(); } | symbol_list symbol - { $1->emplace_back(std::move(*$2)); $$ = $1; } + { $1->push_back(std::unique_ptr($2)); $$ = $1; } ; b_value: symbol { - if (std::string const * str_p = std::get_if(&($1->name))) { - if (*str_p == "true") { + if (auto const str_p = std::get_if>(&($1->name))) { + if (**str_p == "true") { $$ = true; - } else if (*str_p == "false") { + } else if (**str_p == "false") { $$ = false; } else { - printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", str_p->c_str()); + printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", (**str_p).c_str()); delete $1; YYERROR; } delete $1; } else { - SpecConstNode const * node = std::get_if(&($1->name)); + auto const * node = std::get_if>(&($1->name)); assert(node); - printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", node->value.c_str()); + printf("Syntax error: expecting either 'true' or 'false', got '%s'\n", (*(*node)->value).c_str()); delete $1; YYERROR; } From 7f31ff6de7b4bd943e9cb38a3d1f46e7ee0e78c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Tue, 20 Sep 2022 10:11:53 +0200 Subject: [PATCH 22/76] parser: enable cleaning the parsed data structures --- src/api/Interpret.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index bc47bd3e8..a6074ea0c 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -1012,10 +1012,12 @@ int Interpret::interpFile(FILE* in) { int rval = yyparse(&context); if (rval != 0) return rval; + + for (auto command : context.getRoot()) { +// execute(command); + delete command; + } return 0; -// const ASTNode & r = context.getRoot(); -// execute(r); -// return rval; } int Interpret::interpFile(char *content){ From 6365f72a5ad3757e0748cab21b0beb66779d984b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Tue, 20 Sep 2022 10:12:21 +0200 Subject: [PATCH 23/76] parser: add a unit test for checking mem leaks --- test/unit/CMakeLists.txt | 8 ++++++++ test/unit/test_ParserSymbols.cc | 11 +++++++++++ 2 files changed, 19 insertions(+) create mode 100644 test/unit/test_ParserSymbols.cc diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 610f6a073..11fa1a79f 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -245,3 +245,11 @@ PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/test_SATSolverTypes.cc" target_link_libraries(SATSolverTypesTest OpenSMT gtest gtest_main) gtest_add_tests(TARGET SATSolverTypesTest) + +add_executable(ParserSymbolsTest) +target_sources(ParserSymbolsTest +PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/test_ParserSymbols.cc" +) + +target_link_libraries(ParserSymbolsTest OpenSMT gtest gtest_main) +gtest_add_tests(TARGET ParserSymbolsTest) diff --git a/test/unit/test_ParserSymbols.cc b/test/unit/test_ParserSymbols.cc new file mode 100644 index 000000000..0e98f2fc4 --- /dev/null +++ b/test/unit/test_ParserSymbols.cc @@ -0,0 +1,11 @@ +// +// Created by Antti Hyvärinen on 20.09.22. +// + +#include +#include + +TEST(ParserSymbolsTest, test_DeclareSort) { +// auto str = new std::string("foo"); +// (void)SymbolNode{{}, std::unique_ptr(str), false}; +} \ No newline at end of file From 4b65dda3a090947dca3d2e2d09a9d77ba5033043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Tue, 20 Sep 2022 11:23:57 +0200 Subject: [PATCH 24/76] parser: Add constructors for CommandNodes --- src/parsers/smt2new/smt2newcontext.h | 114 ++++++++++++++++++++------- src/parsers/smt2new/smt2newparser.yy | 34 ++++---- 2 files changed, 104 insertions(+), 44 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 5b5456728..504c17254 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -116,15 +116,41 @@ struct RandomSeed : public OptionNode { int value; }; struct Verbosity : public OptionNode { int value; }; struct Attribute : public OptionNode { AttributeNode value; }; -class CommandNode : public GeneralNode {}; +// Note: classes derived from CommandNodes need to have a constructor because they need to be destructible as CommandNodes. +// In particular, CommandNode needs to have a virtual member function (destructor), which forbids aggregate initialization. -struct SetLogic : public CommandNode { std::unique_ptr logic; }; -struct SetOption : public CommandNode { std::unique_ptr option; }; -struct SetInfo : public CommandNode { std::unique_ptr attribute; }; +struct CommandNode : public GeneralNode { + virtual ~CommandNode() = default; +}; + +struct CheckSatNode : public CommandNode { }; +struct GetAssertions : public CommandNode { }; +struct GetProof : public CommandNode { }; +struct GetUnsatCore : public CommandNode { }; +struct GetModel : public CommandNode { }; +struct GetAssignment : public CommandNode { }; +struct Simplify : public CommandNode { }; +struct Exit : public CommandNode { }; + +struct SetLogic : public CommandNode { + std::unique_ptr logic; + SetLogic(std::unique_ptr && logic) : logic(std::move(logic)) {} +}; + +struct SetOption : public CommandNode { + std::unique_ptr option; + SetOption(std::unique_ptr && option) : option(std::move(option)) {} +}; + +struct SetInfo : public CommandNode { + std::unique_ptr attribute; + SetInfo(std::unique_ptr && attribute) : attribute(std::move(attribute)) {} +}; struct DeclareSort : public CommandNode { std::unique_ptr symbol; std::unique_ptr num; + DeclareSort(std::unique_ptr && symbol, std::unique_ptr && num) : symbol(std::move(symbol)), num(std::move(num)) {} }; struct SortNode : public GeneralNode { @@ -166,12 +192,26 @@ struct DefineSort : public CommandNode { std::unique_ptr name; std::unique_ptr>> argumentSorts; std::unique_ptr sort; + DefineSort(std::unique_ptr && name, + std::unique_ptr>> && argumentSorts, + std::unique_ptr && sort) + : name(std::move(name)) + , argumentSorts(std::move(argumentSorts)) + , sort(std::move(sort)) + {} }; struct DeclareFun : public CommandNode { std::unique_ptr name; std::unique_ptr> argumentSorts; std::unique_ptr returnSort; + DeclareFun(std::unique_ptr && name, + std::unique_ptr> && argumentSorts, + std::unique_ptr && returnSort) + : name(std::move(name)) + , argumentSorts(std::move(argumentSorts)) + , returnSort(std::move(returnSort)) + {} ~DeclareFun() { for (auto sort : *argumentSorts) { delete sort; @@ -182,6 +222,8 @@ struct DeclareFun : public CommandNode { struct DeclareConst : public CommandNode { std::variant,std::unique_ptr> name; std::unique_ptr sort; + DeclareConst(std::unique_ptr && name, std::unique_ptr && sort) : name(std::move(name)), sort(std::move(sort)) {} + DeclareConst(std::unique_ptr && name, std::unique_ptr && sort) : name(std::move(name)), sort(std::move(sort)) {} }; struct SortedVarNode : public GeneralNode { @@ -247,39 +289,57 @@ struct DefineFun : public CommandNode { std::unique_ptr> args; std::unique_ptr returnSort; std::unique_ptr term; + DefineFun(std::unique_ptr && name, + std::unique_ptr> && args, + std::unique_ptr && returnSort, + std::unique_ptr && term) + : name(std::move(name)) + , args(std::move(args)) + , returnSort(std::move(returnSort)) + , term(std::move(term)) + {} }; -struct PushNode : public CommandNode { int num; }; - -struct PopNode : public CommandNode { int num; }; - -struct AssertNode : public CommandNode { std::unique_ptr term; }; - -struct CheckSatNode : public CommandNode {}; - -struct GetAssertions : public CommandNode {}; - -struct GetProof : public CommandNode {}; - -struct GetInterpolants : public CommandNode { std::unique_ptr> configuration; }; - -struct GetUnsatCore : public CommandNode {}; +struct PushNode : public CommandNode { + int num; + PushNode(int num) : num(num) {} +}; -struct GetValue : public CommandNode { std::unique_ptr> terms; }; +struct PopNode : public CommandNode { + int num; + PopNode(int num) : num(num) {} +}; -struct GetModel : public CommandNode {}; +struct AssertNode : public CommandNode { + std::unique_ptr term; + AssertNode(std::unique_ptr && term) : term(std::move(term)) {} +}; -struct GetAssignment : public CommandNode {}; +struct GetInterpolants : public CommandNode { + std::unique_ptr> configuration; + GetInterpolants(std::unique_ptr> && configuration) : configuration(std::move(configuration)) {} +}; -struct GetOption : public CommandNode { std::unique_ptr key; }; -struct GetInfo : public CommandNode { std::unique_ptr key; }; +struct GetValue : public CommandNode { + std::unique_ptr> terms; + GetValue(std::unique_ptr> && terms) : terms(std::move(terms)) {} +}; -struct Simplify : public CommandNode {}; +struct GetOption : public CommandNode { + std::unique_ptr key; + GetOption(std::unique_ptr && key) : key(std::move(key)) {} +}; -struct Exit : public CommandNode {}; +struct GetInfo : public CommandNode { + std::unique_ptr key; + GetInfo(std::unique_ptr && key) : key(std::move(key)) {} +}; -struct Echo : public CommandNode { std::unique_ptr text; }; +struct Echo : public CommandNode { + std::unique_ptr text; + Echo(std::unique_ptr && text) : text(std::move(text)) {} +}; class Smt2newContext { private: diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 95ad20965..1741b131e 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -159,27 +159,27 @@ command_list: ; command: '(' TK_SETLOGIC symbol ')' - { $$ = new SetLogic {{}, std::unique_ptr($3)}; } + { $$ = new SetLogic {std::unique_ptr($3)}; } | '(' TK_SETOPTION option ')' - { $$ = new SetOption {{}, std::unique_ptr($3)}; } + { $$ = new SetOption {std::unique_ptr($3)}; } | '(' TK_SETINFO attribute ')' - { $$ = new SetInfo {{}, std::unique_ptr($3)}; } + { $$ = new SetInfo {std::unique_ptr($3)}; } | '(' TK_DECLARESORT symbol TK_NUM ')' - { $$ = new DeclareSort {{}, std::unique_ptr($3), std::unique_ptr($4)}; } + { $$ = new DeclareSort {std::unique_ptr($3), std::unique_ptr($4)}; } | '(' TK_DEFINESORT symbol '(' symbol_list ')' sort ')' - { $$ = new DefineSort {{}, std::unique_ptr($3), std::unique_ptr>>($5), std::unique_ptr($7)}; } + { $$ = new DefineSort {std::unique_ptr($3), std::unique_ptr>>($5), std::unique_ptr($7)}; } | '(' TK_DECLAREFUN symbol '(' sort_list ')' sort ')' - { $$ = new DeclareFun {{}, std::unique_ptr($3), std::unique_ptr>($5), std::unique_ptr($7)}; } + { $$ = new DeclareFun {std::unique_ptr($3), std::unique_ptr>($5), std::unique_ptr($7)}; } | '(' TK_DECLARECONST const_val sort ')' - { $$ = new DeclareConst {{}, std::unique_ptr($3), std::unique_ptr($4)}; } + { $$ = new DeclareConst {std::unique_ptr($3), std::unique_ptr($4)}; } | '(' TK_DEFINEFUN symbol '(' sorted_var_list ')' sort term ')' - { $$ = new DefineFun {{}, std::unique_ptr($3), std::unique_ptr>($5), std::unique_ptr($7), std::unique_ptr($8)}; } + { $$ = new DefineFun {std::unique_ptr($3), std::unique_ptr>($5), std::unique_ptr($7), std::unique_ptr($8)}; } | '(' TK_PUSH TK_NUM ')' - { $$ = new PushNode {{}, std::stoi(*$3)}; delete $3; } + { $$ = new PushNode {std::stoi(*$3)}; delete $3; } | '(' TK_POP TK_NUM ')' - { $$ = new PopNode {{}, std::stoi(*$3)}; delete $3; } + { $$ = new PopNode {std::stoi(*$3)}; delete $3; } | '(' TK_ASSERT term ')' - { $$ = new AssertNode{{}, std::unique_ptr($3)}; } + { $$ = new AssertNode{std::unique_ptr($3)}; } | '(' TK_CHECKSAT ')' { $$ = new CheckSatNode(); } | '(' TK_GETASSERTIONS ')' @@ -187,27 +187,27 @@ command: '(' TK_SETLOGIC symbol ')' | '(' TK_GETPROOF ')' { $$ = new GetProof() ; } | '(' TK_GETITPS term_list ')' - { $$ = new GetInterpolants {{}, std::unique_ptr>($3)}; } + { $$ = new GetInterpolants {std::unique_ptr>($3)}; } | '(' TK_GETUNSATCORE ')' { $$ = new GetUnsatCore(); } | '(' TK_GETVALUE '(' term_list ')' ')' - { $$ = new GetValue { {}, std::unique_ptr>($4) }; } + { $$ = new GetValue {std::unique_ptr>($4)}; } | '(' TK_GETMODEL ')' { $$ = new GetModel(); } | '(' TK_GETASSIGNMENT ')' { $$ = new GetAssignment(); } | '(' TK_GETOPTION TK_KEY ')' - { $$ = new GetOption{ {}, std::unique_ptr($3) }; } + { $$ = new GetOption{ std::unique_ptr($3) }; } | '(' TK_GETOPTION predef_key ')' - { $$ = new GetOption{ {}, std::unique_ptr($3) }; } + { $$ = new GetOption{ std::unique_ptr($3) }; } | '(' TK_GETINFO info_flag ')' - { $$ = new GetInfo{ {}, std::unique_ptr($3) }; } + { $$ = new GetInfo{ std::unique_ptr($3) }; } | '(' TK_SIMPLIFY ')' { $$ = new Simplify(); } | '(' TK_EXIT ')' { $$ = new Exit(); } | '(' TK_ECHO TK_STR ')' - { $$ = new Echo{ {}, std::unique_ptr($3) }; } + { $$ = new Echo{ std::unique_ptr($3) }; } ; attribute_list: From 01e339ea9b2977f1c718e9bf0a42818d6482e930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Tue, 20 Sep 2022 11:31:07 +0200 Subject: [PATCH 25/76] Parser: Allow TermNode arguments to be nullptr --- src/parsers/smt2new/smt2newcontext.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/parsers/smt2new/smt2newcontext.cc b/src/parsers/smt2new/smt2newcontext.cc index 3f188e9f8..3e5903928 100644 --- a/src/parsers/smt2new/smt2newcontext.cc +++ b/src/parsers/smt2new/smt2newcontext.cc @@ -28,6 +28,10 @@ TermNode::~TermNode() { queue.emplace_back(Qel{this, static_cast(0)}); while (not queue.empty()) { auto & [termNode, processed] = queue.back(); + if (not termNode->arguments) { + queue.pop_back(); + continue; + } auto & children = *(termNode->arguments); if (processed < children.size()) { ++ processed; From 0965186a4e6722eb94d3c95f7ce6d42369755c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 13 Oct 2022 14:41:27 +0200 Subject: [PATCH 26/76] Parser: fix debug code --- src/parsers/smt2new/smt2newcontext.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.cc b/src/parsers/smt2new/smt2newcontext.cc index 3e5903928..58bc0bf44 100644 --- a/src/parsers/smt2new/smt2newcontext.cc +++ b/src/parsers/smt2new/smt2newcontext.cc @@ -10,16 +10,12 @@ namespace { TermNode* node; uint32_t processed; }; - bool checkProcessedProperty(Qel & element) { - auto & [termNode, processed] = element; + bool checkProcessedProperty(TermNode * termNode, size_t processed) { assert(termNode); - if (auto normalTermNode = dynamic_cast(termNode)) { - return processed == normalTermNode->arguments->size(); - } else if (auto letTermNode = dynamic_cast(termNode)) { + if (auto letTermNode = dynamic_cast(termNode)) { return processed == letTermNode->arguments->size() + letTermNode->bindings->size(); } - assert(false); - return false; + return processed == termNode->arguments->size(); } } @@ -45,7 +41,7 @@ TermNode::~TermNode() { } } assert(termNode); - assert(checkProcessedProperty(queue.back())); + assert(checkProcessedProperty(termNode, processed)); for (auto child : *arguments) { assert(child->arguments->empty()); From 3aeeff17fd442a74cd6af378ac2a61cee2a3b1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 13 Oct 2022 14:42:50 +0200 Subject: [PATCH 27/76] Parser: Fix deleting a TermNode --- src/parsers/smt2new/smt2newcontext.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.cc b/src/parsers/smt2new/smt2newcontext.cc index 58bc0bf44..eb146fb7b 100644 --- a/src/parsers/smt2new/smt2newcontext.cc +++ b/src/parsers/smt2new/smt2newcontext.cc @@ -32,22 +32,25 @@ TermNode::~TermNode() { if (processed < children.size()) { ++ processed; queue.emplace_back(Qel{children[processed - 1], 0}); + continue; } else if (auto letTermNode = dynamic_cast(termNode)) { auto & bindings = *(letTermNode->bindings); assert(children.size() == 1); if (processed < bindings.size()+1) { ++ processed; - queue.emplace_back(Qel{bindings[processed -1]->term, 0}); + queue.emplace_back(Qel{bindings[processed - 2]->term, 0}); + continue; } } assert(termNode); assert(checkProcessedProperty(termNode, processed)); - for (auto child : *arguments) { - assert(child->arguments->empty()); + for (auto child : *(termNode->arguments)) { + assert(not child->arguments or child->arguments->empty()); delete child; } termNode->arguments->clear(); // delete is not called on the pointers + assert(termNode->arguments->empty()); queue.pop_back(); } } From 61e51348c34704a5c191c9ae758e9fd5c54ca96c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 13 Oct 2022 14:43:08 +0200 Subject: [PATCH 28/76] Parser: fix deleting a SortNode --- src/parsers/smt2new/smt2newcontext.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 504c17254..274da47f3 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -170,10 +170,11 @@ struct SortNode : public GeneralNode { if (processed < children.size()) { ++processed; queue.emplace_back(Qel{children[processed - 1], 0}); + continue; } assert(processed == children.size()); assert(node); - for (auto child : *sortList) { + for (auto child : *(node->sortList)) { assert(child->sortList->empty()); delete child; } From 102dac1730092ec79c2d48ba0fcb21da99976987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 13 Oct 2022 15:14:53 +0200 Subject: [PATCH 29/76] Parser: fix memory leak on GetValue --- src/parsers/smt2new/smt2newcontext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 274da47f3..6a268e595 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -325,6 +325,7 @@ struct GetInterpolants : public CommandNode { struct GetValue : public CommandNode { std::unique_ptr> terms; GetValue(std::unique_ptr> && terms) : terms(std::move(terms)) {} + ~GetValue() { for (auto node : *terms) { delete node; } } }; struct GetOption : public CommandNode { From cb95ca48f1185130b29906112947717f4ac3bd23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 13 Oct 2022 16:17:00 +0200 Subject: [PATCH 30/76] Parser: fix memory leak on GetInterpolants --- src/parsers/smt2new/smt2newcontext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 6a268e595..74149c057 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -319,6 +319,7 @@ struct AssertNode : public CommandNode { struct GetInterpolants : public CommandNode { std::unique_ptr> configuration; GetInterpolants(std::unique_ptr> && configuration) : configuration(std::move(configuration)) {} + ~GetInterpolants() { for (auto node : *configuration) { delete node; } } }; From ebdc605a4ac311c8e039db928c6acd9af6ff0db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 13 Oct 2022 16:39:45 +0200 Subject: [PATCH 31/76] Parser: free terms in let term bindings --- src/parsers/smt2new/smt2newcontext.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/parsers/smt2new/smt2newcontext.cc b/src/parsers/smt2new/smt2newcontext.cc index eb146fb7b..a797a4180 100644 --- a/src/parsers/smt2new/smt2newcontext.cc +++ b/src/parsers/smt2new/smt2newcontext.cc @@ -49,6 +49,12 @@ TermNode::~TermNode() { assert(not child->arguments or child->arguments->empty()); delete child; } + if (auto letTermNode = dynamic_cast(termNode)) { + for (auto & binding : *(letTermNode->bindings)) { + delete binding->term; + } + letTermNode->bindings->clear(); + } termNode->arguments->clear(); // delete is not called on the pointers assert(termNode->arguments->empty()); queue.pop_back(); From 60b797c9e7cee7525b76b8bfc8984b1cdfc43270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 13 Oct 2022 17:35:59 +0200 Subject: [PATCH 32/76] Parser: correct deletion on top-level lets In current implementation let terms' bindings' terms are deleted inside TermNode::~TermNode. However, ~TermNode itself cannot know whether it is a LetTermNode. As a result, the top-level LetTermNode's bindings are not deleted. The commit fixes this by adding a destructor for LetTermNode. The destructor is guaranteed not to recurse because ~TermNode will take care of clearing bindings vector on all other TermNodes apart from the top-level. --- src/parsers/smt2new/smt2newcontext.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 74149c057..51e1785ab 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -262,6 +262,13 @@ struct LetTermNode : public TermNode { : TermNode{std::make_unique>(std::vector{term})} , bindings(std::move(bindings)) {} + + // Note: ~TermNode makes sure that bindings is non-zero only on top-level LetTermNodes + ~LetTermNode() override { + for (auto & binding : *bindings) { + delete binding->term; + } + } }; struct ForallNode : public TermNode { From d468946ac92110df222cf71b358dcb6d1f8b1dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 13 Oct 2022 18:17:03 +0200 Subject: [PATCH 33/76] Parser: Fix memory leak on SortedVarNode --- src/parsers/smt2new/smt2newcontext.h | 12 ++++++------ src/parsers/smt2new/smt2newparser.yy | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 51e1785ab..b7751be7a 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -272,15 +272,15 @@ struct LetTermNode : public TermNode { }; struct ForallNode : public TermNode { - std::unique_ptr> quantified; - ForallNode(TermNode * term, std::unique_ptr> && quantified) + std::unique_ptr>> quantified; + ForallNode(TermNode * term, std::unique_ptr>> && quantified) : TermNode{std::make_unique>(std::vector{term})} , quantified(std::move(quantified)) {} }; struct ExistsNode : public TermNode { - std::unique_ptr> quantified; - ExistsNode(TermNode * term, std::unique_ptr> && quantified) + std::unique_ptr>> quantified; + ExistsNode(TermNode * term, std::unique_ptr>> && quantified) : TermNode{std::make_unique>(std::vector{term})} , quantified(std::move(quantified)) {} }; @@ -294,11 +294,11 @@ struct AnnotationNode : public TermNode { struct DefineFun : public CommandNode { std::unique_ptr name; - std::unique_ptr> args; + std::unique_ptr>> args; std::unique_ptr returnSort; std::unique_ptr term; DefineFun(std::unique_ptr && name, - std::unique_ptr> && args, + std::unique_ptr>> && args, std::unique_ptr && returnSort, std::unique_ptr && term) : name(std::move(name)) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 1741b131e..b6efc7f64 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -89,7 +89,7 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma CommandNode * n_command; TermNode * n_term; SortedVarNode * n_sortedVar; - std::vector * n_sortedVarList; + std::vector> * n_sortedVarList; std::vector * n_termList; std::vector * n_attributeList; std::vector * n_commandList; @@ -173,7 +173,7 @@ command: '(' TK_SETLOGIC symbol ')' | '(' TK_DECLARECONST const_val sort ')' { $$ = new DeclareConst {std::unique_ptr($3), std::unique_ptr($4)}; } | '(' TK_DEFINEFUN symbol '(' sorted_var_list ')' sort term ')' - { $$ = new DefineFun {std::unique_ptr($3), std::unique_ptr>($5), std::unique_ptr($7), std::unique_ptr($8)}; } + { $$ = new DefineFun {std::unique_ptr($3), std::unique_ptr>>($5), std::unique_ptr($7), std::unique_ptr($8)}; } | '(' TK_PUSH TK_NUM ')' { $$ = new PushNode {std::stoi(*$3)}; delete $3; } | '(' TK_POP TK_NUM ')' @@ -316,9 +316,9 @@ var_binding: '(' symbol term ')' ; sorted_var_list: - { $$ = new std::vector(); } + { $$ = new std::vector>(); } | sorted_var_list sorted_var - { $1->emplace_back(std::move(*$2)); $$ = $1; } + { $1->emplace_back(std::unique_ptr($2)); $$ = $1; } ; sorted_var: '(' symbol sort ')' @@ -343,9 +343,9 @@ term: spec_const | '(' TK_LET '(' var_binding_list ')' term ')' { $$ = new LetTermNode {$6, std::unique_ptr>>($4)}; } | '(' TK_FORALL '(' sorted_var_list ')' term ')' // todo: AST traversal must ensure that sorted_var_list is non-empty - { $$ = new ForallNode {$6, std::unique_ptr>($4)}; } + { $$ = new ForallNode {$6, std::unique_ptr>>($4)}; } | '(' TK_EXISTS '(' sorted_var_list ')' term ')' // todo: AST traversal must ensure that sorted_var_list is non-empty - { $$ = new ExistsNode {$6, std::unique_ptr>($4)}; } + { $$ = new ExistsNode {$6, std::unique_ptr>>($4)}; } | '(' '!' term attribute_list ')' // todo: AST traversal must ensure that attribute_list is non-empty { $$ = new AnnotationNode {$3, std::unique_ptr>($4)}; } ; From 5bc39548e580aca459dc27caec221437c28d9907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Fri, 14 Oct 2022 13:44:59 +0200 Subject: [PATCH 34/76] Parser: fix delete/new mismatch --- src/parsers/smt2new/smt2newcontext.h | 31 +++++++++++++++------------- src/parsers/smt2new/smt2newparser.yy | 24 ++++++++++----------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index b7751be7a..0b7d59bb8 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -101,20 +101,23 @@ struct IdentifierNode : public GeneralNode { }; -class OptionNode : public GeneralNode { }; - -struct PrintSuccess : public OptionNode { bool value; }; -struct ExpandDefinitions : public OptionNode { bool value; }; -struct InteractiveMode : public OptionNode { bool value; }; -struct ProduceProofs : public OptionNode { bool value; }; -struct ProduceUnsatCores : public OptionNode { bool value; }; -struct ProduceModels : public OptionNode { bool value; }; -struct ProduceAssignments : public OptionNode { bool value; }; -struct RegularOutputChannel : public OptionNode { std::string value; }; -struct DiagnosticOutputChannel : public OptionNode { std::string value; }; -struct RandomSeed : public OptionNode { int value; }; -struct Verbosity : public OptionNode { int value; }; -struct Attribute : public OptionNode { AttributeNode value; }; +class OptionNode : public GeneralNode { +public: + virtual ~OptionNode() = default; +}; + +struct PrintSuccess : public OptionNode { bool value; PrintSuccess(bool value) : value(value) {} }; +struct ExpandDefinitions : public OptionNode { bool value; ExpandDefinitions(bool value) : value(value) {} }; +struct InteractiveMode : public OptionNode { bool value; InteractiveMode(bool value) : value(value) {} }; +struct ProduceProofs : public OptionNode { bool value; ProduceProofs(bool value) : value(value) {} }; +struct ProduceUnsatCores : public OptionNode { bool value; ProduceUnsatCores(bool value) : value(value) {} }; +struct ProduceModels : public OptionNode { bool value; ProduceModels(bool value) : value(value) {} }; +struct ProduceAssignments : public OptionNode { bool value; ProduceAssignments(bool value): value(value) {} }; +struct RegularOutputChannel : public OptionNode { std::string value; RegularOutputChannel(std::string value) : value(value) {} }; +struct DiagnosticOutputChannel : public OptionNode { std::string value; DiagnosticOutputChannel(std::string value) : value(value) {} }; +struct RandomSeed : public OptionNode { int value; RandomSeed(int value) : value(value) {} }; +struct Verbosity : public OptionNode { int value; Verbosity(int value) : value(value) {} }; +struct Attribute : public OptionNode { AttributeNode value; Attribute(AttributeNode && value) : value(std::move(value)) {} }; // Note: classes derived from CommandNodes need to have a constructor because they need to be destructible as CommandNodes. // In particular, CommandNode needs to have a virtual member function (destructor), which forbids aggregate initialization. diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index b6efc7f64..72b901c64 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -380,29 +380,29 @@ b_value: symbol ; option: KW_PRINTSUCCESS b_value - { $$ = new PrintSuccess {{}, $2}; (void)$1; } + { $$ = new PrintSuccess {$2}; (void)$1; } | KW_EXPANDDEFINITIONS b_value - { $$ = new ExpandDefinitions {{}, $2}; (void)$1; } + { $$ = new ExpandDefinitions {$2}; (void)$1; } | KW_INTERACTIVEMODE b_value - { $$ = new InteractiveMode {{}, $2}; (void)$1; } + { $$ = new InteractiveMode {$2}; (void)$1; } | KW_PRODUCEPROOFS b_value - { $$ = new ProduceProofs {{}, $2}; (void)$1; } + { $$ = new ProduceProofs {$2}; (void)$1; } | KW_PRODUCEUNSATCORES b_value - { $$ = new ProduceUnsatCores {{}, $2}; (void)$1; } + { $$ = new ProduceUnsatCores {$2}; (void)$1; } | KW_PRODUCEMODELS b_value - { $$ = new ProduceModels {{}, $2}; (void)$1; } + { $$ = new ProduceModels {$2}; (void)$1; } | KW_PRODUCEASSIGNMENTS b_value - { $$ = new ProduceAssignments {{}, $2}; (void)$1;} + { $$ = new ProduceAssignments {$2}; (void)$1;} | KW_REGULAROUTPUTCHANNEL TK_STR - { $$ = new RegularOutputChannel {{}, std::move(*$2)}; (void)$1; } + { $$ = new RegularOutputChannel {std::move(*$2)}; (void)$1; delete $2; } | KW_DIAGNOSTICOUTPUTCHANNEL TK_STR - { $$ = new DiagnosticOutputChannel {{}, std::move(*$2)}; (void)$1; } + { $$ = new DiagnosticOutputChannel {std::move(*$2)}; (void)$1; delete $2; } | KW_RANDOMSEED TK_NUM - { $$ = new RandomSeed {{}, std::stoi(*$2) }; free $2; (void)$1; } + { $$ = new RandomSeed { std::stoi(*$2) }; delete $2; (void)$1; } | KW_VERBOSITY TK_NUM - { $$ = new Verbosity {{}, std::stoi(*$2) }; free $2; (void)$1; } + { $$ = new Verbosity { std::stoi(*$2) }; delete $2; (void)$1; } | attribute - { $$ = new Attribute {{}, std::move(*$1) }; } + { $$ = new Attribute { std::move(*$1) }; delete $1; } ; predef_key: KW_SORTS From 7e2f609c84b067c4b08371a7543aef05f0e64eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Fri, 14 Oct 2022 13:50:07 +0200 Subject: [PATCH 35/76] Parser: Fix memory leak on AttributeNode --- src/parsers/smt2new/smt2newcontext.h | 2 +- src/parsers/smt2new/smt2newparser.yy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 0b7d59bb8..558b6d431 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -117,7 +117,7 @@ struct RegularOutputChannel : public OptionNode { std::string value; RegularOutp struct DiagnosticOutputChannel : public OptionNode { std::string value; DiagnosticOutputChannel(std::string value) : value(value) {} }; struct RandomSeed : public OptionNode { int value; RandomSeed(int value) : value(value) {} }; struct Verbosity : public OptionNode { int value; Verbosity(int value) : value(value) {} }; -struct Attribute : public OptionNode { AttributeNode value; Attribute(AttributeNode && value) : value(std::move(value)) {} }; +struct Attribute : public OptionNode { std::unique_ptr value; Attribute(std::unique_ptr && value) : value(std::move(value)) {} }; // Note: classes derived from CommandNodes need to have a constructor because they need to be destructible as CommandNodes. // In particular, CommandNode needs to have a virtual member function (destructor), which forbids aggregate initialization. diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 72b901c64..3e8070a86 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -402,7 +402,7 @@ option: KW_PRINTSUCCESS b_value | KW_VERBOSITY TK_NUM { $$ = new Verbosity { std::stoi(*$2) }; delete $2; (void)$1; } | attribute - { $$ = new Attribute { std::move(*$1) }; delete $1; } + { $$ = new Attribute { std::unique_ptr($1) }; } ; predef_key: KW_SORTS From 166f122a5a1825a51c1a1a47561e6e4dbfa6b167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Fri, 14 Oct 2022 14:03:45 +0200 Subject: [PATCH 36/76] Parser: fix memory leak in AttributeNodes --- src/parsers/smt2new/smt2newcontext.h | 4 ++-- src/parsers/smt2new/smt2newparser.yy | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 558b6d431..282cd00a9 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -289,8 +289,8 @@ struct ExistsNode : public TermNode { }; struct AnnotationNode : public TermNode { - std::unique_ptr> attributes; - AnnotationNode(TermNode * term, std::unique_ptr> && attributes) + std::unique_ptr>> attributes; + AnnotationNode(TermNode * term, std::unique_ptr>> && attributes) : TermNode{std::make_unique>(std::vector{term})} , attributes(std::move(attributes)) {} }; diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 3e8070a86..4e6de85de 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -91,7 +91,7 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma SortedVarNode * n_sortedVar; std::vector> * n_sortedVarList; std::vector * n_termList; - std::vector * n_attributeList; + std::vector> * n_attributeList; std::vector * n_commandList; std::vector> * n_symbolList; std::vector * sexpr_list; @@ -211,9 +211,9 @@ command: '(' TK_SETLOGIC symbol ')' ; attribute_list: - { $$ = new std::vector(); } + { $$ = new std::vector>(); } | attribute_list attribute - { $1->emplace_back(std::move(*$2)); $$ = $1; } + { $1->emplace_back(std::move($2)); $$ = $1; } ; attribute: TK_KEY @@ -347,7 +347,7 @@ term: spec_const | '(' TK_EXISTS '(' sorted_var_list ')' term ')' // todo: AST traversal must ensure that sorted_var_list is non-empty { $$ = new ExistsNode {$6, std::unique_ptr>>($4)}; } | '(' '!' term attribute_list ')' // todo: AST traversal must ensure that attribute_list is non-empty - { $$ = new AnnotationNode {$3, std::unique_ptr>($4)}; } + { $$ = new AnnotationNode {$3, std::unique_ptr>>($4)}; } ; symbol_list: From 123a0d0331216155ca8cb02816240e4815d4f4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Fri, 14 Oct 2022 14:43:09 +0200 Subject: [PATCH 37/76] SExprs: fix infinite recursion --- src/parsers/smt2new/smt2newcontext.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 282cd00a9..edee32fda 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -69,7 +69,12 @@ struct SExpr : public GeneralNode { } assert(not children or processed == (*children)->size()); assert(node); - delete node; + if (children and *children) { + for (SExpr * child : (**children)) { + delete child; + } + (*children)->clear(); + } queue.pop_back(); } } @@ -80,13 +85,6 @@ struct AttributeValueNode : public GeneralNode { AttributeValueNode(std::unique_ptr && node) : value(std::move(node)) {} AttributeValueNode(std::unique_ptr && node) : value(std::move(node)) {} AttributeValueNode(std::unique_ptr> && node) : value(std::move(node)) {} - ~AttributeValueNode() { - if (auto vec = std::get_if>>(&value)) { - for (auto el : (**vec)) { - delete el; - } - } - } }; struct AttributeNode : public GeneralNode { From 930128a6b3240bb96f139e9f693b13cdbdc01343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Fri, 14 Oct 2022 16:23:43 +0200 Subject: [PATCH 38/76] SExprs: Fix destruction method --- src/parsers/smt2new/smt2newcontext.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index edee32fda..1d36cbc19 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -66,6 +66,7 @@ struct SExpr : public GeneralNode { if (children and processed < (*children)->size()) { ++processed; queue.emplace_back(Qel{(**children)[processed - 1], 0}); + continue; } assert(not children or processed == (*children)->size()); assert(node); @@ -85,6 +86,13 @@ struct AttributeValueNode : public GeneralNode { AttributeValueNode(std::unique_ptr && node) : value(std::move(node)) {} AttributeValueNode(std::unique_ptr && node) : value(std::move(node)) {} AttributeValueNode(std::unique_ptr> && node) : value(std::move(node)) {} + ~AttributeValueNode() { + if (auto vec = std::get_if>>(&value)) { + for (auto el : (**vec)) { + delete el; + } + } + } }; struct AttributeNode : public GeneralNode { From 69772357596860fe2eab1b20e2fad4c3e505f00e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Sun, 16 Oct 2022 21:56:38 +0200 Subject: [PATCH 39/76] Parser: fix memory leaks in set-option --- src/parsers/smt2new/smt2newcontext.h | 4 ++-- src/parsers/smt2new/smt2newparser.yy | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 1d36cbc19..6e98e1592 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -119,8 +119,8 @@ struct ProduceProofs : public OptionNode { bool value; ProduceProofs(bool value) struct ProduceUnsatCores : public OptionNode { bool value; ProduceUnsatCores(bool value) : value(value) {} }; struct ProduceModels : public OptionNode { bool value; ProduceModels(bool value) : value(value) {} }; struct ProduceAssignments : public OptionNode { bool value; ProduceAssignments(bool value): value(value) {} }; -struct RegularOutputChannel : public OptionNode { std::string value; RegularOutputChannel(std::string value) : value(value) {} }; -struct DiagnosticOutputChannel : public OptionNode { std::string value; DiagnosticOutputChannel(std::string value) : value(value) {} }; +struct RegularOutputChannel : public OptionNode { std::unique_ptr value; RegularOutputChannel(std::unique_ptr && value) : value(std::move(value)) {} }; +struct DiagnosticOutputChannel : public OptionNode { std::unique_ptr value; DiagnosticOutputChannel(std::unique_ptr && value) : value(std::move(value)) {} }; struct RandomSeed : public OptionNode { int value; RandomSeed(int value) : value(value) {} }; struct Verbosity : public OptionNode { int value; Verbosity(int value) : value(value) {} }; struct Attribute : public OptionNode { std::unique_ptr value; Attribute(std::unique_ptr && value) : value(std::move(value)) {} }; diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 4e6de85de..c8882620b 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -380,27 +380,27 @@ b_value: symbol ; option: KW_PRINTSUCCESS b_value - { $$ = new PrintSuccess {$2}; (void)$1; } + { $$ = new PrintSuccess {$2}; delete $1; } | KW_EXPANDDEFINITIONS b_value - { $$ = new ExpandDefinitions {$2}; (void)$1; } + { $$ = new ExpandDefinitions {$2}; delete $1; } | KW_INTERACTIVEMODE b_value - { $$ = new InteractiveMode {$2}; (void)$1; } + { $$ = new InteractiveMode {$2}; delete $1; } | KW_PRODUCEPROOFS b_value - { $$ = new ProduceProofs {$2}; (void)$1; } + { $$ = new ProduceProofs {$2}; delete $1; } | KW_PRODUCEUNSATCORES b_value - { $$ = new ProduceUnsatCores {$2}; (void)$1; } + { $$ = new ProduceUnsatCores {$2}; delete $1; } | KW_PRODUCEMODELS b_value - { $$ = new ProduceModels {$2}; (void)$1; } + { $$ = new ProduceModels {$2}; delete $1; } | KW_PRODUCEASSIGNMENTS b_value - { $$ = new ProduceAssignments {$2}; (void)$1;} + { $$ = new ProduceAssignments {$2}; delete $1;} | KW_REGULAROUTPUTCHANNEL TK_STR - { $$ = new RegularOutputChannel {std::move(*$2)}; (void)$1; delete $2; } + { $$ = new RegularOutputChannel {std::unique_ptr($2)}; delete $1; } | KW_DIAGNOSTICOUTPUTCHANNEL TK_STR - { $$ = new DiagnosticOutputChannel {std::move(*$2)}; (void)$1; delete $2; } + { $$ = new DiagnosticOutputChannel {std::unique_ptr($2)}; delete $1; } | KW_RANDOMSEED TK_NUM - { $$ = new RandomSeed { std::stoi(*$2) }; delete $2; (void)$1; } + { $$ = new RandomSeed { std::stoi(*$2) }; delete $2; delete $1; } | KW_VERBOSITY TK_NUM - { $$ = new Verbosity { std::stoi(*$2) }; delete $2; (void)$1; } + { $$ = new Verbosity { std::stoi(*$2) }; delete $2; delete $1; } | attribute { $$ = new Attribute { std::unique_ptr($1) }; } ; From d34210b3eee49173c8be1362eb5006d8ec56b24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Sun, 16 Oct 2022 22:11:19 +0200 Subject: [PATCH 40/76] parser: Fix memory leak in numeral_list --- src/parsers/smt2new/smt2newcontext.h | 2 +- src/parsers/smt2new/smt2newparser.yy | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 6e98e1592..4459ce6cb 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -103,7 +103,7 @@ struct AttributeNode : public GeneralNode { struct IdentifierNode : public GeneralNode { std::unique_ptr symbol; - std::unique_ptr> numeralList; + std::unique_ptr>> numeralList; }; diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index c8882620b..6c6dd2b7b 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -80,7 +80,7 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma VarBindingNode * n_varBinding; std::vector> * n_varBindingList; std::vector * n_sortList; - std::vector * n_numeralList; + std::vector> * n_numeralList; AttributeNode * n_attribute; AttributeValueNode * n_attributeValue; SpecConstNode * n_specConst; @@ -237,7 +237,7 @@ attribute_value: spec_const identifier: symbol { $$ = new IdentifierNode {{}, std::unique_ptr($1), {}}; } | '(' '_' symbol numeral_list ')' - { $$ = new IdentifierNode {{}, std::unique_ptr($3), std::unique_ptr>($4)}; } + { $$ = new IdentifierNode {{}, std::unique_ptr($3), std::unique_ptr>>($4)}; } ; sort: identifier @@ -294,9 +294,9 @@ const_val: symbol ; numeral_list: numeral_list TK_NUM - { $1->emplace_back(std::move(*$2)); } + { $1->emplace_back(std::unique_ptr($2)); } | TK_NUM - { $$ = new std::vector{std::string(std::move(*$1))}; } + { $$ = new std::vector>(); $$->emplace_back(std::unique_ptr{$1}); } ; qual_identifier: identifier From 7c833c2af52571bb127983bef7493b25a0ae4524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 17 Oct 2022 07:31:41 +0200 Subject: [PATCH 41/76] Parser: error destructor for CommandList --- src/parsers/smt2new/smt2newparser.yy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 6c6dd2b7b..e1e37668c 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -104,6 +104,8 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma } %destructor { delete $$; } +%destructor { delete $$; } +%destructor { for (CommandNode * n : *$$ ) { delete n; }; delete $$; } %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO From 4b0c1c1e0431061927d6f83d9f2a104052453345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 17 Oct 2022 07:36:42 +0200 Subject: [PATCH 42/76] Parser: error destructor for TermNode --- src/parsers/smt2new/smt2newparser.yy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index e1e37668c..ff0263f8a 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -106,6 +106,7 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma %destructor { delete $$; } %destructor { delete $$; } %destructor { for (CommandNode * n : *$$ ) { delete n; }; delete $$; } +%destructor { for (TermNode * n : *$$) { delete n; }; delete $$; } %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO From 2f26c68258eeee0e160a85cea34044b45d442026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 17 Oct 2022 07:40:20 +0200 Subject: [PATCH 43/76] Parser: error destructor for QualIdentifier --- src/parsers/smt2new/smt2newparser.yy | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index ff0263f8a..22c204526 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -107,6 +107,8 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma %destructor { delete $$; } %destructor { for (CommandNode * n : *$$ ) { delete n; }; delete $$; } %destructor { for (TermNode * n : *$$) { delete n; }; delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO From 0c56241807093b638711ac4db5c19b457fdc1ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 17 Oct 2022 07:58:58 +0200 Subject: [PATCH 44/76] Parser: error destructor for n_numeralList --- src/parsers/smt2new/smt2newparser.yy | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 22c204526..4462f89b4 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -109,6 +109,7 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma %destructor { for (TermNode * n : *$$) { delete n; }; delete $$; } %destructor { delete $$; } %destructor { delete $$; } +%destructor { delete $$; } %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO From 1f9d40cf31d41f364f6b7228a50e85e6ac753e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 17 Oct 2022 11:29:06 +0200 Subject: [PATCH 45/76] Parser: remove unused tokens --- src/parsers/smt2new/smt2newparser.yy | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 4462f89b4..73cd2f56c 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -98,8 +98,6 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma std::string * str; bool n_bool; OptionNode * n_option; - ASTNode * snode; - std::vector> * snode_list; osmttokens::smt2token tok; } From 7718a74bcbdf412f1b85f3ecb2355578554304eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 17 Oct 2022 11:29:34 +0200 Subject: [PATCH 46/76] Parser: add missing error destructors and sort --- src/parsers/smt2new/smt2newparser.yy | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 73cd2f56c..7c0fe9ad6 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -101,13 +101,29 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma osmttokens::smt2token tok; } -%destructor { delete $$; } -%destructor { delete $$; } -%destructor { for (CommandNode * n : *$$ ) { delete n; }; delete $$; } -%destructor { for (TermNode * n : *$$) { delete n; }; delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } +%destructor { for (CommandNode * n : *$$) { delete n; }; delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } %destructor { delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } +%destructor { for (SortNode * n : *$$) { delete n; }; delete $$; } +%destructor { delete $$; } %destructor { delete $$; } -%destructor { delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } +%destructor { for (TermNode * n : *$$) { delete n; }; delete $$; } +%destructor { delete $$->term; delete $$; } +%destructor { delete $$; } +%destructor { delete $$; } +%destructor { for (SExpr * n : *$$) { delete n; }; delete $$; } +%destructor { delete $$; } %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO From 9888f01ce885aa8d6eb5f94be3e459fc4e90e352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 17 Oct 2022 18:25:59 +0200 Subject: [PATCH 47/76] Interpret: fix memory leak on parse errors --- src/api/Interpret.cc | 13 ++++++------- src/parsers/smt2new/smt2newcontext.h | 2 ++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index a6074ea0c..7da349d9b 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -1010,14 +1010,13 @@ void Interpret::execute(ASTNode const & r) { int Interpret::interpFile(FILE* in) { Smt2newContext context(in); int rval = yyparse(&context); - - if (rval != 0) return rval; - - for (auto command : context.getRoot()) { -// execute(command); - delete command; + if (context.hasRoot()) { + for (auto command : context.getRoot()) { + // if (rval == 0) { execute(command); } + delete command; + } } - return 0; + return rval; } int Interpret::interpFile(char *content){ diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 4459ce6cb..ab6c01c84 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -330,6 +330,7 @@ struct PopNode : public CommandNode { struct AssertNode : public CommandNode { std::unique_ptr term; AssertNode(std::unique_ptr && term) : term(std::move(term)) {} + ~AssertNode() override = default; }; struct GetInterpolants : public CommandNode { @@ -374,6 +375,7 @@ class Smt2newContext { FILE* is; char* ib; bool interactive; + bool hasRoot() const { return root != nullptr; } inline std::vector const & getRoot() { return *root; }; Smt2newContext(FILE* in) : From 3d42f087962cf92708d361d058bc8a019f6deae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 24 Oct 2022 15:11:51 +0200 Subject: [PATCH 48/76] Interpret: refactor SetInfo [WiP] --- src/api/Interpret.cc | 130 ++++++++++++--------- src/api/Interpret.h | 26 ++++- src/options/SMTConfig.cc | 26 ++--- src/options/SMTConfig.h | 166 +++++++++++++++------------ src/parsers/smt2new/smt2newcontext.h | 29 ++++- 5 files changed, 228 insertions(+), 149 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 7da349d9b..911a20a30 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -46,19 +46,8 @@ Interpret::getParsedFormula() return root; } -void Interpret::setInfo(ASTNode const & n) { - assert(n.getType() == ASTType::UATTR_T || n.getType() == ASTType::PATTR_T); - - std::string name; - if (not n.hasValue()) { - ASTNode const & an = *(*n.children)[0]; - assert(an.getType() == ASTType::UATTR_T || an.getType() == ASTType::PATTR_T); - name = an.getValue(); - } - else // Normal option - name = n.getValue(); +void Interpret::setInfo(std::string const & name) { - config.setInfo(std::move(name), Info(n)); } void Interpret::getInfo(ASTNode const & n) { @@ -112,29 +101,81 @@ using opensmt::Logic_t; using opensmt::getLogicFromString; using namespace osmttokens; -void Interpret::interp(ASTNode const & n) { +void Interpret::interp(CommandNode const * n) { + if (auto setLogic = dynamic_cast(n)) { + return interp(*setLogic); + } else if (auto setInfo = dynamic_cast(n)) { + return interp(*setInfo); + } else if (auto setOption = dynamic_cast(n)) { + return interp(*setOption); + } else if (auto getInfo = dynamic_cast(n)) { + return interp(*getInfo); + } else if (auto getOption = dynamic_cast(n)) { + return interp(*getOption); + } else if (auto declareSort = dynamic_cast(n)) { + return interp(*declareSort); + } else if (auto declareFun = dynamic_cast(n)) { + return interp(*declareFun); + } else if (auto declareConst = dynamic_cast(n)) { + return interp(*declareConst); + } else if (auto assertNode = dynamic_cast(n)) { + return interp(*assertNode); + } else if (auto defineFun = dynamic_cast(n)) { + return interp(*defineFun); + } else if (auto simplify = dynamic_cast(n)) { + return interp(*simplify); + } else if (auto checkSatNode = dynamic_cast(n)) { + return interp(*checkSatNode); + } else if (auto getInterpolants = dynamic_cast(n)) { + return interp(*getInterpolants); + } else if (auto getAssignment = dynamic_cast(n)) { + return interp(*getAssignment); + } else if (auto getValue = dynamic_cast(n)) { + return interp(*getValue); + } else if (auto getModel = dynamic_cast(n)) { + return interp(*getModel); + } else if (auto echo = dynamic_cast(n)) { + return interp(*echo); + } else if (auto pushNode = dynamic_cast(n)) { + return interp(*pushNode); + } else if (auto popNode = dynamic_cast(n)) { + return interp(*popNode); + } else if (auto exit = dynamic_cast(n)) { + return interp(*exit); + } else { + notify_formatted(true, "Unimplemented command"); + } +} + +void Interpret::interp(SetLogic const & n) { + std::string const & logic_name = n.getLogicName(); + if (isInitialized()) { + notify_formatted(true, "logic has already been set to %s", main_solver->getLogic().getName().data()); + } else { + auto logic_type = getLogicFromString(logic_name); + if (logic_type == Logic_t::UNDEF) { + notify_formatted(true, "unknown logic %s", logic_name.c_str()); + return; + } + initializeLogic(logic_type); + main_solver = createMainSolver(logic_name); + main_solver->initialize(); + notify_success(); + } +} + +void Interpret::interp(SetInfo const & n) { + std::string name = n.getName(); + config.setInfo(n.getName(), ConfValue(n.getValue())); + notify_success(); +} + + /* +void Interpret::interp(CommandNode const & n) { assert(n.getType() == ASTType::CMD_T); const smt2token cmd = n.getToken(); try { - switch (cmd.x) { - case t_setlogic: { - ASTNode const & logic_n = *(*n.children)[0]; - std::string const & logic_name = logic_n.getValue(); - if (isInitialized()) { - notify_formatted(true, "logic has already been set to %s", main_solver->getLogic().getName().data()); - } else { - auto logic_type = getLogicFromString(logic_name); - if (logic_type == Logic_t::UNDEF) { - notify_formatted(true, "unknown logic %s", logic_name.c_str()); - break; - } - initializeLogic(logic_type); - main_solver = createMainSolver(logic_name); - main_solver->initialize(); - notify_success(); - } - break; - } + case t_setinfo: setInfo(*(*n.children)[0]); notify_success(); @@ -286,20 +327,7 @@ void Interpret::interp(ASTNode const & n) { break; } - case t_writestate: { - if (not isInitialized()) { - notify_formatted(true, "Illegal command before set-logic: write-state"); - } else { - if (main_solver->solverEmpty()) { - sstat status = main_solver->simplifyFormulas(); - if (status == s_Error) - notify_formatted(true, "write-state"); - } else { - writeState((*n.children)[0]->getValue()); - } - } - break; - } + case t_echo: { std::string const & str = (*n.children)[0]->getValue(); notify_formatted(false, "%s", str.c_str()); @@ -344,6 +372,7 @@ void Interpret::interp(ASTNode const & n) { notify_formatted(true, e.what()); } } +*/ bool Interpret::addLetFrame(std::vector const & names, vec const& args, LetRecords& letRecords) { @@ -1000,19 +1029,12 @@ void Interpret::notify_success() { } } -void Interpret::execute(ASTNode const & r) { - for (auto const & command : *r.children) { - if (f_exit) break; - interp(*command); - } -} - int Interpret::interpFile(FILE* in) { Smt2newContext context(in); int rval = yyparse(&context); if (context.hasRoot()) { for (auto command : context.getRoot()) { - // if (rval == 0) { execute(command); } + if (rval == 0 and not f_exit) { interp(command); } delete command; } } diff --git a/src/api/Interpret.h b/src/api/Interpret.h index 94dcd2c41..e7948496e 100644 --- a/src/api/Interpret.h +++ b/src/api/Interpret.h @@ -147,7 +147,7 @@ class Interpret { SRef sortFromASTNode(ASTNode const & n) const; static SortSymbol sortSymbolFromASTNode(ASTNode const & node); - void setInfo(ASTNode const & n); + void setInfo(std::string const & str); void getInfo(ASTNode const & n); void setOption(ASTNode const & n); void getOption(ASTNode const & n); @@ -169,8 +169,27 @@ class Interpret { virtual void exit(); void getInterpolants(const ASTNode& n); - void interp (ASTNode const & n); - + void interp(CommandNode const * n); + void interp(SetLogic const & n); + void interp(SetInfo const & n); + void interp(SetOption const & n); + void interp(GetInfo const & n); + void interp(GetOption const & n); + void interp(DeclareSort const & n); + void interp(DeclareFun const & n); + void interp(DeclareConst const & n); + void interp(AssertNode const & n); + void interp(DefineFun const & n); + void interp(Simplify const & n); + void interp(CheckSatNode const & n); + void interp(GetInterpolants const & n); + void interp(GetAssignment const & n); + void interp(GetValue const & n); + void interp(GetModel const & n); + void interp(Echo const & n); + void interp(PushNode const & n); + void interp(PopNode const & n); + void interp(Exit const & n); void notify_formatted(bool error, const char* s, ...); void notify_success(); void comment_formatted(const char* s, ...) const; @@ -192,7 +211,6 @@ class Interpret { int interpFile(char *content); int interpPipe(); - void execute(ASTNode const & n); bool gotExit() const { return f_exit; } ValPair getValue (PTRef tr) const; diff --git a/src/options/SMTConfig.cc b/src/options/SMTConfig.cc index 8bfabfa10..fd73d0b22 100644 --- a/src/options/SMTConfig.cc +++ b/src/options/SMTConfig.cc @@ -178,23 +178,17 @@ std::string ConfValue::toString() const { * Class defining the information, configured with set-info ***********************************************************/ -Info::Info(ASTNode const & n) { - assert(n.getType() == ASTType::UATTR_T or n.getType() == ASTType::PATTR_T); - if (not n.children or n.children->empty()) { - value.type = O_EMPTY; - return; +Info::Info(AttributeValueNode const & n) { + // child is attribute_value + if (auto specConst = std::get_if>(&n.value)) { + value = ConfValue(**specConst); + } else if (auto symbolNode = std::get_if>(&n.value)) { + value.strval = (**symbolNode).getString(); + value.type = (**symbolNode).getType(); + } else if (auto sexprList = std::get_if>>(&n.value)) { + value = ConfValue(**sexprList); } else { - // child is attribute_value - ASTNode const & child = *(*n.children)[0]; - - if (child.getType() == ASTType::SPECC_T or child.getType() == ASTType::SEXPRL_T) { - value = ConfValue(child); - } - else if (child.getType() == ASTType::SYM_T or child.getType() == ASTType::QSYM_T) { - value.strval = child.getValue(); - value.type = O_STR; - } - else assert(false); + assert(false); } } diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index 1bd28c8f9..b8d346875 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -29,15 +29,17 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "SolverTypes.h" #include "StringMap.h" +#include "smt2newcontext.h" #include "smt2tokens.h" #include -#include +#include #include +#include #include -#include -#include #include +#include +#include enum class ASTType { CMD_T , CMDL_T @@ -81,79 +83,99 @@ enum class ASTType { , UNDEF_T }; -class ASTNode { - using ASTNode_up = std::unique_ptr; - using ASTVec = std::vector; - using ASTVec_up = std::unique_ptr; - using string_up = std::unique_ptr; - - private: - ASTType type = ASTType::UNDEF_T; - osmttokens::smt2token tok = {osmttokens::t_none}; - std::unique_ptr val; - public: - ASTVec_up children = nullptr; - - ASTNode(ASTType t, osmttokens::smt2token tok = {osmttokens::t_none}, string_up v = nullptr, ASTVec_up children = nullptr) - : type(t), tok(tok), val(std::move(v)), children(std::move(children)) {} -// ASTNode(ASTNode const &) = default; -// ASTNode(ASTNode &&) = default; -// ASTNode & operator=(ASTNode const &) = delete; -// ASTNode & operator=(ASTNode &&) = default; - - void print(std::ostream& o, int indent) const; - ASTType getType() const { return type; } - bool hasValue() const { return val != nullptr; } - std::string const & getValue() const { assert(hasValue()); return *val; } - osmttokens::smt2token getToken() const { return tok; } -}; - - -enum ConfType { O_EMPTY, O_STR, O_SYM, O_NUM, O_DEC, O_HEX, O_BIN, O_LIST, O_ATTR, O_BOOL }; - -class ConfValue { - public: - ConfType type = O_EMPTY; - std::string strval = ""; - int numval = 0; - double decval = 0; - uint32_t unumval = 0; - std::list configs; - ConfValue() = default; - ConfValue(const ASTNode& s_expr_n); - ConfValue(int i) : type(O_NUM), numval(i) {}; - ConfValue(double i) : type(O_DEC), decval(i) {}; - ConfValue(std::string && s) : strval(s) {} -// ConfValue(const ConfValue& other); -// ConfValue& operator=(const ConfValue& other); - std::string toString() const; - double getDoubleVal() const {if (type == O_NUM) return (double)numval; else if (type == O_DEC) return decval; else assert(false); return -1;} -}; - -class Info { - private: - ConfValue value; - public: - Info(ASTNode const & n); - Info() = default; -// Info(Info const & other); -// Info() {}; - bool isEmpty() const { return value.type == O_EMPTY; } - inline std::string toString() const { return value.toString(); } -}; class SMTOption { - private: - ConfValue value; - public: - SMTOption(ASTNode const & n); - SMTOption() {} + std::string sexprToString(SExpr * root) { + struct QEl { SExpr * sexpr; int count; }; + std::vector childStrings; + std::vector stack; + stack.push_back({root, 0}); + while (not stack.empty()) { + auto & [sexpr, count] = stack.back(); + if (auto vec_p = std::get_if>>(&(*sexpr).data)) { + assert(*vec_p); + auto & vec = **vec_p; + if (vec.size() < count) { + stack.push_back({ vec[count], 0 }); + ++count; + continue; + } + // Vector, all children processed + assert(not childStrings.empty()); + auto childStringStart = childStrings.end() - vec.size(); + auto myString = std::accumulate(childStringStart, childStrings.end(), std::string(), + [](const std::string & a, const std::string & b) { + return a + b; + }); + childStrings.erase(childStringStart, childStrings.end()); + childStrings.emplace_back(std::move(myString)); + } else if (auto constNode = std::get_if>(&(*sexpr).data)) { + assert(*constNode); + childStrings.push_back(*(**constNode).value); + } else if (auto symbolNode = std::get_if>(&(*sexpr).data)) { + assert(*symbolNode); + childStrings.push_back((**symbolNode).getString()); + } else if (auto string = std::get_if>(&(*sexpr).data)) { + assert(*string); + childStrings.push_back(**string); + } + stack.pop_back(); + } + assert(childStrings.size() == 1); + return childStrings[0]; + } +public: + struct ConfValue { + ConstType type = ConstType::empty; + std::variant value; + std::string toString() const; + double getDoubleVal() const { + if (type == ConstType::numeral) { + if (auto val = std::get_if(&value)) { + return static_cast(*val); + } else if (auto val = std::get_if(&value)) { + return static_cast(*val); + } + assert(false); + } else if (type == ConstType::decimal) { + auto val = std::get_if(&value); + assert(val); + return *val; + } else { + throw OsmtApiException("Attempted to obtain double value for non-numeric type"); + } + } + }; + + SMTOption(); + SMTOption(AttributeValueNode const & n) { + if (auto specConst_p = std::get_if>(&n.value)) { + auto const & specConst = (**specConst_p); + value.type = specConst.type; + value.value = *specConst.value; + } else if (auto symbol_p = std::get_if>(&n.value)) { + auto const & symbol = (**symbol_p); + value.type = symbol.getType(); + value.value = symbol.getString(); + } else if (auto sexprVec_p = std::get_if>>(&n.value)) { + assert(sexprVec_p); + value.type = ConstType::sexpr; + auto const & sexprVec = **sexprVec_p; + std::string s; + for (SExpr * sexpr_p : sexprVec) { + s += "(" + sexprToString(sexpr_p)+ ")"; + } + value.value = s; + } + } SMTOption(int i) : value(i) {} SMTOption(double i): value(i) {} SMTOption(std::string && s) : value(std::move(s)) {} inline bool isEmpty() const { return value.type == O_EMPTY; } inline std::string toString() const { return value.toString(); } inline const ConfValue& getValue() const { return value; } + private: + ConfValue value; }; // Type safe wrapper for split types @@ -317,11 +339,9 @@ struct SMTConfig static const char* s_err_unknown_split; static const char* s_err_unknown_units; - - Info info_Empty; SMTOption option_Empty; std::vector option_names; - std::unordered_map infoTable; + std::unordered_map infoTable; std::unordered_map optionTable; bool usedForInitialization = false; // Some options can be changed only before this config is used for initialization of MainSolver @@ -362,8 +382,8 @@ struct SMTConfig bool setOption(std::string const & name, const SMTOption& value, const char*& msg); const SMTOption& getOption(std::string const & name) const; - bool setInfo (std::string && name, Info && value); - Info getInfo (std::string const & name) const; + bool setInfo (std::string && name, ConfValue && value); + ConfValue getInfo (std::string const & name) const; void initializeConfig ( ); diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index ab6c01c84..0335a24e0 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -29,14 +29,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include -#include "SMTConfig.h" +#include +#include +#include enum class ConstType { numeral, decimal, hexadecimal, binary, - string + string, + empty, + symbol, + boolean, + sexpr }; class GeneralNode {}; @@ -48,6 +54,23 @@ struct SpecConstNode : public GeneralNode { struct SymbolNode : public GeneralNode { std::variant,std::unique_ptr> name; + std::string getString() const { + if (auto str = std::get_if>(&name)) { + return {**str}; + } else if (auto specConstNode = std::get_if>(&name)) { + return {*(**specConstNode).value}; + } + assert(false); + } + ConstType getType() const { + if (std::get_if>(&name)) { + return ConstType::string; + } else { + auto specConstNode = std::get_if>(&name); + assert(specConstNode); + return (**specConstNode).type; + } + } bool quoted; }; @@ -154,6 +177,8 @@ struct SetOption : public CommandNode { struct SetInfo : public CommandNode { std::unique_ptr attribute; SetInfo(std::unique_ptr && attribute) : attribute(std::move(attribute)) {} + std::string getName() const { return {*attribute->name}; } + AttributeValueNode & getValue() const { return *attribute->value; } }; struct DeclareSort : public CommandNode { From 08b855dfc1e30f52615fba03905ab1bee133a8b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 24 Oct 2022 15:12:30 +0200 Subject: [PATCH 49/76] Parser: SetLogic convenience function [WiP?] --- src/parsers/smt2new/smt2newcontext.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 0335a24e0..ee43be4de 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -167,6 +167,11 @@ struct Exit : public CommandNode { }; struct SetLogic : public CommandNode { std::unique_ptr logic; SetLogic(std::unique_ptr && logic) : logic(std::move(logic)) {} + std::string getLogicName() const { + auto s = std::get_if>(&logic->name); + assert(s); + return {**s}; + } }; struct SetOption : public CommandNode { From f97ab8f2a46e1614144643fa3b00b5d681267675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 24 Oct 2022 17:02:09 +0200 Subject: [PATCH 50/76] Options: make sexpr printing function static --- src/options/SMTConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index b8d346875..b14252479 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -85,7 +85,7 @@ enum class ASTType { class SMTOption { - std::string sexprToString(SExpr * root) { + static std::string sexprToString(SExpr * root) { struct QEl { SExpr * sexpr; int count; }; std::vector childStrings; std::vector stack; From c30df986ba62ac531c954749f41c1efda03a990c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 24 Oct 2022 17:02:37 +0200 Subject: [PATCH 51/76] Interpret: refactor SMTOption [WiP] --- src/options/SMTConfig.h | 47 +++++++++++++++++++--------- src/parsers/smt2new/smt2newcontext.h | 1 + 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index b14252479..ab2586df9 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -127,8 +127,12 @@ class SMTOption { public: struct ConfValue { ConstType type = ConstType::empty; - std::variant value; - std::string toString() const; + std::variant value = 0; + ConfValue() = default; + ConfValue(int i) : type(ConstType::numeral), value(i) {} + ConfValue(double i) : type(ConstType::decimal), value(i) {} + ConfValue(std::string && s) : type(ConstType::string), value(std::move(s)) {} + std::string getStringValue() const; double getDoubleVal() const { if (type == ConstType::numeral) { if (auto val = std::get_if(&value)) { @@ -145,6 +149,21 @@ class SMTOption { throw OsmtApiException("Attempted to obtain double value for non-numeric type"); } } + uint32_t getUint32Value() const { + if (type == ConstType::uint32) { + auto val = std::get_if(&value); + assert(val); + return *val; + } else { + throw OsmtApiException("Attempted to obtain uint32 value for non-uint32 type"); + } + } + bool getBoolVal() const { + if (type == ConstType::boolean) { + auto val = std::get_if(&value); + + } + } }; SMTOption(); @@ -171,7 +190,7 @@ class SMTOption { SMTOption(int i) : value(i) {} SMTOption(double i): value(i) {} SMTOption(std::string && s) : value(std::move(s)) {} - inline bool isEmpty() const { return value.type == O_EMPTY; } + inline bool isEmpty() const { return value.type == ConstType::empty; } inline std::string toString() const { return value.toString(); } inline const ConfValue& getValue() const { return value; } private: @@ -341,7 +360,7 @@ struct SMTConfig SMTOption option_Empty; std::vector option_names; - std::unordered_map infoTable; + std::unordered_map infoTable; std::unordered_map optionTable; bool usedForInitialization = false; // Some options can be changed only before this config is used for initialization of MainSolver @@ -382,8 +401,8 @@ struct SMTConfig bool setOption(std::string const & name, const SMTOption& value, const char*& msg); const SMTOption& getOption(std::string const & name) const; - bool setInfo (std::string && name, ConfValue && value); - ConfValue getInfo (std::string const & name) const; + bool setInfo (std::string && name, SMTOption::ConfValue && value); + SMTOption::ConfValue getInfo (std::string const & name) const; void initializeConfig ( ); @@ -392,18 +411,18 @@ struct SMTConfig void printHelp ( ); void printConfig ( std::ostream & out ); - inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getValue().numval : 91648253; } + inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getValue().getUint32Value(): 91648253; } inline void setProduceModels( ) { insertOption(o_produce_models, SMTOption(1)); } inline bool setRandomSeed(int seed) { insertOption(o_random_seed, SMTOption(seed)); return true; } void setUsedForInitiliazation() { usedForInitialization = true; } inline bool produceProof( ) { - return optionTable.find(o_produce_proofs) != optionTable.end() ? optionTable[o_produce_proofs].getValue().numval > 0 : false; + return optionTable.find(o_produce_proofs) != optionTable.end() ? optionTable[o_produce_proofs].getValue().getBoolVal() : false; } void setTimeQueries() { insertOption(o_time_queries, SMTOption(1)); } - bool timeQueries() { return optionTable.find(o_time_queries) != optionTable.end() ? optionTable[o_time_queries].getValue().numval : false; } + bool timeQueries() { return optionTable.find(o_time_queries) != optionTable.end() ? optionTable[o_time_queries].getValue().getBoolVal() : false; } // Set reduction params inline void setReduction(int r) { insertOption(o_proof_reduce, SMTOption(r)); } @@ -425,27 +444,27 @@ struct SMTConfig // Get interpolation algorithms inline ItpAlgorithm getBooleanInterpolationAlgorithm() const { - return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getValue().numval) + return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getValue().getUint32Value()) : ItpAlgorithm::itp_alg_mcmillan; } inline ItpAlgorithm getEUFInterpolationAlgorithm() const { - return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getValue().numval) + return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getValue().getUint32Value()) : ItpAlgorithm::itp_euf_alg_strong; } inline ItpAlgorithm getLRAInterpolationAlgorithm() const { - return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getValue().numval) + return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getValue().getUint32Value()) : ItpAlgorithm::itp_lra_alg_strong; } inline std::string getLRAStrengthFactor() const { return optionTable.find(o_itp_lra_factor) != optionTable.end() ? optionTable.at( - o_itp_lra_factor).getValue().strval : itp_lra_factor_0; + o_itp_lra_factor).getValue().getStringValue() : itp_lra_factor_0; } inline std::string getInstanceName() const { - return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name).getValue().strval : "unknown"; + return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name).getValue().getStringValue() : "unknown"; } lbool status; // Status of the benchmark diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index ee43be4de..64c6749a5 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -37,6 +37,7 @@ enum class ConstType { numeral, decimal, hexadecimal, + uint32, binary, string, empty, From 7d9fe8407810070081cd6d793bf54d63920df9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 24 Oct 2022 18:54:48 +0200 Subject: [PATCH 52/76] SMTOptions: some refactoring --- src/api/Interpret.h | 22 +- src/options/SMTConfig.cc | 278 ++------------- src/options/SMTConfig.h | 482 +++++++++++++++------------ src/parsers/smt2new/smt2newcontext.h | 1 + 4 files changed, 305 insertions(+), 478 deletions(-) diff --git a/src/api/Interpret.h b/src/api/Interpret.h index e7948496e..5ee1c6f1e 100644 --- a/src/api/Interpret.h +++ b/src/api/Interpret.h @@ -144,31 +144,29 @@ class Interpret { void initializeLogic(opensmt::Logic_t logicType); bool isInitialized() const { return logic != nullptr; } - SRef sortFromASTNode(ASTNode const & n) const; - static SortSymbol sortSymbolFromASTNode(ASTNode const & node); void setInfo(std::string const & str); - void getInfo(ASTNode const & n); - void setOption(ASTNode const & n); - void getOption(ASTNode const & n); + void getInfo(AttributeNode const & n); + void setOption(AttributeNode const & n); + void getOption(AttributeNode const & n); void writeState(std::string const & fname); - bool declareFun(ASTNode const & n); //(const char* fname, const vec& args); - bool declareConst(ASTNode const & n); //(const char* fname, const SRef ret_sort); - bool defineFun(ASTNode const & n); + bool declareFun(DeclareFun const & n); //(const char* fname, const vec& args); + bool declareConst(DeclareConst const & n); //(const char* fname, const SRef ret_sort); + bool defineFun(DefineFun const & n); virtual sstat checkSat(); - void getValue(std::vector> const & term); + void getValue(std::vector> const & term); void getModel(); std::string printDefinitionSmtlib(PTRef tr, PTRef val); std::string printDefinitionSmtlib(const TemplateFunction &templateFun) const; void push(int); void pop(int); - PTRef parseTerm(const ASTNode& term, LetRecords& letRecords); + PTRef parseTerm(TermNode const & term, LetRecords& letRecords); PTRef resolveTerm(const char* s, vec&& args, SRef sortRef = SRef_Undef, SymbolMatcher symbolMatcher = SymbolMatcher::Any); bool storeDefinedFun(std::string const & fname, const vec& args, SRef ret_sort, const PTRef tr); virtual void exit(); - void getInterpolants(const ASTNode& n); + void getInterpolants(TermNode const & n); void interp(CommandNode const * n); void interp(SetLogic const & n); void interp(SetInfo const & n); @@ -196,7 +194,7 @@ class Interpret { bool addLetFrame(std::vector const & names, vec const& args, LetRecords& letRecords); PTRef letNameResolve(const char* s, const LetRecords& letRecords) const; - PTRef resolveQualifiedIdentifier(const char * name, ASTNode const & sort, bool isQuoted); + PTRef resolveQualifiedIdentifier(const char * name, SortNode const & sort, bool isQuoted); virtual std::unique_ptr createMainSolver(std::string const & logic_name); diff --git a/src/options/SMTConfig.cc b/src/options/SMTConfig.cc index fd73d0b22..ac772e39f 100644 --- a/src/options/SMTConfig.cc +++ b/src/options/SMTConfig.cc @@ -30,232 +30,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include -/********************************************************************* - * Generic configuration class, used for both set-info and set-option - *********************************************************************/ - -ConfValue::ConfValue(const ASTNode& s_expr_n) { - if (s_expr_n.getType() == ASTType::SEXPRL_T) { - type = O_LIST; - for (auto const & i : (*s_expr_n.children)) { - configs.push_back(ConfValue(*i)); - } - } else if (s_expr_n.getType() == ASTType::SYM_T) { - type = O_SYM; - strval = s_expr_n.getValue(); - } else if (s_expr_n.getType() == ASTType::SPECC_T) { - assert(s_expr_n.children->size() > 0); - ASTNode const & spn = *(*s_expr_n.children)[0]; - if (spn.getType() == ASTType::NUM_T) { - type = O_NUM; - numval = std::stoi(spn.getValue()); - } else if (spn.getType() == ASTType::DEC_T) { - type = O_DEC; - decval = std::stod(spn.getValue()); - } else if (spn.getType() == ASTType::HEX_T) { - type = O_HEX; - std::string tmp(spn.getValue()); - tmp.erase(0,2); - char* end; - unumval = strtoul(tmp.c_str(), &end, 16); - assert(end); - } - else if (spn.getType() == ASTType::BIN_T) { - type = O_BIN; - std::string tmp(spn.getValue()); - tmp.erase(0,2); - char* end; - unumval = strtoul(tmp.c_str(), &end, 2); - assert(end); - } - else if (spn.getType() == ASTType::STR_T) { - type = O_STR; - strval = spn.getValue(); - } - else { - assert(false); - } - } else if (s_expr_n.getType() == ASTType::UATTR_T) { - type = O_ATTR; - strval = s_expr_n.getValue(); - } - else { - assert(false); //Not implemented - } -} - -//ConfValue::ConfValue(const ConfValue& other) { -// type = other.type; -// if (type == O_NUM) numval = other.numval; -// else if (type == O_STR) strval = other.strval; -// else if (type == O_DEC) decval = other.decval; -// else if (type == O_LIST) { -// configs = new std::list; -// for (ConfValue * value : *other.configs) -// configs->push_back(new ConfValue(*value)); -// } -// else if (type == O_SYM) -// strval = other.strval; -// else if (type == O_HEX) -// unumval = other.unumval; -// else if (type == O_BIN) -// unumval = other.unumval; -// else if (type == O_ATTR) -// strval = other.strval; -// else if (type == O_BOOL) -// numval = other.numval; -// else if (type == O_EMPTY) -// strval = strdup(""); -// else assert(false); -//} - -//ConfValue& ConfValue::operator=(const ConfValue& other) -//{ -// type = other.type; -// if (type == O_NUM) numval = other.numval; -// else if (type == O_STR) strval = other.strval; -// else if (type == O_DEC) decval = other.decval; -// else if (type == O_LIST) { -// configs = new std::list; -// for (ConfValue * value : *other.configs) -// configs->push_back(new ConfValue(*value)); -// } -// else if (type == O_SYM) -// strval = other.strval; -// else if (type == O_HEX) -// unumval = other.unumval; -// else if (type == O_BIN) -// unumval = other.unumval; -// else if (type == O_ATTR) -// strval = other.strval; -// else if (type == O_BOOL) -// numval = other.numval; -// else if (type == O_EMPTY) -// strval = strdup(""); -// else assert(false); -// return *this; -//} - -std::string ConfValue::toString() const { - if (type == O_BOOL) - return numval == 1 ? "true" : "false"; - if (type == O_STR) - return strval; - if (type == O_NUM) { - return std::to_string(numval); - } - if (type == O_EMPTY) { - return ""; - } - if (type == O_ATTR) { - return strval; - } - if (type == O_DEC) { - std::stringstream ss; - ss << decval; - return ss.str(); - } - if (type == O_HEX or type == O_BIN) { - return std::to_string(unumval); - } - if (type == O_SYM) { - return strval; - } - if (type == O_LIST) { - std::stringstream ss; - ss << "( "; - for (ConfValue const & val : configs) { - ss << val.toString() << " "; - } - ss << ")"; - return ss.str(); - } - throw OsmtInternalException("Not implemented"); -} - - -/*********************************************************** - * Class defining the information, configured with set-info - ***********************************************************/ - -Info::Info(AttributeValueNode const & n) { - // child is attribute_value - if (auto specConst = std::get_if>(&n.value)) { - value = ConfValue(**specConst); - } else if (auto symbolNode = std::get_if>(&n.value)) { - value.strval = (**symbolNode).getString(); - value.type = (**symbolNode).getType(); - } else if (auto sexprList = std::get_if>>(&n.value)) { - value = ConfValue(**sexprList); - } else { - assert(false); - } -} - -//Info::Info(const Info& other) -//{ -// value = other.value; -//} - -/*********************************************************** - * Class defining the options, configured with set-config - ***********************************************************/ - -SMTOption::SMTOption(ASTNode const & n) { - assert(not n.children->empty()); - - ASTNode const & child = *(*n.children)[0]; - - if (child.getType() == ASTType::BOOL_T) { - value.type = O_BOOL; - value.numval = child.getValue() == "true" ? 1 : 0; - return; - } - if (child.getType() == ASTType::STR_T) { - value.type = O_STR; - value.strval = child.getValue(); - return; - } - if (child.getType() == ASTType::NUM_T) { - value.type = O_NUM; - value.numval = std::stoi(child.getValue()); - return; - } - - if (child.getType() == ASTType::DEC_T) { - value.type = O_DEC; - value.decval = std::stod(child.getValue()); - } - assert(child.getType() == ASTType::UATTR_T or child.getType() == ASTType::PATTR_T); - // The option is an attribute - - if (not child.children or child.children->empty()) { - value.type = O_EMPTY; - return; - } else { - // n is now attribute_value - ASTNode const & attributeValue = *(*child.children)[0]; - - if (attributeValue.getType() == ASTType::SPECC_T or attributeValue.getType() == ASTType::SEXPRL_T) { - value = ConfValue(attributeValue); - } - else if (attributeValue.getType() == ASTType::SYM_T) { - if (attributeValue.getValue() == "true") { - value.type = O_BOOL; - value.numval = 1; - } else if (attributeValue.getValue() == "false") { - value.type = O_BOOL; - value.numval = 0; - } else { - value.strval = attributeValue.getValue(); - value.type = O_STR; - } - return; - } - else assert(false); - } -} - //--------------------------------------------------------------------------------- // SMTConfig @@ -268,13 +42,13 @@ bool SMTConfig::setOption(std::string const & name, const SMTOption& value, cons // Special options: // stats_out if (name == o_stats_out) { - if (value.getValue().type != O_STR) { msg = s_err_not_str; return false; } + if (value.getValue().type != ConstType::string) { msg = s_err_not_str; return false; } if (optionTable.find(name) == optionTable.end()) - stats_out.open(value.getValue().strval, std::ios_base::out); - else if (optionTable[name].getValue().strval != value.getValue().strval) { + stats_out.open(value.getValue().getStringVal(), std::ios_base::out); + else if (optionTable[name].getValue().getStringVal() != value.getValue().getStringVal()) { if (stats_out.is_open()) { stats_out.close(); - stats_out.open(value.getValue().strval, std::ios_base::out); + stats_out.open(value.getValue().getStringVal(), std::ios_base::out); } } else {} @@ -282,50 +56,50 @@ bool SMTConfig::setOption(std::string const & name, const SMTOption& value, cons // produce stats if (name == o_produce_stats) { - if (value.getValue().type != O_BOOL) { msg = s_err_not_bool; return false; } - if (value.getValue().numval == 1) { + if (value.getValue().type != ConstType::boolean) { + throw OsmtApiException(s_err_not_bool); + } else if (value.getValue().getBoolVal()) { // Gets set to true if (optionTable.find(o_stats_out) == optionTable.end()) { - if (optionTable.find(o_produce_stats) == optionTable.end() || optionTable[o_produce_stats].getValue().numval == 0) { + if (optionTable.find(o_produce_stats) == optionTable.end() || not optionTable[o_produce_stats].getValue().getBoolVal()) { // Insert the default value insertOption(o_stats_out, SMTOption("/dev/stdout")); - } else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats].getValue().numval == 1) { + } else if (optionTable.find(o_produce_stats) != optionTable.end() and optionTable[o_produce_stats].getValue().getBoolVal()) { assert(false); } } else { } // No action required - if (!stats_out.is_open()) stats_out.open(optionTable[o_stats_out].getValue().strval, std::ios_base::out); + if (!stats_out.is_open()) stats_out.open(optionTable[o_stats_out].getValue().getStringVal(), std::ios_base::out); } - else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats].getValue().numval == 1) { + else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats].getValue().getBoolVal()) { // gets set to false and was previously true if (optionTable.find(o_stats_out) != optionTable.end()) { - if (optionTable.at(o_stats_out).getValue().numval == 0) assert(false); - else if (stats_out.is_open()) stats_out.close(); + stats_out.close(); } } } if (name == o_random_seed) { - if (value.getValue().type != O_NUM) { msg = s_err_not_num; return false; } - int seed = value.getValue().numval; - if (seed == 0) { msg = s_err_seed_zero; return false; } + if (value.getValue().type != ConstType::numeral) { + throw OsmtApiException(s_err_not_num); + } + uint32_t seed = value.getValue().getUint32Val(); + if (seed == 0) { throw OsmtApiException(s_err_seed_zero); } } if (name == o_sat_split_type) { - if (value.getValue().type != O_STR) { msg = s_err_not_str; return false; } - std::string val = value.getValue().strval; + if (value.getValue().type != ConstType::string) { throw OsmtApiException(s_err_not_str); } + std::string val = value.getValue().getStringVal(); if (val != spts_lookahead && val != spts_scatter && val != spts_none) { - msg = s_err_unknown_split; - return false; + throw OsmtApiException(s_err_unknown_split); } } if (name == o_sat_split_units) { - if (value.getValue().type != O_STR) { msg = s_err_not_str; return false; } - std::string val = value.getValue().strval; + if (value.getValue().type != ConstType::string) { throw OsmtApiException(s_err_not_str); } + std::string val = value.getValue().getStringVal(); if (val != spts_time && val != spts_search_counter) { - msg = s_err_unknown_units; - return false; + throw OsmtApiException(s_err_unknown_units); } } auto itr = optionTable.find(name); @@ -344,18 +118,18 @@ const SMTOption& SMTConfig::getOption(std::string const & name) const { return option_Empty; } -bool SMTConfig::setInfo(std::string && name_, Info && value) { +bool SMTConfig::setInfo(std::string && name_, SMTOption::ConfValue && value) { if (infoTable.find(name_) != infoTable.end()) infoTable.erase(infoTable.find(name_)); infoTable.insert({name_, value}); return true; } -Info SMTConfig::getInfo(std::string const & name) const { +SMTOption::ConfValue SMTConfig::getInfo(std::string const & name) const { if (infoTable.find(name) != infoTable.end()) return infoTable.at(name); else - return info_Empty; + return {}; } const char* SMTConfig::o_produce_models = ":produce-models"; diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index ab2586df9..a6178a568 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -31,6 +31,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "StringMap.h" #include "smt2newcontext.h" #include "smt2tokens.h" +#include "OsmtApiException.h" +#include "OsmtInternalException.h" #include #include @@ -132,15 +134,25 @@ class SMTOption { ConfValue(int i) : type(ConstType::numeral), value(i) {} ConfValue(double i) : type(ConstType::decimal), value(i) {} ConfValue(std::string && s) : type(ConstType::string), value(std::move(s)) {} - std::string getStringValue() const; + std::string getStringVal() const { + if (type == ConstType::string) { + auto val = std::get_if(&value); + assert(val); + return *val; + } + else { + throw OsmtApiException("Attempt to get string value of a non-string type"); + } + } double getDoubleVal() const { if (type == ConstType::numeral) { if (auto val = std::get_if(&value)) { return static_cast(*val); } else if (auto val = std::get_if(&value)) { return static_cast(*val); + } else { + throw OsmtInternalException("Inconsistent value for option"); } - assert(false); } else if (type == ConstType::decimal) { auto val = std::get_if(&value); assert(val); @@ -149,7 +161,16 @@ class SMTOption { throw OsmtApiException("Attempted to obtain double value for non-numeric type"); } } - uint32_t getUint32Value() const { + int getIntVal() const { + if (type == ConstType::numeral) { + auto val = std::get_if(&value); + assert(val); + return *val; + } else { + throw OsmtApiException("Attempted to obtain int value for non-int type"); + } + } + uint32_t getUint32Val() const { if (type == ConstType::uint32) { auto val = std::get_if(&value); assert(val); @@ -161,7 +182,11 @@ class SMTOption { bool getBoolVal() const { if (type == ConstType::boolean) { auto val = std::get_if(&value); - + assert(val); + return *val; + } + else { + throw OsmtApiException("Attempt to obtain boolean value for non-boolean type"); } } }; @@ -191,7 +216,7 @@ class SMTOption { SMTOption(double i): value(i) {} SMTOption(std::string && s) : value(std::move(s)) {} inline bool isEmpty() const { return value.type == ConstType::empty; } - inline std::string toString() const { return value.toString(); } +// inline std::string toString() const { return value.toString(); } inline const ConfValue& getValue() const { return value; } private: ConfValue value; @@ -411,7 +436,7 @@ struct SMTConfig void printHelp ( ); void printConfig ( std::ostream & out ); - inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getValue().getUint32Value(): 91648253; } + inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getValue().getUint32Val(): 91648253; } inline void setProduceModels( ) { insertOption(o_produce_models, SMTOption(1)); } inline bool setRandomSeed(int seed) { insertOption(o_random_seed, SMTOption(seed)); return true; } @@ -444,161 +469,185 @@ struct SMTConfig // Get interpolation algorithms inline ItpAlgorithm getBooleanInterpolationAlgorithm() const { - return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getValue().getUint32Value()) + return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getValue().getUint32Val()) : ItpAlgorithm::itp_alg_mcmillan; } inline ItpAlgorithm getEUFInterpolationAlgorithm() const { - return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getValue().getUint32Value()) + return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getValue().getUint32Val()) : ItpAlgorithm::itp_euf_alg_strong; } inline ItpAlgorithm getLRAInterpolationAlgorithm() const { - return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getValue().getUint32Value()) + return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getValue().getUint32Val()) : ItpAlgorithm::itp_lra_alg_strong; } inline std::string getLRAStrengthFactor() const { return optionTable.find(o_itp_lra_factor) != optionTable.end() ? optionTable.at( - o_itp_lra_factor).getValue().getStringValue() : itp_lra_factor_0; + o_itp_lra_factor).getValue().getStringVal() : itp_lra_factor_0; } inline std::string getInstanceName() const { - return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name).getValue().getStringValue() : "unknown"; + return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name).getValue().getStringVal() : "unknown"; } lbool status; // Status of the benchmark // int incremental; // Incremental solving - int isIncremental() const - { return optionTable.find(o_incremental) != optionTable.end() ? - optionTable.at(o_incremental).getValue().numval == 1: true; } - int produce_models() const { + bool isIncremental() const { + return optionTable.find(o_incremental) != optionTable.end() ? + optionTable.at(o_incremental).getValue().getBoolVal() : true; + } + bool produce_models() const { return optionTable.find(o_produce_models) != optionTable.end() ? - optionTable.at(o_produce_models).getValue().numval : - 1; } - int produceStats() const - { return optionTable.find(o_produce_stats) != optionTable.end() ? - optionTable.at(o_produce_stats).getValue().numval == 1: false; } + optionTable.at(o_produce_models).getValue().getBoolVal() : true; + } + bool produceStats() const { + return optionTable.find(o_produce_stats) != optionTable.end() && + optionTable.at(o_produce_stats).getValue().getBoolVal(); } std::string getStatsOut() const { - return optionTable.find(o_stats_out) != optionTable.end() ? optionTable.at(o_stats_out).getValue().strval : "/dev/stdout"; + return optionTable.find(o_stats_out) != optionTable.end() ? optionTable.at(o_stats_out).getValue().getStringVal() : "/dev/stdout"; } int sat_grow() const { return optionTable.find(o_grow) != optionTable.end() ? - optionTable.at(o_grow).getValue().numval : 0; } + optionTable.at(o_grow).getValue().getBoolVal() : 0; } int sat_clause_lim() const { return optionTable.find(o_clause_lim) != optionTable.end() ? - optionTable.at(o_clause_lim).getValue().numval : 20; } + optionTable.at(o_clause_lim).getValue().getUint32Val() : 20; } int sat_subsumption_lim() const { return optionTable.find(o_subsumption_lim) != optionTable.end() ? - optionTable.at(o_subsumption_lim).getValue().numval : 1000; } + optionTable.at(o_subsumption_lim).getValue().getUint32Val() : 1000; } double sat_simp_garbage_frac() const { return optionTable.find(o_simp_garbage_frac) != optionTable.end() ? - optionTable.at(o_simp_garbage_frac).getValue().decval : 0.5; } + optionTable.at(o_simp_garbage_frac).getValue().getDoubleVal() : 0.5; } int sat_use_asymm() const { return optionTable.find(o_use_asymm) != optionTable.end() ? - optionTable.at(o_use_asymm).getValue().numval == 1: false; } - int sat_use_rcheck() const - { return optionTable.find(o_use_rcheck) != optionTable.end() ? - optionTable.at(o_use_rcheck).getValue().numval == 1: false; } - int sat_use_elim() const - { return optionTable.find(o_use_elim) != optionTable.end() ? - optionTable.at(o_use_elim).getValue().numval == 1: true; } - double sat_var_decay() const - { return optionTable.find(o_var_decay) != optionTable.end() ? - optionTable.at(o_var_decay).getValue().decval : 1 / 0.95; } - double sat_clause_decay() const - { return optionTable.find(o_clause_decay) != optionTable.end() ? - optionTable.at(o_clause_decay).getValue().decval : 1 / 0.999; } - double sat_random_var_freq() const - { return optionTable.find(o_random_var_freq) != optionTable.end() ? - optionTable.at(o_random_var_freq).getValue().decval : 0.02; } - int sat_random_seed() const - { return optionTable.find(o_random_seed) != optionTable.end() ? - optionTable.at(o_random_seed).getValue().decval : 91648253; } - int sat_luby_restart() const - { return optionTable.find(o_luby_restart) != optionTable.end() ? - optionTable.at(o_luby_restart).getValue().numval > 0 : 1; } - int sat_ccmin_mode() const - { return optionTable.find(o_ccmin_mode) != optionTable.end() ? - optionTable.at(o_ccmin_mode).getValue().numval : 2; } - int sat_rnd_pol() const - { return optionTable.find(o_rnd_pol) != optionTable.end() ? - optionTable.at(o_rnd_pol).getValue().numval > 0 : 0; } - int sat_rnd_init_act() const - { return optionTable.find(o_rnd_init_act) != optionTable.end() ? - optionTable.at(o_rnd_init_act).getValue().numval > 0 : 0; } - double sat_garbage_frac() const - { return optionTable.find(o_garbage_frac) != optionTable.end() ? - optionTable.at(o_garbage_frac).getValue().decval : 0.20; } - int sat_restart_first() const - { return optionTable.find(o_restart_first) != optionTable.end() ? - optionTable.at(o_restart_first).getValue().numval : 100; } - double sat_restart_inc() const - { return optionTable.find(o_restart_inc) != optionTable.end() ? - optionTable.at(o_restart_inc).getValue().numval : 1.1; } - int proof_interpolant_cnf() const - { return optionTable.find(o_interpolant_cnf) != optionTable.end() ? - optionTable.at(o_interpolant_cnf).getValue().numval : 0; } - int certify_inter() const - { return optionTable.find(o_certify_inter) != optionTable.end() ? - optionTable.at(o_certify_inter).getValue().numval : 0; } - bool produce_inter() const - { return optionTable.find(o_produce_inter) != optionTable.end() ? - optionTable.at(o_produce_inter).getValue().numval > 0 : false; } - int simplify_inter() const - { return optionTable.find(o_simplify_inter) != optionTable.end() ? - optionTable.at(o_simplify_inter).getValue().numval : 0; } - int proof_struct_hash() const - { return optionTable.find(o_proof_struct_hash) != optionTable.end() ? - optionTable.at(o_proof_struct_hash).getValue().numval : 1; } - int proof_num_graph_traversals() const - { return optionTable.find(o_proof_num_graph_traversals) != optionTable.end() ? - optionTable.at(o_proof_num_graph_traversals).getValue().numval : 3; } - int proof_red_trans() const - { return optionTable.find(o_proof_red_trans) != optionTable.end() ? - optionTable.at(o_proof_red_trans).getValue().numval : 2; } - int proof_rec_piv() const - { return optionTable.find(o_proof_rec_piv) != optionTable.end() ? - optionTable.at(o_proof_rec_piv).getValue().numval : 1; } - int proof_push_units() const - { return optionTable.find(o_proof_push_units) != optionTable.end() ? - optionTable.at(o_proof_push_units).getValue().numval : 1; } - int proof_transf_trav() const - { return optionTable.find(o_proof_transf_trav) != optionTable.end() ? - optionTable.at(o_proof_transf_trav).getValue().numval : 1; } - int proof_check() const - { return optionTable.find(o_proof_check) != optionTable.end() ? - optionTable.at(o_proof_check).getValue().numval : 0; } - int proof_multiple_inter() const - { return optionTable.find(o_proof_multiple_inter) != optionTable.end() ? - optionTable.at(o_proof_multiple_inter).getValue().numval : 0; } - int proof_alternative_inter() const - { return optionTable.find(o_proof_alternative_inter) != optionTable.end() ? - optionTable.at(o_proof_alternative_inter).getValue().numval : 0; } - int proof_reduce() const - { return optionTable.find(o_proof_reduce) != optionTable.end() ? - optionTable.at(o_proof_reduce).getValue().numval : 0; } - int itp_bool_alg() const - { return optionTable.find(o_itp_bool_alg) != optionTable.end() ? - optionTable.at(o_itp_bool_alg).getValue().numval : 0; } - int itp_euf_alg() const + optionTable.at(o_use_asymm).getValue().getBoolVal() : false; } + int sat_use_rcheck() const { + return optionTable.find(o_use_rcheck) != optionTable.end() ? + optionTable.at(o_use_rcheck).getValue().getBoolVal() : false; + } + int sat_use_elim() const { + return optionTable.find(o_use_elim) != optionTable.end() ? + optionTable.at(o_use_elim).getValue().getBoolVal() : true; + } + double sat_var_decay() const { + return optionTable.find(o_var_decay) != optionTable.end() ? + optionTable.at(o_var_decay).getValue().getDoubleVal() : 1 / 0.95; } + double sat_clause_decay() const { + return optionTable.find(o_clause_decay) != optionTable.end() ? + optionTable.at(o_clause_decay).getValue().getDoubleVal() : 1 / 0.999; } + double sat_random_var_freq() const { + return optionTable.find(o_random_var_freq) != optionTable.end() ? + optionTable.at(o_random_var_freq).getValue().getDoubleVal() : 0.02; } + uint32_t sat_random_seed() const { + return optionTable.find(o_random_seed) != optionTable.end() ? + optionTable.at(o_random_seed).getValue().getUint32Val() : 91648253; } + bool sat_luby_restart() const { + return optionTable.find(o_luby_restart) != optionTable.end() ? + optionTable.at(o_luby_restart).getValue().getBoolVal() : true; + } + uint32_t sat_ccmin_mode() const { + return optionTable.find(o_ccmin_mode) != optionTable.end() ? + optionTable.at(o_ccmin_mode).getValue().getUint32Val() : 2; + } + bool sat_rnd_pol() const { + return optionTable.find(o_rnd_pol) != optionTable.end() ? + optionTable.at(o_rnd_pol).getValue().getBoolVal() : false; + } + bool sat_rnd_init_act() const { + return optionTable.find(o_rnd_init_act) != optionTable.end() ? + optionTable.at(o_rnd_init_act).getValue().getBoolVal() : false; } + double sat_garbage_frac() const { + return optionTable.find(o_garbage_frac) != optionTable.end() ? + optionTable.at(o_garbage_frac).getValue().getDoubleVal() : 0.20; + } + uint32_t sat_restart_first() const { + return optionTable.find(o_restart_first) != optionTable.end() ? + optionTable.at(o_restart_first).getValue().getUint32Val() : 100; } + double sat_restart_inc() const { + return optionTable.find(o_restart_inc) != optionTable.end() ? + optionTable.at(o_restart_inc).getValue().getDoubleVal() : 1.1; + } + int proof_interpolant_cnf() const { + return optionTable.find(o_interpolant_cnf) != optionTable.end() ? + optionTable.at(o_interpolant_cnf).getValue().getBoolVal() : false; + } + int certify_inter() const { + return optionTable.find(o_certify_inter) != optionTable.end() ? + optionTable.at(o_certify_inter).getValue().getBoolVal(): false; + } + bool produce_inter() const { + return optionTable.find(o_produce_inter) != optionTable.end() ? + optionTable.at(o_produce_inter).getValue().getBoolVal() : false; + } + uint32_t simplify_inter() const { + return optionTable.find(o_simplify_inter) != optionTable.end() ? + optionTable.at(o_simplify_inter).getValue().getUint32Val() : false; + } + bool proof_struct_hash() const { + return optionTable.find(o_proof_struct_hash) != optionTable.end() ? + optionTable.at(o_proof_struct_hash).getValue().getBoolVal() : true; + } + uint32_t proof_num_graph_traversals() const { + return optionTable.find(o_proof_num_graph_traversals) != optionTable.end() ? + optionTable.at(o_proof_num_graph_traversals).getValue().getUint32Val() : 3; } + uint32_t proof_red_trans() const { + return optionTable.find(o_proof_red_trans) != optionTable.end() ? + optionTable.at(o_proof_red_trans).getValue().getUint32Val() : 2; + } + bool proof_rec_piv() const { + return optionTable.find(o_proof_rec_piv) != optionTable.end() ? + optionTable.at(o_proof_rec_piv).getValue().getBoolVal() : true; + } + bool proof_push_units() const { + return optionTable.find(o_proof_push_units) != optionTable.end() ? + optionTable.at(o_proof_push_units).getValue().getBoolVal() : true; + } + bool proof_transf_trav() const { + return optionTable.find(o_proof_transf_trav) != optionTable.end() ? + optionTable.at(o_proof_transf_trav).getValue().getBoolVal() : true; + } + bool proof_check() const { + return optionTable.find(o_proof_check) != optionTable.end() ? + optionTable.at(o_proof_check).getValue().getBoolVal() : true; + } + bool proof_multiple_inter() const { + return optionTable.find(o_proof_multiple_inter) != optionTable.end() ? + optionTable.at(o_proof_multiple_inter).getValue().getBoolVal() : true; + } + bool proof_alternative_inter() const { + return optionTable.find(o_proof_alternative_inter) != optionTable.end() ? + optionTable.at(o_proof_alternative_inter).getValue().getBoolVal() : false; + } + bool proof_reduce() const { + return optionTable.find(o_proof_reduce) != optionTable.end() ? + optionTable.at(o_proof_reduce).getValue().getBoolVal() : false; + } + uint32_t itp_bool_alg() const { + return optionTable.find(o_itp_bool_alg) != optionTable.end() ? + optionTable.at(o_itp_bool_alg).getValue().getUint32Val() : 0; + } + uint32_t itp_euf_alg() const { return optionTable.find(o_itp_euf_alg) != optionTable.end() ? - optionTable.at(o_itp_euf_alg).getValue().numval : 0; } - int itp_lra_alg() const - { return optionTable.find(o_itp_lra_alg) != optionTable.end() ? - optionTable.at(o_itp_lra_alg).getValue().numval : 0; } - int sat_dump_rnd_inter() const - { return optionTable.find(o_sat_dump_rnd_inter) != optionTable.end() ? - optionTable.at(o_sat_dump_rnd_inter).getValue().numval : 2; } + optionTable.at(o_itp_euf_alg).getValue().getUint32Val() : 0; + } + uint32_t itp_lra_alg() const { + return optionTable.find(o_itp_lra_alg) != optionTable.end() ? + optionTable.at(o_itp_lra_alg).getValue().getUint32Val() : 0; } + uint32_t sat_dump_rnd_inter() const { + return optionTable.find(o_sat_dump_rnd_inter) != optionTable.end() ? + optionTable.at(o_sat_dump_rnd_inter).getValue().getUint32Val() : 2; } bool declarations_are_global() const { - return optionTable.find(o_global_declarations) != optionTable.end() ? optionTable.at(o_global_declarations).getValue().numval > 0 : false; + return optionTable.find(o_global_declarations) != optionTable.end() ? + optionTable.at(o_global_declarations).getValue().getBoolVal() : false; } SpUnit sat_resource_units() const { if (optionTable.find(o_sat_resource_units) != optionTable.end()) { - std::string type = optionTable.at(o_sat_resource_units).getValue().strval; + std::string type = optionTable.at(o_sat_resource_units).getValue().getStringVal(); if (type == spts_search_counter) { return SpUnit::search_counter; } else if (type == spts_time) { @@ -608,50 +657,55 @@ struct SMTConfig return SpUnit::search_counter; } - bool respect_logic_partitioning_hints() const - { return optionTable.find(o_respect_logic_partitioning_hints) != optionTable.end() ? - optionTable.at(o_respect_logic_partitioning_hints).getValue().numval : 0; } - double sat_resource_limit() const - { return optionTable.find(o_sat_resource_limit) != optionTable.end() ? - optionTable.at(o_sat_resource_limit).getValue().getDoubleVal() : -1; } + bool respect_logic_partitioning_hints() const { + return optionTable.find(o_respect_logic_partitioning_hints) != optionTable.end() ? + optionTable.at(o_respect_logic_partitioning_hints).getValue().getBoolVal() : false; + } + double sat_resource_limit() const { + return optionTable.find(o_sat_resource_limit) != optionTable.end() ? + optionTable.at(o_sat_resource_limit).getValue().getDoubleVal() : -1; + } std::string dump_state() const { if (optionTable.find(o_dump_state) != optionTable.end()) { - return append_output_dir(optionTable.at(o_dump_state).getValue().strval); + return append_output_dir(optionTable.at(o_dump_state).getValue().getStringVal()); } else { std::string name = getInstanceName(); return name.substr(0, name.size() - strlen(".smt2")); } } std::string output_dir() const { - return optionTable.find(o_output_dir) != optionTable.end() ? optionTable.at(o_output_dir).getValue().strval : ""; + return optionTable.find(o_output_dir) != optionTable.end() ? optionTable.at(o_output_dir).getValue().getStringVal() : ""; + } + bool dump_only() const { + return optionTable.find(o_dump_only) != optionTable.end() ? optionTable.at(o_dump_only).getValue().getBoolVal(): false; + } + bool dump_query() const { + return optionTable.find(o_dump_query) != optionTable.end() ? optionTable.at(o_dump_query).getValue().getBoolVal() : false; } - int dump_only() const - { return optionTable.find(o_dump_only) != optionTable.end() ? optionTable.at(o_dump_only).getValue().numval : 0; } - bool dump_query() const - { return optionTable.find(o_dump_query) != optionTable.end() ? optionTable.at(o_dump_query).getValue().numval : 0; } - void set_dump_query_name(std::string && dump_query_name) - { + void set_dump_query_name(std::string && dump_query_name) { if (optionTable.find(o_dump_query_name) != optionTable.end()) { optionTable.insert({o_dump_query_name, SMTOption(std::move(dump_query_name))}); - } - else + } else { insertOption(o_dump_query_name, SMTOption(std::move(dump_query_name))); - } + } + } std::string dump_query_name() const { - return optionTable.find(o_dump_query_name) != optionTable.end() ? append_output_dir(optionTable.at(o_dump_query_name).getValue().strval) : ""; + return optionTable.find(o_dump_query_name) != optionTable.end() ? + append_output_dir(optionTable.at(o_dump_query_name).getValue().getStringVal()) : ""; } - int sat_dump_learnts() const - { return optionTable.find(o_sat_dump_learnts) != optionTable.end() ? - optionTable.at(o_sat_dump_learnts).getValue().numval : 0; } + bool sat_dump_learnts() const { + return optionTable.find(o_sat_dump_learnts) != optionTable.end() ? + optionTable.at(o_sat_dump_learnts).getValue().getBoolVal() : false; } - bool sat_split_test_cube_and_conquer() const - { return optionTable.find(o_sat_split_test_cube_and_conquer) != optionTable.end() ? - optionTable.at(o_sat_split_test_cube_and_conquer).getValue().numval : 0; } + bool sat_split_test_cube_and_conquer() const { + return optionTable.find(o_sat_split_test_cube_and_conquer) != optionTable.end() ? + optionTable.at(o_sat_split_test_cube_and_conquer).getValue().getBoolVal() : false; + } SpType sat_split_type() const { if (sat_lookahead_split()) { @@ -665,7 +719,7 @@ struct SMTConfig SpUnit sat_split_units() const { if (optionTable.find(o_sat_split_units) != optionTable.end()) { - std::string type = optionTable.at(o_sat_split_units).getValue().strval; + std::string type = optionTable.at(o_sat_split_units).getValue().getStringVal(); if (type == spts_search_counter) { return SpUnit::search_counter; } else if (type == spts_time) { @@ -677,64 +731,74 @@ struct SMTConfig double sat_split_inittune() const { return optionTable.find(o_sat_split_inittune) != optionTable.end() ? - optionTable.at(o_sat_split_inittune).getValue().getDoubleVal() : - -1; } + optionTable.at(o_sat_split_inittune).getValue().getDoubleVal() : + -1; + } double sat_split_midtune() const { return optionTable.find(o_sat_split_midtune) != optionTable.end() ? optionTable.at(o_sat_split_midtune).getValue().getDoubleVal() : - -1; } - int sat_split_num() const { + -1; + } + uint32_t sat_split_num() const { return optionTable.find(o_sat_split_num) != optionTable.end() ? - optionTable.at(o_sat_split_num).getValue().numval : - 2; } + optionTable.at(o_sat_split_num).getValue().getUint32Val() : + 2; + } int sat_split_fixvars() const { return optionTable.find(o_sat_split_fix_vars) != optionTable.end() ? - optionTable.at(o_sat_split_fix_vars).getValue().numval : - -1; } - int sat_split_asap() const { + optionTable.at(o_sat_split_fix_vars).getValue().getIntVal() : + -1; + } + bool sat_split_asap() const { return optionTable.find(o_sat_split_asap) != optionTable.end() ? - optionTable.at(o_sat_split_asap).getValue().numval : - 0; } - int sat_lookahead_split() const { + optionTable.at(o_sat_split_asap).getValue().getBoolVal(): + false; + } + bool sat_lookahead_split() const { return optionTable.find(o_sat_lookahead_split) != optionTable.end() ? - optionTable.at(o_sat_lookahead_split).getValue().numval : - 0; } - int sat_scatter_split() const { + optionTable.at(o_sat_lookahead_split).getValue().getBoolVal(): + false; + } + bool sat_scatter_split() const { return optionTable.find(o_sat_scatter_split) != optionTable.end() ? - optionTable.at(o_sat_scatter_split).getValue().numval : - 0; } - int sat_pure_lookahead() const { + optionTable.at(o_sat_scatter_split).getValue().getBoolVal() : + false; + } + bool sat_pure_lookahead() const { return optionTable.find(o_sat_pure_lookahead) != optionTable.end() ? - optionTable.at(o_sat_pure_lookahead).getValue().numval : - 0; } - int lookahead_score_deep() const { + optionTable.at(o_sat_pure_lookahead).getValue().getBoolVal() : + false; + } + bool lookahead_score_deep() const { return optionTable.find(o_lookahead_score_deep) != optionTable.end() ? - optionTable.at(o_lookahead_score_deep).getValue().numval : - 0; } - int randomize_lookahead() const { + optionTable.at(o_lookahead_score_deep).getValue().getBoolVal() : + false; + } + bool randomize_lookahead() const { return optionTable.find(o_sat_split_randomize_lookahead) != optionTable.end() ? - optionTable.at(o_sat_split_randomize_lookahead).getValue().numval : - 0; } + optionTable.at(o_sat_split_randomize_lookahead).getValue().getBoolVal() : + false; + } - int randomize_lookahead_bufsz() const { + uint32_t randomize_lookahead_bufsz() const { return optionTable.find(o_sat_split_randomize_lookahead_buf) != optionTable.end() ? - optionTable.at(o_sat_split_randomize_lookahead_buf).getValue().numval : - 1; } + optionTable.at(o_sat_split_randomize_lookahead_buf).getValue().getUint32Val() : + true; + } - int remove_symmetries() const - { return optionTable.find(o_sat_remove_symmetries) != optionTable.end() ? - optionTable.at(o_sat_remove_symmetries).getValue().numval : 0; } + bool remove_symmetries() const { + return optionTable.find(o_sat_remove_symmetries) != optionTable.end() ? + optionTable.at(o_sat_remove_symmetries).getValue().getBoolVal() : false; } - int dryrun() const - { return optionTable.find(o_dryrun) != optionTable.end() ? - optionTable.at(o_dryrun).getValue().numval : 0; } + bool dryrun() const { + return optionTable.find(o_dryrun) != optionTable.end() ? + optionTable.at(o_dryrun).getValue().getBoolVal() : false; } - void set_dryrun(bool b) - { insertOption(o_dryrun, SMTOption(b)); } + void set_dryrun(bool b) { insertOption(o_dryrun, SMTOption(b)); } SpPref sat_split_preference() const { if (optionTable.find(o_sat_split_preference) != optionTable.end()) { - std::string type = optionTable.at(o_sat_split_preference).getValue().strval; + std::string type = optionTable.at(o_sat_split_preference).getValue().getStringVal(); if (type == spprefs_tterm) return sppref_tterm; if (type == spprefs_blind) return sppref_blind; if (type == spprefs_bterm) return sppref_bterm; @@ -747,29 +811,26 @@ struct SMTConfig } bool use_ghost_vars() const { - if (optionTable.find(o_ghost_vars) != optionTable.end()) { - return optionTable.at(o_ghost_vars).getValue().numval != 0; - } - return false; + return optionTable.find(o_ghost_vars) != optionTable.end() ? + optionTable.at(o_ghost_vars).getValue().getBoolVal() : + false; } - int do_substitutions() const - { return optionTable.find(o_do_substitutions) != optionTable.end()? - optionTable.at(o_do_substitutions).getValue().numval : 1; } + bool do_substitutions() const { + return optionTable.find(o_do_substitutions) != optionTable.end()? + optionTable.at(o_do_substitutions).getValue().getBoolVal() : true; } - bool use_theory_polarity_suggestion() const - { return sat_theory_polarity_suggestion != 0; } + bool use_theory_polarity_suggestion() const { return sat_theory_polarity_suggestion != 0; } - int sat_solver_limit() const - { return optionTable.find(o_sat_solver_limit) != optionTable.end() ? - optionTable.at(o_sat_solver_limit).getValue().numval : 0; } + uint32_t sat_solver_limit() const { + return optionTable.find(o_sat_solver_limit) != optionTable.end() ? + optionTable.at(o_sat_solver_limit).getValue().getUint32Val() : 0; } bool sat_split_mode() const { - if (optionTable.find(o_sat_split_mode) != optionTable.end()) { - return optionTable.at(o_sat_split_mode).getValue().numval != 0; - } - return false; + return optionTable.find(o_sat_split_mode) != optionTable.end() ? + optionTable.at(o_sat_split_mode).getValue().getBoolVal() : + false; } // int produce_stats; // Should print statistics ? @@ -779,21 +840,14 @@ struct SMTConfig bool rocset; // Regular Output Channel set ? bool docset; // Diagnostic Output Channel set ? int dump_formula; // Dump input formula - int verbosity() const // Verbosity level -// TODO: remove MACROS from header file -#ifdef PEDANTIC_DEBUG - { return optionTable.has(o_verbosity) ? - optionTable[o_verbosity]->getValue().numval : 2; } -#elif GC_DEBUG - { return optionTable.has(o_verbosity) ? - optionTable[o_verbosity]->getValue().numval : 2; } -#else - { return optionTable.find(o_verbosity) != optionTable.end() ? - optionTable.at(o_verbosity).getValue().numval : 0; } -#endif - int printSuccess() const - { return optionTable.find(":print-success") != optionTable.end() ? - optionTable.at(":print-success").getValue().numval == 1: false; } + bool verbosity() const { // Verbosity level + return optionTable.find(o_verbosity) != optionTable.end() ? + optionTable.at(o_verbosity).getValue().getBoolVal() : false; + } + bool printSuccess() const { + return optionTable.find(":print-success") != optionTable.end() ? + optionTable.at(":print-success").getValue().getBoolVal() : false; + } int certification_level; // Level of certification char certifying_solver[256]; // Executable used for certification diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index 64c6749a5..edb73a282 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -62,6 +62,7 @@ struct SymbolNode : public GeneralNode { return {*(**specConstNode).value}; } assert(false); + return {}; } ConstType getType() const { if (std::get_if>(&name)) { From 7efaef8ddfc07fc70fd41e0fd1b8f8bc60065e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Thu, 27 Oct 2022 18:52:47 +0200 Subject: [PATCH 53/76] Interpret: update to new parser output --- src/api/Interpret.cc | 1124 ++++++++++++-------------- src/api/Interpret.h | 24 +- src/bin/opensmt.cc | 12 +- src/options/SMTConfig.cc | 43 +- src/options/SMTConfig.h | 362 ++++----- src/parsers/smt2new/smt2newcontext.h | 50 +- src/parsers/smt2new/smt2newparser.yy | 29 +- 7 files changed, 759 insertions(+), 885 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 911a20a30..715b9ddd6 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -29,6 +29,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "ArithLogic.h" #include "LogicFactory.h" #include "Substitutor.h" +#include "ParseNodePrinter.h" #include #include @@ -46,47 +47,118 @@ Interpret::getParsedFormula() return root; } -void Interpret::setInfo(std::string const & name) { - +void Interpret::interp(SetInfo const & n) { + std::string name = n.getName(); + config.setInfo(n.getName(), n.getValue()); + notify_success(); } -void Interpret::getInfo(ASTNode const & n) { - assert(n.getType() == ASTType::INFO_T); - assert(n.hasValue() or n.children->size() == 1); - std::string const & name = n.hasValue() ? n.getValue() : (*(*n.children)[0]).getValue(); +void Interpret::interp(GetInfo const & n) { + assert(n.key); + std::string const & name = *n.key; - const Info& value = config.getInfo(name); + auto const & value = config.getInfo(name); - if (value.isEmpty()) + if (value.type == ConstType::empty) notify_formatted(true, "no value for info %s", name.c_str()); else { - auto val_str = value.toString(); + auto val_str = value.getStringVal(); notify_formatted(false, "%s %s", name.c_str(), val_str.c_str()); } } -void Interpret::setOption(ASTNode const & n) { - assert(n.getType() == ASTType::OPTION_T); - assert(not n.hasValue() or not n.children->empty()); - std::string const & name = not n.hasValue() ? (*n.children)[0]->getValue() : n.getValue(); - - SMTOption value(n); - const char* msg = "ok"; - bool rval = config.setOption(name, value, msg); - if (rval == false) - notify_formatted(true, "set-option failed for %s: %s", name.c_str(), msg); +void Interpret::interp(SetOption const & n) { + assert(n.option); + switch (n.option->type) { + case OptionNode::OptionType::Attribute: { + auto val = std::get_if>(&n.option->value); + assert(val); + assert(*val); + config.setOption(*(**val).name, *(**val).value); + break; + } + case OptionNode::OptionType::DiagnosticOutputChannel: { + auto val = std::get_if>(&n.option->value); + assert(val); + assert(*val); + config.setOption("diagnostic-output-channel", std::move(**val)); + break; + } + case OptionNode::OptionType::ExpandDefinitions: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("expand-definitions", *val); + break; + } + case OptionNode::OptionType::InteractiveMode: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("interactive-mode", *val); + break; + } + case OptionNode::OptionType::PrintSuccess: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("print-success", *val); + break; + } + case OptionNode::OptionType::ProduceAssignments: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("produce-assignments", *val); + break; + } + case OptionNode::OptionType::ProduceModels: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("produce-models", *val); + break; + } + case OptionNode::OptionType::ProduceProofs: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("produce-proofs", *val); + break; + } + case OptionNode::OptionType::ProduceUnsatCores: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("produce-unsat-cores", *val); + break; + } + case OptionNode::OptionType::RandomSeed: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("random-seed", *val); + break; + } + case OptionNode::OptionType::RegularOutputChannel: { + auto val = std::get_if>(&n.option->value); + assert(val); + assert(*val); + config.setOption("regular-output-channel", std::move(**val)); + break; + } + case OptionNode::OptionType::Verbosity: { + auto val = std::get_if(&n.option->value); + assert(val); + config.setOption("verbosity", *val); + break; + } + default: + notify_formatted(true, "unknown option"); + break; + } } -void Interpret::getOption(ASTNode const & n) { - assert(n.getType() == ASTType::UATTR_T || n.getType() == ASTType::PATTR_T ); - - assert(n.hasValue()); - std::string const & name = n.getValue(); +void Interpret::interp(GetOption const & n) { + assert(n.key); + std::string const & name = *n.key; const SMTOption& value = config.getOption(name); if (value.isEmpty()) - notify_formatted(true, "No value for attr %s", name.c_str()); + notify_formatted(true, "No value for option %s", name.c_str()); else { auto str_val = value.toString(); notify_formatted(false, "%s",str_val.c_str()); @@ -164,399 +236,71 @@ void Interpret::interp(SetLogic const & n) { } } -void Interpret::interp(SetInfo const & n) { - std::string name = n.getName(); - config.setInfo(n.getName(), ConfValue(n.getValue())); - notify_success(); -} - - /* -void Interpret::interp(CommandNode const & n) { - assert(n.getType() == ASTType::CMD_T); - const smt2token cmd = n.getToken(); - try { - - case t_setinfo: - setInfo(*(*n.children)[0]); - notify_success(); - break; - case t_setoption : { - setOption(*(*n.children)[0]); - notify_success(); - break; - } - case t_getinfo: { - getInfo(*(*n.children)[0]); - break; - } - case t_getoption: { - getOption(*(*n.children)[0]); - break; - } - case t_declaresort: { - if (isInitialized()) { - assert(n.children->size() == 2); - ASTNode const & symbolNode = *(*n.children)[0]; - assert(symbolNode.getType() == ASTType::SYM_T or symbolNode.getType() == ASTType::QSYM_T); - ASTNode const & numNode = *(*n.children)[1]; - assert(numNode.getType() == ASTType::NUM_T); - int arity = std::stoi(numNode.getValue()); // MB: TODO: take care of out-of-range input - SortSymbol symbol(symbolNode.getValue(), arity); - SSymRef ssref; - if (logic->peekSortSymbol(symbol, ssref)) { - notify_formatted(true, "sort %s already declared", symbolNode.getValue().c_str()); - } else { - logic->declareSortSymbol(std::move(symbol)); - notify_success(); - } - } else - notify_formatted(true, "illegal command before set-logic: declare-sort"); - break; - } - case t_declarefun: { - if (isInitialized()) { - if (declareFun(n)) - notify_success(); - } else - notify_formatted(true, "Illegal command before set-logic: declare-fun"); - break; - } - case t_declareconst: { - if (isInitialized()) { - declareConst(n); - } else - notify_formatted(true, "Illegal command before set-logic: declare-const"); - break; - } - case t_assert: { - if (isInitialized()) { - sstat status; - ASTNode const &asrt = *(*n.children)[0]; - LetRecords letRecords; - PTRef tr = parseTerm(asrt, letRecords); - if (tr == PTRef_Undef) - notify_formatted(true, "assertion returns an unknown sort"); - else { - assertions.push(tr); - char *err_msg = NULL; - status = main_solver->insertFormula(tr, &err_msg); - - if (status == s_Error) - notify_formatted(true, "Error"); - else if (status == s_Undef) - notify_success(); - else if (status == s_False) - notify_success(); - - if (err_msg != NULL && status == s_Error) - notify_formatted(true, err_msg); - if (err_msg != NULL && status != s_Error) - comment_formatted(err_msg); - free(err_msg); - } - } else { - notify_formatted(true, "Illegal command before set-logic: assert"); - } - break; - } - case t_definefun: { - if (isInitialized()) { - defineFun(n); - } else { - notify_formatted(true, "Illegal command before set-logic: define-fun"); - } - break; - } - case t_simplify: { - if (isInitialized()) { - sstat status = main_solver->simplifyFormulas(); - if (status == s_Error) - notify_formatted(true, "Simplify"); - } else { - notify_formatted(true, "Illegal command before set-logic: simplify"); - } - break; - } - case t_checksat: { - if (isInitialized()) { - checkSat(); - } else { - notify_formatted(true, "Illegal command before set-logic: check-sat"); - } - break; - } - case t_getinterpolants: { - if (config.produce_inter()) { - if (isInitialized()) { - getInterpolants(n); - } else { - notify_formatted(true, "Illegal command before set-logic: get-interpolants"); - } - } else { - notify_formatted(true, - "Option to produce interpolants has not been set, skipping this command ..."); - } - break; - } - case t_getassignment: { - if (isInitialized()) { - getAssignment(); - } else { - notify_formatted(true, "Illegal command before set-logic: get-assignment"); - } - break; - } - case t_getvalue: { - if (not isInitialized()) { - notify_formatted(true, "Illegal command before set-logic: get-value"); - } else if (main_solver->getStatus() != s_True) { - notify_formatted(true, "Command get-value called, but solver is not in SAT state"); - } else { - getValue(*n.children); - } - break; - } - case t_getmodel: { - if (not isInitialized()) { - notify_formatted(true, "Illegal command before set-logic: get-model"); - } else if (main_solver->getStatus() != s_True) { - notify_formatted(true, "Command get-model called, but solver is not in SAT state"); - } else { - getModel(); - } - break; - } - - - case t_echo: { - std::string const & str = (*n.children)[0]->getValue(); - notify_formatted(false, "%s", str.c_str()); - break; - } - case t_push: { - if (not isInitialized()) { - notify_formatted(true, "Illegal command before set-logic: push"); - } else { - try { - int num = std::stoi((*n.children)[0]->getValue()); - push(num); - } catch (std::out_of_range const & e) { - notify_formatted(true, "Illegal push command: %s", e.what()); - } - } - break; - } - case t_pop: { - if (not isInitialized()) { - notify_formatted(true, "Illegal command before set-logic: pop"); - } else { - try { - int num = std::stoi((*n.children)[0]->getValue()); - pop(num); - } catch (std::out_of_range const &ex) { - notify_formatted(true, "Illegal pop command: %s", ex.what()); - } - } - break; - } - case t_exit: { - exit(); - notify_success(); - break; - } - default: { - notify_formatted(true, "Unknown command encountered: %s", tokenToName.at(cmd.x).c_str()); - } - } - } catch (OsmtApiException const &e) { - notify_formatted(true, e.what()); - } -} -*/ - - -bool Interpret::addLetFrame(std::vector const & names, vec const& args, LetRecords& letRecords) { - assert(names.size() == args.size_()); - if (names.size() > 1) { - // check that they are pairwise distinct; - std::unordered_set namesAsSet(names.begin(), names.end()); - if (namesAsSet.size() != names.size()) { - comment_formatted("Overloading let variables makes no sense"); - return false; - } - } - for (unsigned int i = 0; i < names.size(); ++i) { - std::string const & name = names[i]; - if (logic->hasSym(name.c_str()) && logic->getSym(logic->symNameToRef(name.c_str())[0]).noScoping()) { - comment_formatted("Names marked as no scoping cannot be overloaded with let variables: %s", name.c_str()); - return false; - } - letRecords.addBinding(name.c_str(), args[i]); - } - return true; -} - -// -// Determine whether the term refers to some let definition -// -PTRef Interpret::letNameResolve(const char* s, const LetRecords& letRecords) const { - return letRecords.getOrUndef(s); -} - -PTRef Interpret::resolveQualifiedIdentifier(const char * name, ASTNode const & sort, bool isQuoted) { - SRef sr = sortFromASTNode(sort); - PTRef tr = PTRef_Undef; - try { - tr = resolveTerm(name, {}, sr, isQuoted ? SymbolMatcher::Uninterpreted : SymbolMatcher::Any); - } catch (OsmtApiException & e) { - reportError(e.what()); +void Interpret::interp(DeclareSort const & declareSort) { + if (not isInitialized()) { + notify_formatted(true, "illegal command before set-logic: declare-sort"); + return; } - return tr; -} - -PTRef Interpret::resolveTerm(const char* s, vec&& args, SRef sortRef, SymbolMatcher symbolMatcher) { - if (defined_functions.has(s)) { - auto const & tpl = defined_functions[s]; - return logic->instantiateFunctionTemplate(tpl, std::move(args)); + SymbolNode const & symbolNode = *declareSort.symbol; + std::string const & numNode = *declareSort.num; + int arity = std::stoi(numNode); // MB: TODO: take care of out-of-range input + SortSymbol symbol(opensmt::nodeToString()(symbolNode), arity); + SSymRef ssref; + if (logic->peekSortSymbol(symbol, ssref)) { + notify_formatted(true, "sort %s already declared", opensmt::nodeToString()(symbolNode).c_str()); + } else { + logic->declareSortSymbol(std::move(symbol)); + notify_success(); } - return logic->resolveTerm(s, std::move(args), sortRef, symbolMatcher); } -PTRef Interpret::parseTerm(const ASTNode& term, LetRecords& letRecords) { - ASTType t = term.getType(); - if (t == ASTType::TERM_T) { - std::string const & name = (*term.children)[0]->getValue(); -// comment_formatted("Processing term %s", name); - PTRef tr = PTRef_Undef; - try { - tr = logic->mkConst(name.c_str()); - } catch (OsmtApiException const & e) { - comment_formatted("While processing %s: %s", name.c_str(), e.what()); - } - return tr; - } - - else if (t == ASTType::QID_T) { - if ((*term.children)[0]->getType() == ASTType::AS_T) { - ASTNode const & as_node = *(*term.children)[0]; - ASTNode const & symbolNode = *(*as_node.children)[0]; - bool isQuoted = symbolNode.getType() == ASTType::QSYM_T; - std::string const & name = (*as_node.children)[0]->getValue(); - ASTNode const & sortNode = *(*as_node.children)[1]; - assert(not name.empty()); - PTRef tr = resolveQualifiedIdentifier(name.c_str(), sortNode, isQuoted); - return tr; - } else { - ASTNode const & symbolNode = *(*term.children)[0]; - std::string const & name = symbolNode.getValue(); - bool isQuoted = symbolNode.getType() == ASTType::QSYM_T; - PTRef tr = letNameResolve(name.c_str(), letRecords); - if (tr != PTRef_Undef) { - return tr; - } try { - tr = resolveTerm(name.c_str(), {}, SRef_Undef, isQuoted ? SymbolMatcher::Uninterpreted : SymbolMatcher::Any); - } catch (OsmtApiException & e) { - reportError(e.what()); - } - return tr; - } +void Interpret::interp(AssertNode const & n) { + if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: assert"); + return; } - else if ( t == ASTType::LQID_T ) { - // Multi-argument term - assert(term.children->size() > 1); - auto const & astArgs = opensmt::span(&(*term.children)[1], term.children->size()-1); - std::string const & name = (*term.children)[0]->getValue(); - vec args; - for (auto const & arg : astArgs) { - PTRef arg_tr = parseTerm(*arg, letRecords); - if (arg_tr == PTRef_Undef) { - return PTRef_Undef; - } else { - args.push(arg_tr); - } - } - - assert(args.size() > 0); + sstat status; + TermNode const & asrt = *n.term; + LetRecords letRecords; + PTRef tr = parseTerm(asrt, letRecords); + if (tr == PTRef_Undef) { + notify_formatted(true, "assertion returns an unknown sort"); + } else { + assertions.push(tr); + char *err_msg = nullptr; + status = main_solver->insertFormula(tr, &err_msg); - PTRef tr = PTRef_Undef; - try { - tr = resolveTerm(name.c_str(), std::move(args)); - } catch (ArithDivisionByZeroException &ex) { - reportError(ex.what()); - } catch (OsmtApiException &e) { - reportError(e.what()); - } - return tr; - } else if (t == ASTType::LET_T) { - assert(term.children->size() == 2); - std::vector> const & varList = *(*term.children)[0]->children; - ASTNode const & letBoundedTerm = *(*term.children)[1]; - vec tmp_args; - std::vector names; - - // use RAII idiom to guard the scope of new LetFrame (and ensure the cleaup of names) - class Guard { - LetRecords& rec; - public: - Guard(LetRecords& rec): rec(rec) { rec.pushFrame(); } - ~Guard() { rec.popFrame(); } - } scopeGuard(letRecords); - // First read the term declarations in the let statement - for (auto const & varListEl : varList) { - PTRef let_tr = parseTerm(*(*(*varListEl).children)[0], letRecords); - if (let_tr == PTRef_Undef) return PTRef_Undef; - tmp_args.push(let_tr); - names.push_back(varListEl->getValue()); - } + if (status == s_Error) + notify_formatted(true, "Error"); + else if (status == s_Undef) + notify_success(); + else if (status == s_False) + notify_success(); - // Only then insert them to the table - bool success = addLetFrame(names, tmp_args, letRecords); - if (not success) { - comment_formatted("Let name addition failed"); - return PTRef_Undef; - } - // This is now constructed with the let declarations context in let_branch - PTRef tr = parseTerm(letBoundedTerm, letRecords); - if (tr == PTRef_Undef) { - comment_formatted("Failed in parsing the let scoped term"); - return PTRef_Undef; - } - return tr; + if (err_msg != nullptr && status == s_Error) + notify_formatted(true, err_msg); + if (err_msg != nullptr && status != s_Error) + comment_formatted(err_msg); + free(err_msg); } +} - else if (t == ASTType::BANG_T) { - assert(term.children->size() == 2); - - ASTNode const & named_term = *(*term.children)[0]; - ASTNode const & attr_l = *(*term.children)[1]; - assert(attr_l.getType() == ASTType::GATTRL_T); - assert(attr_l.children->size() == 1); - ASTNode const & name_attr = *(*attr_l.children)[0]; - - PTRef tr = parseTerm(named_term, letRecords); - if (tr == PTRef_Undef) return tr; - - if (name_attr.getValue() == ":named") { - ASTNode const & sym = *(*name_attr.children)[0]; - assert(sym.getType() == ASTType::SYM_T or sym.getType() == ASTType::QSYM_T); - if (nameToTerm.find(sym.getValue()) != nameToTerm.end()) { - notify_formatted(true, "name %s already exists", sym.getValue().c_str()); - return PTRef_Undef; - } - std::string name = sym.getValue(); - // MB: term_names becomes the owner of the string and is responsible for deleting - term_names.push_back(name); - nameToTerm.insert({name, tr}); - } - return tr; +void Interpret::interp(Simplify const & n) { + if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: simplify"); + return; } - else - comment_formatted("Unknown term type"); - return PTRef_Undef; + sstat status = main_solver->simplifyFormulas(); + if (status == s_Error) + notify_formatted(true, "Simplify"); } -sstat Interpret::checkSat() { +void Interpret::interp(CheckSatNode const & n) { + if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: check-sat"); + return; + } sstat res; res = main_solver->check(); @@ -568,14 +312,13 @@ sstat Interpret::checkSat() { else notify_formatted(false, "unknown"); - const Info& status = config.getInfo(":status"); + auto const & status = config.getInfo(":status"); if (!status.isEmpty()) { std::string statusString = status.toString(); - if ((statusString.compare("sat") == 0) && (res == s_False)) { + if (statusString == "sat" && (res == s_False)) { notify_formatted(false, "(error \"check status which says sat\")"); - } - else if ((statusString.compare("unsat") == 0) && (res == s_True)) { + else if (statusString == "unsat" && (res == s_True)) { notify_formatted(false, "(error \"check status which says unsat\")"); } } @@ -587,93 +330,6 @@ sstat Interpret::checkSat() { if (!o_dump_state.isEmpty() && o_split == spt_none) writeState(name); } - - return res; -} - -void Interpret::push(int n) { - if (not config.isIncremental()) { - notify_formatted(true, "push encountered but solver not in incremental mode"); - } else { - if (n < 0) { - notify_formatted(true, "Incorrect push command, value is negative."); - } else { - while (n--) { - defined_functions.pushScope(); - main_solver->push(); - } - notify_success(); - } - } -} - -void Interpret::pop(int n) { - if (config.isIncremental()) { - if (n < 0) { - notify_formatted(true, "Incorrect pop command, value is negative."); - } else { - bool success = true; - while (n-- and success) { - success = main_solver->pop(); - if (success) { defined_functions.popScope(); } - } - if (success) { - notify_success(); - } else { - notify_formatted(true, "Attempt to pop beyond the top of the stack"); - } - } - } else { - notify_formatted(true, "pop encountered but solver not in incremental mode"); - } -} - -bool Interpret::getAssignment() { - if (not isInitialized()) { - notify_formatted(true, "Illegal command before set-logic"); - return false; - } - if (main_solver->getStatus() != s_True) { - notify_formatted(true, "Last solver call not satisfiable"); - return false; - } - std::stringstream ss; - ss << '('; - for (unsigned int i = 0; i < term_names.size(); i++) { - std::string const & name = term_names[i]; - PTRef tr = nameToTerm[name.c_str()]; - lbool val = main_solver->getTermValue(tr); - ss << '(' << name << ' ' << (val == l_True ? "true" : (val == l_False ? "false" : "unknown")) - << ')' << (i < term_names.size() - 1 ? " " : ""); - } - ss << ')'; - const std::string& out = ss.str(); - notify_formatted(false, out.c_str()); - return true; -} - -void Interpret::getValue(std::vector> const & terms) -{ - auto model = main_solver->getModel(); - Logic& logic = main_solver->getLogic(); - std::vector> values; - for (auto const & term : terms) { - LetRecords tmp; - PTRef tr = parseTerm(*term, tmp); - if (tr != PTRef_Undef) { - values.emplace_back(opensmt::pair{tr, model->evaluate(tr)}); - auto pt_str = logic.printTerm(tr); - comment_formatted("Found the term %s", pt_str.c_str()); - } else - comment_formatted("Error parsing the term %s", (*term->children)[0]->getValue().c_str()); - } - printf("("); - for (auto const & valPair : values) { - auto name = logic.printTerm(valPair.first); - auto value = logic.printTerm(valPair.second); - printf("(%s %s)", name.c_str(), value.c_str()); - } - printf(")\n"); } namespace { @@ -741,7 +397,14 @@ class NameClashResolver { }; } -void Interpret::getModel() { +void Interpret::interp(GetModel const & n) { + if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: get-model"); + return; + } else if (main_solver->getStatus() != s_True) { + notify_formatted(true, "Command get-model called, but solver is not in SAT state"); + return; + } auto model = main_solver->getModel(); NameClashResolver resolver(*logic); @@ -769,6 +432,305 @@ void Interpret::getModel() { std::cout << ss.str() << std::endl; } +void Interpret::interp(Echo const & n) { + std::string const & str = *n.text; + notify_formatted(false, "%s", str.c_str()); +} + +void Interpret::interp(PushNode const & n) { + if (not config.isIncremental()) { + notify_formatted(true, "push encountered but solver not in incremental mode"); + return; + } else if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: push"); + return; + } + int num = n.num; + while (num --) { + defined_functions.pushScope(); + main_solver->push(); + } + notify_success(); +} + +void Interpret::interp(PopNode const & n) { + if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: pop"); + return; + } else if (not config.isIncremental()) { + notify_formatted(true, "pop encountered but solver not in incremental mode"); + return; + } else if (n.num < 0) { + notify_formatted(true, "Incorrect pop command, value is negative."); + return; + } + bool success = true; + int num = n.num; + while (num -- and success) { + success = main_solver->pop(); + if (success) { defined_functions.popScope(); } + } + if (success) { + notify_success(); + } else { + notify_formatted(true, "Attempt to pop beyond the top of the stack"); + } +} + +void Interpret::interp(Exit const & n) { + exit(); + notify_success(); +} + +bool Interpret::addLetFrame(std::vector const & names, vec const& args, LetRecords& letRecords) { + assert(names.size() == args.size_()); + if (names.size() > 1) { + // check that they are pairwise distinct; + std::unordered_set namesAsSet(names.begin(), names.end()); + if (namesAsSet.size() != names.size()) { + comment_formatted("Overloading let variables makes no sense"); + return false; + } + } + for (unsigned int i = 0; i < names.size(); ++i) { + std::string const & name = names[i]; + if (logic->hasSym(name.c_str()) && logic->getSym(logic->symNameToRef(name.c_str())[0]).noScoping()) { + comment_formatted("Names marked as no scoping cannot be overloaded with let variables: %s", name.c_str()); + return false; + } + letRecords.addBinding(name.c_str(), args[i]); + } + return true; +} + +// +// Determine whether the term refers to some let definition +// +PTRef Interpret::letNameResolve(const char* s, const LetRecords& letRecords) const { + return letRecords.getOrUndef(s); +} + +PTRef Interpret::resolveQualifiedIdentifier(std::string const & name, SortNode const & sort, bool isQuoted) { + SRef sr = sortFromSortNode(sort); + PTRef tr = PTRef_Undef; + try { + tr = resolveTerm(name.c_str(), {}, sr, isQuoted ? SymbolMatcher::Uninterpreted : SymbolMatcher::Any); + } catch (OsmtApiException & e) { + reportError(e.what()); + } + return tr; +} + +PTRef Interpret::resolveTerm(const char* s, vec&& args, SRef sortRef, SymbolMatcher symbolMatcher) { + if (defined_functions.has(s)) { + auto const & tpl = defined_functions[s]; + return logic->instantiateFunctionTemplate(tpl, std::move(args)); + } + return logic->resolveTerm(s, std::move(args), sortRef, symbolMatcher); +} + +PTRef Interpret::parseTerm(LetTermNode const * letTerm, LetRecords & letRecords) { + assert(letTerm->arguments->size() == 1); + auto const & varList = *letTerm->bindings; + auto const & letBoundedTerm = (*letTerm->arguments)[0]; + vec tmp_args; + std::vector names; + + // use RAII idiom to guard the scope of new LetFrame (and ensure the cleaup of names) + class Guard { + LetRecords& rec; + public: + Guard(LetRecords& rec): rec(rec) { rec.pushFrame(); } + ~Guard() { rec.popFrame(); } + } scopeGuard(letRecords); + // First read the term declarations in the let statement + for (auto const & varListEl : varList) { + PTRef let_tr = parseTerm(*varListEl->term, letRecords); + if (let_tr == PTRef_Undef) return PTRef_Undef; + tmp_args.push(let_tr); + names.push_back(opensmt::nodeToString()(*varListEl->symbol)); + } + + // Only then insert them to the table + bool success = addLetFrame(names, tmp_args, letRecords); + if (not success) { + comment_formatted("Let name addition failed"); + return PTRef_Undef; + } + // This is now constructed with the let declarations context in let_branch + PTRef tr = parseTerm(*letBoundedTerm, letRecords); + if (tr == PTRef_Undef) { + comment_formatted("Failed in parsing the let scoped term"); + return PTRef_Undef; + } + return tr; +} + +PTRef Interpret::parseTerm(AnnotationNode const * term, LetRecords & letRecords) { + TermNode const & named_term = *(*term->arguments)[0]; + PTRef tr = parseTerm(named_term, letRecords); + if (tr == PTRef_Undef) return tr; + + auto const & attr_l = *term->attributes; + + for (auto const & attribute : attr_l) { + std::string const & name_attr = *attribute->name; + + if (name_attr == ":named") { + auto name = opensmt::nodeToString()(*attribute->value); + if (nameToTerm.find(name) != nameToTerm.end()) { + notify_formatted(true, "name %s already exists", name.c_str()); + return PTRef_Undef; + } + // MB: term_names becomes the owner of the string and is responsible for deleting + term_names.push_back(name); + nameToTerm.insert({name, tr}); + } + } + return tr; +} + +PTRef Interpret::parseTerm(TermNode const & term, LetRecords& letRecords) { + if (auto const regularTerm = dynamic_cast(&term)) { + return parseTerm(regularTerm, letRecords); + } else if (auto const letTerm = dynamic_cast(&term)) { + return parseTerm(letTerm, letRecords); + } else if (auto const annotatedTerm = dynamic_cast(&term)) { + return parseTerm(annotatedTerm, letRecords); + } else if (auto const forallTerm = dynamic_cast(&term)) { + return parseTerm(forallTerm, letRecords); + } else if (auto const existsTerm = dynamic_cast(&term)) { + return parseTerm(existsTerm, letRecords); + } + comment_formatted("Unknown term type"); + return PTRef_Undef; +} + +PTRef Interpret::parseTerm(NormalTermNode const * term, LetRecords & letRecords) { + if (auto constName = std::get_if>(&term->head)) { + auto const & name = *(*constName)->value; + try { + PTRef tr = logic->mkConst(name.c_str()); + return tr; + } catch (OsmtApiException const & e) { + comment_formatted("While processing %s: %s", name.c_str(), e.what()); + return PTRef_Undef; + } + } + auto identifier = std::get_if>(&term->head); + assert(identifier); + auto name = opensmt::nodeToString()(*(*identifier)->symbol); + bool isQuoted = (*identifier)->symbol->quoted; + if (term->returnSort) { + return resolveQualifiedIdentifier(name, *term->returnSort, isQuoted); + } else { + if (term->arguments->empty()) { + PTRef tr = letNameResolve(name.c_str(), letRecords); + if (tr != PTRef_Undef) { + return tr; + } try { + tr = resolveTerm(name.c_str(), {}, SRef_Undef, isQuoted ? SymbolMatcher::Uninterpreted : SymbolMatcher::Any); + } catch (OsmtApiException & e) { + reportError(e.what()); + } + return tr; + } else { + vec args; + for (auto const & arg : *term->arguments) { + PTRef arg_tr = parseTerm(*arg, letRecords); + if (arg_tr == PTRef_Undef) { + return PTRef_Undef; + } else { + args.push(arg_tr); + } + } + assert(args.size() > 0); + + PTRef tr = PTRef_Undef; + try { + tr = resolveTerm(name.c_str(), std::move(args)); + } catch (ArithDivisionByZeroException &ex) { + reportError(ex.what()); + } catch (OsmtApiException &e) { + reportError(e.what()); + } + return tr; + } + } +} + +PTRef Interpret::parseTerm(ForallNode const * term, LetRecords & letRecords) { + return PTRef_Undef; +} +PTRef Interpret::parseTerm(ExistsNode const * term, LetRecords & letRecords) { + return PTRef_Undef; +} + + + + + +void Interpret::interp(GetAssignment const & getAssignment) { + if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic"); + } + if (main_solver->getStatus() != s_True) { + notify_formatted(true, "Last solver call not satisfiable"); + } + std::stringstream ss; + ss << '('; + for (unsigned int i = 0; i < term_names.size(); i++) { + std::string const & name = term_names[i]; + PTRef tr = nameToTerm[name.c_str()]; + lbool val = main_solver->getTermValue(tr); + ss << '(' << name << ' ' << (val == l_True ? "true" : (val == l_False ? "false" : "unknown")) + << ')' << (i < term_names.size() - 1 ? " " : ""); + } + ss << ')'; + const std::string& out = ss.str(); + notify_formatted(false, out.c_str()); +} + +namespace { +// Todo: implement all cases +std::string printTermNode(TermNode const & term) { + auto term_p = dynamic_cast(&term); + assert(term_p); + if (auto const_p = std::get_if>(&term_p->head)) { + return *(*const_p)->value; + } else { + auto head_p = std::get_if>(&term_p->head); + assert(head_p); + return opensmt::nodeToString()(*(*head_p)->symbol); + } +} +} + +void Interpret::interp(GetValue const & getValue) +{ + auto model = main_solver->getModel(); + Logic & logic = *(this->logic); + std::vector> values; + for (auto const term : *getValue.terms) { + LetRecords tmp; + PTRef tr = parseTerm(*term, tmp); + if (tr != PTRef_Undef) { + values.emplace_back(opensmt::pair{tr, model->evaluate(tr)}); + auto pt_str = logic.printTerm(tr); + comment_formatted("Found the term %s", pt_str.c_str()); + } else + comment_formatted("Error parsing the term %s", printTermNode(*term).c_str()); + } + printf("("); + for (auto const & valPair : values) { + auto name = logic.printTerm(valPair.first); + auto value = logic.printTerm(valPair.second); + printf("(%s %s)", name.c_str(), value.c_str()); + } + printf(")\n"); +} + + /** * * @param tr the term to print @@ -820,32 +782,33 @@ void Interpret::writeState(std::string const & filename) } } -bool Interpret::declareFun(ASTNode const & n) // (const char* fname, const vec& args) + + +void Interpret::interp(DeclareFun const & n) // (const char* fname, const vec& args) { - assert(n.children->size() == 3); - ASTNode const & name_node = *(*n.children)[0]; - ASTNode const & args_node = *(*n.children)[1]; - ASTNode const & ret_node = *(*n.children)[2]; + SymbolNode const & name_node = *n.name; + auto const & args_vec = *n.argumentSorts; + SortNode const & ret_sort = *n.returnSort; - std::string const & fname = name_node.getValue(); + std::string const & fname = opensmt::nodeToString()(name_node); vec args; - SRef retSort = sortFromASTNode(ret_node); + SRef retSort = sortFromSortNode(ret_sort); if (retSort != SRef_Undef) { args.push(retSort); } else { - notify_formatted(true, "Unknown return sort %s of %s", sortSymbolFromASTNode(ret_node).name.c_str(), fname.c_str()); - return false; + notify_formatted(true, "Unknown return sort %s of %s", opensmt::nodeToString()(*ret_sort.identifier).c_str(), fname.c_str()); + return; } - for (auto const & childNode : *(args_node.children)) { - SRef argSort = sortFromASTNode(*childNode); + for (auto const childNode : args_vec) { + SRef argSort = sortFromSortNode(*childNode); if (argSort != SRef_Undef) { args.push(argSort); } else { - notify_formatted(true, "Undefined sort %s in function %s", sortSymbolFromASTNode(*childNode).name.c_str(), fname.c_str()); - return false; + notify_formatted(true, "Undefined sort %s in function %s", opensmt::nodeToString()(*childNode->identifier).c_str(), fname.c_str()); + return; } } @@ -859,59 +822,55 @@ bool Interpret::declareFun(ASTNode const & n) // (const char* fname, const vecsize() == 3); - ASTNode const & name_node = *(*n.children)[0]; - // n.children[1] is the args node, which is empty - ASTNode const & ret_node = *(*n.children)[2]; + auto const & name_node = *n.name; + auto const & ret_node = *n.sort; - std::string const & fname = name_node.getValue(); - SRef ret_sort = sortFromASTNode(ret_node); + std::string const & fname = opensmt::nodeToString()(name_node); + SRef ret_sort = sortFromSortNode(ret_node); if (ret_sort == SRef_Undef) { notify_formatted(true, "Failed to declare constant %s", fname.c_str()); - notify_formatted(true, "Unknown return sort %s of %s", sortSymbolFromASTNode(ret_node).name.c_str(), fname.c_str()); - return false; + notify_formatted(true, "Unknown return sort %s of %s", opensmt::nodeToString()(ret_node).c_str(), fname.c_str()); + return; } SymRef rval = logic->declareFun(fname, ret_sort, {}); if (rval == SymRef_Undef) { comment_formatted("Error while declare-const %s", fname.c_str()); - return false; + return; } user_declarations.push(rval); notify_success(); - return true; } -bool Interpret::defineFun(const ASTNode& n) -{ - assert(n.children->size() == 4); - - ASTNode const & name_node = *(*n.children)[0]; - ASTNode const & args_node = *(*n.children)[1]; - ASTNode const & ret_node = *(*n.children)[2]; - ASTNode const & term_node = *(*n.children)[3]; +void Interpret::interp(DefineFun const & n) { + if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: define-fun"); + } + SymbolNode const & nameNode = *n.name; + auto const & argumentVector = *n.args; + SortNode const & returnSort = *n.returnSort; + TermNode const & termNode = *n.term; - std::string const & fname = name_node.getValue(); + std::string const & fname = opensmt::nodeToString()(nameNode); // Get the argument sorts vec arg_sorts; vec arg_trs; - for (auto const & childNode : *(args_node.children)) { - assert(childNode->children->size() == 1); - std::string varName = childNode->getValue(); - ASTNode const & sortNode = *(*childNode->children)[0]; - SRef sortRef = sortFromASTNode(sortNode); + for (auto const & sortedVar_p : argumentVector) { + std::string const & varName = opensmt::nodeToString()(*sortedVar_p->symbol); + SortNode const & sortNode = *sortedVar_p->sort; + SRef sortRef = sortFromSortNode(sortNode); if (sortRef == SRef_Undef) { - notify_formatted(true, "Undefined sort %s in function %s", sortSymbolFromASTNode(sortNode).name.c_str(), fname.c_str()); - return false; + notify_formatted(true, "Undefined sort %s in function %s", opensmt::nodeToString()(sortNode).c_str(), fname.c_str()); + return; } arg_sorts.push(sortRef); PTRef pvar = logic->mkVar(arg_sorts.last(), varName.c_str()); @@ -919,30 +878,29 @@ bool Interpret::defineFun(const ASTNode& n) } // The return sort - SRef ret_sort = sortFromASTNode(ret_node); + SRef ret_sort = sortFromSortNode(returnSort); if (ret_sort == SRef_Undef) { - notify_formatted(true, "Unknown return sort %s of %s", sortSymbolFromASTNode(ret_node).name.c_str(), fname.c_str()); - return false; + notify_formatted(true, "Unknown return sort %s of %s", opensmt::nodeToString()(returnSort).c_str(), fname.c_str()); + return; } sstat status; LetRecords letRecords; - PTRef tr = parseTerm(term_node, letRecords); + PTRef tr = parseTerm(termNode, letRecords); if (tr == PTRef_Undef) { notify_formatted(true, "define-fun returns an unknown sort"); - return false; + return; } else if (logic->getSortRef(tr) != ret_sort) { notify_formatted(true, "define-fun term and return sort do not match: %s and %s\n", logic->printSort(logic->getSortRef(tr)).c_str(), logic->printSort(ret_sort).c_str()); - return false; + return; } bool rval = storeDefinedFun(fname, arg_trs, ret_sort, tr); - if (rval) notify_success(); - else { + if (rval) { + notify_success(); + } else { notify_formatted(true, "define-fun failed"); - return false; + return; } - - return rval; } bool Interpret::storeDefinedFun(std::string const & fname, const vec & args, SRef ret_sort, const PTRef tr) { @@ -1149,9 +1107,10 @@ int Interpret::interpPipe() { if (rval != 0) notify_formatted(true, "scanner"); else { -// ASTNode const & r = context.getRoot(); -// execute(r); - done = f_exit; + for (auto command : context.getRoot()) { + if (rval == 0 and not f_exit) { interp(command); } + delete command; + } } free(buf_out); } @@ -1166,60 +1125,29 @@ int Interpret::interpPipe() { return 0; } -SortSymbol Interpret::sortSymbolFromASTNode(ASTNode const & node) { - auto type = node.getType(); - if (type == ASTType::SYM_T or type == ASTType::QSYM_T) { - return {node.getValue(), 0}; - } else { - assert(type == ASTType::LID_T and not node.children->empty()); - ASTNode const & name = *(*node.children)[0]; - return {name.getValue(), static_cast(node.children->size() - 1)}; - } -} - -SRef Interpret::sortFromASTNode(ASTNode const & node) const { - auto type = node.getType(); - if (type == ASTType::SYM_T or type == ASTType::QSYM_T) { - SortSymbol symbol(node.getValue(), 0); - SSymRef symRef; - bool known = logic->peekSortSymbol(symbol, symRef); - if (not known) { return SRef_Undef; } - return logic->getSort(symRef, {}); - } else { - assert(type == ASTType::LID_T and not node.children->empty()); - ASTNode const & name = *(*node.children)[0]; - SortSymbol symbol(name.getValue(), node.children->size() - 1); - SSymRef symRef; - bool known = logic->peekSortSymbol(symbol, symRef); - if (not known) { return SRef_Undef; } - vec args; - auto astArgs = opensmt::span(&(*node.children)[1], node.children->size()-1); - for (auto const & astArg : astArgs) { - SRef argSortRef = sortFromASTNode(*astArg); - if (argSortRef == SRef_Undef) { return SRef_Undef; } - args.push(argSortRef); - } - return logic->getSort(symRef, std::move(args)); - } - assert(type == ASTType::LID_T and not node.children->empty()); - ASTNode const & name = *(*node.children)[0]; - SortSymbol symbol(name.getValue(), node.children->size() - 1); +SRef Interpret::sortFromSortNode(SortNode const & node) const { + SortSymbol symbol(opensmt::nodeToString()(*node.identifier->symbol), node.sortList->size()); SSymRef symRef; bool known = logic->peekSortSymbol(symbol, symRef); if (not known) { return SRef_Undef; } vec args; - auto astSortArgs = opensmt::span(&(*node.children)[1], node.children->size()-1); - for (auto const & astSortArg : astSortArgs) { - SRef argSortRef = sortFromASTNode(*astSortArg); + for (auto const arg : *node.sortList) { + SRef argSortRef = sortFromSortNode(*arg); if (argSortRef == SRef_Undef) { return SRef_Undef; } args.push(argSortRef); } return logic->getSort(symRef, std::move(args)); } -void Interpret::getInterpolants(const ASTNode& n) -{ - auto const & exps = n.children; +void Interpret::interp(GetInterpolants const & n) { + if (not config.produce_inter()) { + notify_formatted(true, "Option to produce interpolants has not been set, skipping this command ..."); + return; + } else if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: get-interpolants"); + return; + } + auto const & exps = n.configuration; vec grouping; // Consists of PTRefs that we want to group LetRecords letRecords; letRecords.pushFrame(); @@ -1234,7 +1162,7 @@ void Interpret::getInterpolants(const ASTNode& n) } letRecords.popFrame(); - if (!(config.produce_inter() > 0)) + if (not config.produce_inter()) throw OsmtApiException("Cannot interpolate"); assert(grouping.size() >= 2); diff --git a/src/api/Interpret.h b/src/api/Interpret.h index 5ee1c6f1e..fa6dcc7c5 100644 --- a/src/api/Interpret.h +++ b/src/api/Interpret.h @@ -145,28 +145,20 @@ class Interpret { void initializeLogic(opensmt::Logic_t logicType); bool isInitialized() const { return logic != nullptr; } - void setInfo(std::string const & str); - void getInfo(AttributeNode const & n); - void setOption(AttributeNode const & n); - void getOption(AttributeNode const & n); void writeState(std::string const & fname); - bool declareFun(DeclareFun const & n); //(const char* fname, const vec& args); - bool declareConst(DeclareConst const & n); //(const char* fname, const SRef ret_sort); - bool defineFun(DefineFun const & n); - virtual sstat checkSat(); - void getValue(std::vector> const & term); - void getModel(); std::string printDefinitionSmtlib(PTRef tr, PTRef val); std::string printDefinitionSmtlib(const TemplateFunction &templateFun) const; - void push(int); - void pop(int); PTRef parseTerm(TermNode const & term, LetRecords& letRecords); + PTRef parseTerm(NormalTermNode const * term, LetRecords & letRecords); + PTRef parseTerm(LetTermNode const * term, LetRecords & letRecords); + PTRef parseTerm(ForallNode const * term, LetRecords & letRecords); + PTRef parseTerm(ExistsNode const * term, LetRecords & letRecords); + PTRef parseTerm(AnnotationNode const * term, LetRecords & letRecords); PTRef resolveTerm(const char* s, vec&& args, SRef sortRef = SRef_Undef, SymbolMatcher symbolMatcher = SymbolMatcher::Any); bool storeDefinedFun(std::string const & fname, const vec& args, SRef ret_sort, const PTRef tr); virtual void exit(); - void getInterpolants(TermNode const & n); void interp(CommandNode const * n); void interp(SetLogic const & n); void interp(SetInfo const & n); @@ -194,7 +186,8 @@ class Interpret { bool addLetFrame(std::vector const & names, vec const& args, LetRecords& letRecords); PTRef letNameResolve(const char* s, const LetRecords& letRecords) const; - PTRef resolveQualifiedIdentifier(const char * name, SortNode const & sort, bool isQuoted); + PTRef resolveQualifiedIdentifier(std::string const & name, SortNode const & sort, bool isQuoted); + SRef sortFromSortNode(SortNode const & node) const; virtual std::unique_ptr createMainSolver(std::string const & logic_name); @@ -211,9 +204,6 @@ class Interpret { bool gotExit() const { return f_exit; } - ValPair getValue (PTRef tr) const; - bool getAssignment (); - void reportError(char const * msg) { notify_formatted(true, msg); } PTRef getParsedFormula(); diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc index 5c4567b9f..32e179bf3 100644 --- a/src/bin/opensmt.cc +++ b/src/bin/opensmt.cc @@ -93,19 +93,17 @@ int main( int argc, char * argv[] ) break; case 'd': const char* msg; - c.setOption(SMTConfig::o_dryrun, SMTOption(true), msg); + c.setOption(SMTConfig::o_dryrun, SMTOption(true)); break; case 'r': - if (!c.setOption(SMTConfig::o_random_seed, SMTOption(atoi(optarg)), msg)) - fprintf(stderr, "Error setting random seed: %s\n", msg); - else - fprintf(stderr, "; Using random seed %d\n", atoi(optarg)); + c.setOption(SMTConfig::o_random_seed, SMTOption(atoi(optarg))); + fprintf(stderr, "; Using random seed %d\n", atoi(optarg)); break; case 'i': - c.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + c.setOption(SMTConfig::o_produce_inter, SMTOption(true)); break; case 'v': - c.setOption(SMTConfig::o_verbosity, SMTOption(true), msg); + c.setOption(SMTConfig::o_verbosity, SMTOption(true)); break; case 'p': pipe = true; diff --git a/src/options/SMTConfig.cc b/src/options/SMTConfig.cc index ac772e39f..f5d04af8d 100644 --- a/src/options/SMTConfig.cc +++ b/src/options/SMTConfig.cc @@ -33,22 +33,20 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. //--------------------------------------------------------------------------------- // SMTConfig -bool SMTConfig::setOption(std::string const & name, const SMTOption& value, const char*& msg) { - msg = "ok"; +void SMTConfig::setOption(std::string const & name, const SMTOption& value) { if (usedForInitialization && isPreInitializationOption(name)) { - msg = "Option cannot be changed at this point"; - return false; + throw OsmtApiException("Option cannot be changed at this point"); } // Special options: // stats_out if (name == o_stats_out) { - if (value.getValue().type != ConstType::string) { msg = s_err_not_str; return false; } + if (value.type != ConstType::string) { throw OsmtApiException(s_err_not_str); } if (optionTable.find(name) == optionTable.end()) - stats_out.open(value.getValue().getStringVal(), std::ios_base::out); - else if (optionTable[name].getValue().getStringVal() != value.getValue().getStringVal()) { + stats_out.open(value.getStringVal(), std::ios_base::out); + else if (optionTable[name].getStringVal() != value.getStringVal()) { if (stats_out.is_open()) { stats_out.close(); - stats_out.open(value.getValue().getStringVal(), std::ios_base::out); + stats_out.open(value.getStringVal(), std::ios_base::out); } } else {} @@ -56,23 +54,23 @@ bool SMTConfig::setOption(std::string const & name, const SMTOption& value, cons // produce stats if (name == o_produce_stats) { - if (value.getValue().type != ConstType::boolean) { + if (value.type != ConstType::boolean) { throw OsmtApiException(s_err_not_bool); - } else if (value.getValue().getBoolVal()) { + } else if (value.getBoolVal()) { // Gets set to true if (optionTable.find(o_stats_out) == optionTable.end()) { - if (optionTable.find(o_produce_stats) == optionTable.end() || not optionTable[o_produce_stats].getValue().getBoolVal()) { + if (optionTable.find(o_produce_stats) == optionTable.end() || not optionTable[o_produce_stats].getBoolVal()) { // Insert the default value insertOption(o_stats_out, SMTOption("/dev/stdout")); - } else if (optionTable.find(o_produce_stats) != optionTable.end() and optionTable[o_produce_stats].getValue().getBoolVal()) { + } else if (optionTable.find(o_produce_stats) != optionTable.end() and optionTable[o_produce_stats].getBoolVal()) { assert(false); } } else { } // No action required - if (!stats_out.is_open()) stats_out.open(optionTable[o_stats_out].getValue().getStringVal(), std::ios_base::out); + if (!stats_out.is_open()) stats_out.open(optionTable[o_stats_out].getStringVal(), std::ios_base::out); } - else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats].getValue().getBoolVal()) { + else if (optionTable.find(o_produce_stats) != optionTable.end() && optionTable[o_produce_stats].getBoolVal()) { // gets set to false and was previously true if (optionTable.find(o_stats_out) != optionTable.end()) { stats_out.close(); @@ -81,23 +79,23 @@ bool SMTConfig::setOption(std::string const & name, const SMTOption& value, cons } if (name == o_random_seed) { - if (value.getValue().type != ConstType::numeral) { + if (value.type != ConstType::numeral) { throw OsmtApiException(s_err_not_num); } - uint32_t seed = value.getValue().getUint32Val(); + uint32_t seed = value.getUint32Val(); if (seed == 0) { throw OsmtApiException(s_err_seed_zero); } } if (name == o_sat_split_type) { - if (value.getValue().type != ConstType::string) { throw OsmtApiException(s_err_not_str); } - std::string val = value.getValue().getStringVal(); + if (value.type != ConstType::string) { throw OsmtApiException(s_err_not_str); } + std::string val = value.getStringVal(); if (val != spts_lookahead && val != spts_scatter && val != spts_none) { throw OsmtApiException(s_err_unknown_split); } } if (name == o_sat_split_units) { - if (value.getValue().type != ConstType::string) { throw OsmtApiException(s_err_not_str); } - std::string val = value.getValue().getStringVal(); + if (value.type != ConstType::string) { throw OsmtApiException(s_err_not_str); } + std::string val = value.getStringVal(); if (val != spts_time && val != spts_search_counter) { throw OsmtApiException(s_err_unknown_units); } @@ -107,7 +105,6 @@ bool SMTConfig::setOption(std::string const & name, const SMTOption& value, cons optionTable.erase(itr); } insertOption(name, SMTOption(value)); - return true; } const SMTOption& SMTConfig::getOption(std::string const & name) const { @@ -118,14 +115,14 @@ const SMTOption& SMTConfig::getOption(std::string const & name) const { return option_Empty; } -bool SMTConfig::setInfo(std::string && name_, SMTOption::ConfValue && value) { +bool SMTConfig::setInfo(std::string && name_, SMTOption && value) { if (infoTable.find(name_) != infoTable.end()) infoTable.erase(infoTable.find(name_)); infoTable.insert({name_, value}); return true; } -SMTOption::ConfValue SMTConfig::getInfo(std::string const & name) const { +SMTOption SMTConfig::getInfo(std::string const & name) const { if (infoTable.find(name) != infoTable.end()) return infoTable.at(name); else diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index a6178a568..4305508e8 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -33,6 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "smt2tokens.h" #include "OsmtApiException.h" #include "OsmtInternalException.h" +#include "ParseNodePrinter.h" #include #include @@ -41,7 +42,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include -#include enum class ASTType { CMD_T , CMDL_T @@ -87,139 +87,107 @@ enum class ASTType { class SMTOption { - static std::string sexprToString(SExpr * root) { - struct QEl { SExpr * sexpr; int count; }; - std::vector childStrings; - std::vector stack; - stack.push_back({root, 0}); - while (not stack.empty()) { - auto & [sexpr, count] = stack.back(); - if (auto vec_p = std::get_if>>(&(*sexpr).data)) { - assert(*vec_p); - auto & vec = **vec_p; - if (vec.size() < count) { - stack.push_back({ vec[count], 0 }); - ++count; - continue; - } - // Vector, all children processed - assert(not childStrings.empty()); - auto childStringStart = childStrings.end() - vec.size(); - auto myString = std::accumulate(childStringStart, childStrings.end(), std::string(), - [](const std::string & a, const std::string & b) { - return a + b; - }); - childStrings.erase(childStringStart, childStrings.end()); - childStrings.emplace_back(std::move(myString)); - } else if (auto constNode = std::get_if>(&(*sexpr).data)) { - assert(*constNode); - childStrings.push_back(*(**constNode).value); - } else if (auto symbolNode = std::get_if>(&(*sexpr).data)) { - assert(*symbolNode); - childStrings.push_back((**symbolNode).getString()); - } else if (auto string = std::get_if>(&(*sexpr).data)) { - assert(*string); - childStrings.push_back(**string); - } - stack.pop_back(); + +public: + ConstType type = ConstType::empty; + std::variant value = 0; + + std::string toString() const { + if (auto val = std::get_if(&value)) { + return *val; + } else if (auto val = std::get_if(&value)) { + return std::to_string(*val); + } else if (auto val = std::get_if(&value)) { + return std::to_string(*val); + } else if (auto val = std::get_if(&value)) { + return std::to_string(*val); + } else if (auto val = std::get_if(&value)) { + return *val ? "true" : "false"; } - assert(childStrings.size() == 1); - return childStrings[0]; + assert(false); + return {}; } -public: - struct ConfValue { - ConstType type = ConstType::empty; - std::variant value = 0; - ConfValue() = default; - ConfValue(int i) : type(ConstType::numeral), value(i) {} - ConfValue(double i) : type(ConstType::decimal), value(i) {} - ConfValue(std::string && s) : type(ConstType::string), value(std::move(s)) {} - std::string getStringVal() const { - if (type == ConstType::string) { - auto val = std::get_if(&value); - assert(val); - return *val; - } - else { - throw OsmtApiException("Attempt to get string value of a non-string type"); - } + std::string getStringVal() const { + if (type == ConstType::string) { + auto val = std::get_if(&value); + assert(val); + return *val; } - double getDoubleVal() const { - if (type == ConstType::numeral) { - if (auto val = std::get_if(&value)) { - return static_cast(*val); - } else if (auto val = std::get_if(&value)) { - return static_cast(*val); - } else { - throw OsmtInternalException("Inconsistent value for option"); - } - } else if (type == ConstType::decimal) { - auto val = std::get_if(&value); - assert(val); - return *val; - } else { - throw OsmtApiException("Attempted to obtain double value for non-numeric type"); - } + else { + throw OsmtApiException("Attempt to get string value of a non-string type"); } - int getIntVal() const { - if (type == ConstType::numeral) { - auto val = std::get_if(&value); - assert(val); - return *val; + } + double getDoubleVal() const { + if (type == ConstType::numeral) { + if (auto val = std::get_if(&value)) { + return static_cast(*val); + } else if (auto val = std::get_if(&value)) { + return static_cast(*val); } else { - throw OsmtApiException("Attempted to obtain int value for non-int type"); + throw OsmtInternalException("Inconsistent value for option"); } + } else if (type == ConstType::decimal) { + auto val = std::get_if(&value); + assert(val); + return *val; + } else { + throw OsmtApiException("Attempted to obtain double value for non-numeric type"); } - uint32_t getUint32Val() const { - if (type == ConstType::uint32) { - auto val = std::get_if(&value); - assert(val); - return *val; - } else { - throw OsmtApiException("Attempted to obtain uint32 value for non-uint32 type"); - } + } + int getIntVal() const { + if (type == ConstType::numeral) { + auto val = std::get_if(&value); + assert(val); + return *val; + } else { + throw OsmtApiException("Attempted to obtain int value for non-int type"); } - bool getBoolVal() const { - if (type == ConstType::boolean) { - auto val = std::get_if(&value); - assert(val); - return *val; - } - else { - throw OsmtApiException("Attempt to obtain boolean value for non-boolean type"); - } + } + uint32_t getUint32Val() const { + if (type == ConstType::uint32) { + auto val = std::get_if(&value); + assert(val); + return *val; + } else { + throw OsmtApiException("Attempted to obtain uint32 value for non-uint32 type"); } - }; - - SMTOption(); + } + bool getBoolVal() const { + if (type == ConstType::boolean) { + auto val = std::get_if(&value); + assert(val); + return *val; + } + else { + throw OsmtApiException("Attempt to obtain boolean value for non-boolean type"); + } + } + SMTOption() = default; + SMTOption(int i) : type(ConstType::numeral), value(i) {} + SMTOption(uint32_t i) : type(ConstType::uint32), value(i) {} + SMTOption(double i) : type(ConstType::decimal), value(i) {} + SMTOption(std::string && s) : type(ConstType::string), value(std::move(s)) {} SMTOption(AttributeValueNode const & n) { if (auto specConst_p = std::get_if>(&n.value)) { auto const & specConst = (**specConst_p); - value.type = specConst.type; - value.value = *specConst.value; + type = specConst.type; + value = *specConst.value; } else if (auto symbol_p = std::get_if>(&n.value)) { auto const & symbol = (**symbol_p); - value.type = symbol.getType(); - value.value = symbol.getString(); + type = symbol.getType(); + value = opensmt::nodeToString()(symbol); } else if (auto sexprVec_p = std::get_if>>(&n.value)) { assert(sexprVec_p); - value.type = ConstType::sexpr; + type = ConstType::sexpr; auto const & sexprVec = **sexprVec_p; std::string s; for (SExpr * sexpr_p : sexprVec) { - s += "(" + sexprToString(sexpr_p)+ ")"; + s += "(" + opensmt::nodeToString()(sexpr_p) + ")"; } - value.value = s; + value = s; } } - SMTOption(int i) : value(i) {} - SMTOption(double i): value(i) {} - SMTOption(std::string && s) : value(std::move(s)) {} - inline bool isEmpty() const { return value.type == ConstType::empty; } -// inline std::string toString() const { return value.toString(); } - inline const ConfValue& getValue() const { return value; } - private: - ConfValue value; + inline bool isEmpty() const { return type == ConstType::empty; } }; // Type safe wrapper for split types @@ -385,7 +353,7 @@ struct SMTConfig SMTOption option_Empty; std::vector option_names; - std::unordered_map infoTable; + std::unordered_map infoTable; std::unordered_map optionTable; bool usedForInitialization = false; // Some options can be changed only before this config is used for initialization of MainSolver @@ -423,11 +391,11 @@ struct SMTConfig initializeConfig( ); } - bool setOption(std::string const & name, const SMTOption& value, const char*& msg); + void setOption(std::string const & name, SMTOption const & value); const SMTOption& getOption(std::string const & name) const; - bool setInfo (std::string && name, SMTOption::ConfValue && value); - SMTOption::ConfValue getInfo (std::string const & name) const; + bool setInfo(std::string && name, SMTOption && value); + SMTOption getInfo(std::string const & name) const; void initializeConfig ( ); @@ -436,18 +404,18 @@ struct SMTConfig void printHelp ( ); void printConfig ( std::ostream & out ); - inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getValue().getUint32Val(): 91648253; } + inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getUint32Val(): 91648253; } inline void setProduceModels( ) { insertOption(o_produce_models, SMTOption(1)); } inline bool setRandomSeed(int seed) { insertOption(o_random_seed, SMTOption(seed)); return true; } void setUsedForInitiliazation() { usedForInitialization = true; } inline bool produceProof( ) { - return optionTable.find(o_produce_proofs) != optionTable.end() ? optionTable[o_produce_proofs].getValue().getBoolVal() : false; + return optionTable.find(o_produce_proofs) != optionTable.end() ? optionTable[o_produce_proofs].getBoolVal() : false; } void setTimeQueries() { insertOption(o_time_queries, SMTOption(1)); } - bool timeQueries() { return optionTable.find(o_time_queries) != optionTable.end() ? optionTable[o_time_queries].getValue().getBoolVal() : false; } + bool timeQueries() { return optionTable.find(o_time_queries) != optionTable.end() ? optionTable[o_time_queries].getBoolVal() : false; } // Set reduction params inline void setReduction(int r) { insertOption(o_proof_reduce, SMTOption(r)); } @@ -469,185 +437,185 @@ struct SMTConfig // Get interpolation algorithms inline ItpAlgorithm getBooleanInterpolationAlgorithm() const { - return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getValue().getUint32Val()) + return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getUint32Val()) : ItpAlgorithm::itp_alg_mcmillan; } inline ItpAlgorithm getEUFInterpolationAlgorithm() const { - return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getValue().getUint32Val()) + return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getUint32Val()) : ItpAlgorithm::itp_euf_alg_strong; } inline ItpAlgorithm getLRAInterpolationAlgorithm() const { - return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getValue().getUint32Val()) + return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getUint32Val()) : ItpAlgorithm::itp_lra_alg_strong; } inline std::string getLRAStrengthFactor() const { return optionTable.find(o_itp_lra_factor) != optionTable.end() ? optionTable.at( - o_itp_lra_factor).getValue().getStringVal() : itp_lra_factor_0; + o_itp_lra_factor).getStringVal() : itp_lra_factor_0; } inline std::string getInstanceName() const { - return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name).getValue().getStringVal() : "unknown"; + return optionTable.find(o_inst_name) != optionTable.end() ? optionTable.at(o_inst_name).getStringVal() : "unknown"; } lbool status; // Status of the benchmark // int incremental; // Incremental solving bool isIncremental() const { return optionTable.find(o_incremental) != optionTable.end() ? - optionTable.at(o_incremental).getValue().getBoolVal() : true; + optionTable.at(o_incremental).getBoolVal() : true; } bool produce_models() const { return optionTable.find(o_produce_models) != optionTable.end() ? - optionTable.at(o_produce_models).getValue().getBoolVal() : true; + optionTable.at(o_produce_models).getBoolVal() : true; } bool produceStats() const { return optionTable.find(o_produce_stats) != optionTable.end() && - optionTable.at(o_produce_stats).getValue().getBoolVal(); } + optionTable.at(o_produce_stats).getBoolVal(); } std::string getStatsOut() const { - return optionTable.find(o_stats_out) != optionTable.end() ? optionTable.at(o_stats_out).getValue().getStringVal() : "/dev/stdout"; + return optionTable.find(o_stats_out) != optionTable.end() ? optionTable.at(o_stats_out).getStringVal() : "/dev/stdout"; } int sat_grow() const { return optionTable.find(o_grow) != optionTable.end() ? - optionTable.at(o_grow).getValue().getBoolVal() : 0; } + optionTable.at(o_grow).getBoolVal() : 0; } int sat_clause_lim() const { return optionTable.find(o_clause_lim) != optionTable.end() ? - optionTable.at(o_clause_lim).getValue().getUint32Val() : 20; } + optionTable.at(o_clause_lim).getUint32Val() : 20; } int sat_subsumption_lim() const { return optionTable.find(o_subsumption_lim) != optionTable.end() ? - optionTable.at(o_subsumption_lim).getValue().getUint32Val() : 1000; } + optionTable.at(o_subsumption_lim).getUint32Val() : 1000; } double sat_simp_garbage_frac() const { return optionTable.find(o_simp_garbage_frac) != optionTable.end() ? - optionTable.at(o_simp_garbage_frac).getValue().getDoubleVal() : 0.5; } + optionTable.at(o_simp_garbage_frac).getDoubleVal() : 0.5; } int sat_use_asymm() const { return optionTable.find(o_use_asymm) != optionTable.end() ? - optionTable.at(o_use_asymm).getValue().getBoolVal() : false; } + optionTable.at(o_use_asymm).getBoolVal() : false; } int sat_use_rcheck() const { return optionTable.find(o_use_rcheck) != optionTable.end() ? - optionTable.at(o_use_rcheck).getValue().getBoolVal() : false; + optionTable.at(o_use_rcheck).getBoolVal() : false; } int sat_use_elim() const { return optionTable.find(o_use_elim) != optionTable.end() ? - optionTable.at(o_use_elim).getValue().getBoolVal() : true; + optionTable.at(o_use_elim).getBoolVal() : true; } double sat_var_decay() const { return optionTable.find(o_var_decay) != optionTable.end() ? - optionTable.at(o_var_decay).getValue().getDoubleVal() : 1 / 0.95; } + optionTable.at(o_var_decay).getDoubleVal() : 1 / 0.95; } double sat_clause_decay() const { return optionTable.find(o_clause_decay) != optionTable.end() ? - optionTable.at(o_clause_decay).getValue().getDoubleVal() : 1 / 0.999; } + optionTable.at(o_clause_decay).getDoubleVal() : 1 / 0.999; } double sat_random_var_freq() const { return optionTable.find(o_random_var_freq) != optionTable.end() ? - optionTable.at(o_random_var_freq).getValue().getDoubleVal() : 0.02; } + optionTable.at(o_random_var_freq).getDoubleVal() : 0.02; } uint32_t sat_random_seed() const { return optionTable.find(o_random_seed) != optionTable.end() ? - optionTable.at(o_random_seed).getValue().getUint32Val() : 91648253; } + optionTable.at(o_random_seed).getUint32Val() : 91648253; } bool sat_luby_restart() const { return optionTable.find(o_luby_restart) != optionTable.end() ? - optionTable.at(o_luby_restart).getValue().getBoolVal() : true; + optionTable.at(o_luby_restart).getBoolVal() : true; } uint32_t sat_ccmin_mode() const { return optionTable.find(o_ccmin_mode) != optionTable.end() ? - optionTable.at(o_ccmin_mode).getValue().getUint32Val() : 2; + optionTable.at(o_ccmin_mode).getUint32Val() : 2; } bool sat_rnd_pol() const { return optionTable.find(o_rnd_pol) != optionTable.end() ? - optionTable.at(o_rnd_pol).getValue().getBoolVal() : false; + optionTable.at(o_rnd_pol).getBoolVal() : false; } bool sat_rnd_init_act() const { return optionTable.find(o_rnd_init_act) != optionTable.end() ? - optionTable.at(o_rnd_init_act).getValue().getBoolVal() : false; } + optionTable.at(o_rnd_init_act).getBoolVal() : false; } double sat_garbage_frac() const { return optionTable.find(o_garbage_frac) != optionTable.end() ? - optionTable.at(o_garbage_frac).getValue().getDoubleVal() : 0.20; + optionTable.at(o_garbage_frac).getDoubleVal() : 0.20; } uint32_t sat_restart_first() const { return optionTable.find(o_restart_first) != optionTable.end() ? - optionTable.at(o_restart_first).getValue().getUint32Val() : 100; } + optionTable.at(o_restart_first).getUint32Val() : 100; } double sat_restart_inc() const { return optionTable.find(o_restart_inc) != optionTable.end() ? - optionTable.at(o_restart_inc).getValue().getDoubleVal() : 1.1; + optionTable.at(o_restart_inc).getDoubleVal() : 1.1; } int proof_interpolant_cnf() const { return optionTable.find(o_interpolant_cnf) != optionTable.end() ? - optionTable.at(o_interpolant_cnf).getValue().getBoolVal() : false; + optionTable.at(o_interpolant_cnf).getBoolVal() : false; } int certify_inter() const { return optionTable.find(o_certify_inter) != optionTable.end() ? - optionTable.at(o_certify_inter).getValue().getBoolVal(): false; + optionTable.at(o_certify_inter).getBoolVal(): false; } bool produce_inter() const { return optionTable.find(o_produce_inter) != optionTable.end() ? - optionTable.at(o_produce_inter).getValue().getBoolVal() : false; + optionTable.at(o_produce_inter).getBoolVal() : false; } uint32_t simplify_inter() const { return optionTable.find(o_simplify_inter) != optionTable.end() ? - optionTable.at(o_simplify_inter).getValue().getUint32Val() : false; + optionTable.at(o_simplify_inter).getUint32Val() : false; } bool proof_struct_hash() const { return optionTable.find(o_proof_struct_hash) != optionTable.end() ? - optionTable.at(o_proof_struct_hash).getValue().getBoolVal() : true; + optionTable.at(o_proof_struct_hash).getBoolVal() : true; } uint32_t proof_num_graph_traversals() const { return optionTable.find(o_proof_num_graph_traversals) != optionTable.end() ? - optionTable.at(o_proof_num_graph_traversals).getValue().getUint32Val() : 3; } + optionTable.at(o_proof_num_graph_traversals).getUint32Val() : 3; } uint32_t proof_red_trans() const { return optionTable.find(o_proof_red_trans) != optionTable.end() ? - optionTable.at(o_proof_red_trans).getValue().getUint32Val() : 2; + optionTable.at(o_proof_red_trans).getUint32Val() : 2; } bool proof_rec_piv() const { return optionTable.find(o_proof_rec_piv) != optionTable.end() ? - optionTable.at(o_proof_rec_piv).getValue().getBoolVal() : true; + optionTable.at(o_proof_rec_piv).getBoolVal() : true; } bool proof_push_units() const { return optionTable.find(o_proof_push_units) != optionTable.end() ? - optionTable.at(o_proof_push_units).getValue().getBoolVal() : true; + optionTable.at(o_proof_push_units).getBoolVal() : true; } bool proof_transf_trav() const { return optionTable.find(o_proof_transf_trav) != optionTable.end() ? - optionTable.at(o_proof_transf_trav).getValue().getBoolVal() : true; + optionTable.at(o_proof_transf_trav).getBoolVal() : true; } bool proof_check() const { return optionTable.find(o_proof_check) != optionTable.end() ? - optionTable.at(o_proof_check).getValue().getBoolVal() : true; + optionTable.at(o_proof_check).getBoolVal() : true; } bool proof_multiple_inter() const { return optionTable.find(o_proof_multiple_inter) != optionTable.end() ? - optionTable.at(o_proof_multiple_inter).getValue().getBoolVal() : true; + optionTable.at(o_proof_multiple_inter).getBoolVal() : true; } bool proof_alternative_inter() const { return optionTable.find(o_proof_alternative_inter) != optionTable.end() ? - optionTable.at(o_proof_alternative_inter).getValue().getBoolVal() : false; + optionTable.at(o_proof_alternative_inter).getBoolVal() : false; } bool proof_reduce() const { return optionTable.find(o_proof_reduce) != optionTable.end() ? - optionTable.at(o_proof_reduce).getValue().getBoolVal() : false; + optionTable.at(o_proof_reduce).getBoolVal() : false; } uint32_t itp_bool_alg() const { return optionTable.find(o_itp_bool_alg) != optionTable.end() ? - optionTable.at(o_itp_bool_alg).getValue().getUint32Val() : 0; + optionTable.at(o_itp_bool_alg).getUint32Val() : 0; } uint32_t itp_euf_alg() const { return optionTable.find(o_itp_euf_alg) != optionTable.end() ? - optionTable.at(o_itp_euf_alg).getValue().getUint32Val() : 0; + optionTable.at(o_itp_euf_alg).getUint32Val() : 0; } uint32_t itp_lra_alg() const { return optionTable.find(o_itp_lra_alg) != optionTable.end() ? - optionTable.at(o_itp_lra_alg).getValue().getUint32Val() : 0; } + optionTable.at(o_itp_lra_alg).getUint32Val() : 0; } uint32_t sat_dump_rnd_inter() const { return optionTable.find(o_sat_dump_rnd_inter) != optionTable.end() ? - optionTable.at(o_sat_dump_rnd_inter).getValue().getUint32Val() : 2; } + optionTable.at(o_sat_dump_rnd_inter).getUint32Val() : 2; } bool declarations_are_global() const { return optionTable.find(o_global_declarations) != optionTable.end() ? - optionTable.at(o_global_declarations).getValue().getBoolVal() : false; + optionTable.at(o_global_declarations).getBoolVal() : false; } SpUnit sat_resource_units() const { if (optionTable.find(o_sat_resource_units) != optionTable.end()) { - std::string type = optionTable.at(o_sat_resource_units).getValue().getStringVal(); + std::string type = optionTable.at(o_sat_resource_units).getStringVal(); if (type == spts_search_counter) { return SpUnit::search_counter; } else if (type == spts_time) { @@ -659,29 +627,29 @@ struct SMTConfig bool respect_logic_partitioning_hints() const { return optionTable.find(o_respect_logic_partitioning_hints) != optionTable.end() ? - optionTable.at(o_respect_logic_partitioning_hints).getValue().getBoolVal() : false; + optionTable.at(o_respect_logic_partitioning_hints).getBoolVal() : false; } double sat_resource_limit() const { return optionTable.find(o_sat_resource_limit) != optionTable.end() ? - optionTable.at(o_sat_resource_limit).getValue().getDoubleVal() : -1; + optionTable.at(o_sat_resource_limit).getDoubleVal() : -1; } std::string dump_state() const { if (optionTable.find(o_dump_state) != optionTable.end()) { - return append_output_dir(optionTable.at(o_dump_state).getValue().getStringVal()); + return append_output_dir(optionTable.at(o_dump_state).getStringVal()); } else { std::string name = getInstanceName(); return name.substr(0, name.size() - strlen(".smt2")); } } std::string output_dir() const { - return optionTable.find(o_output_dir) != optionTable.end() ? optionTable.at(o_output_dir).getValue().getStringVal() : ""; + return optionTable.find(o_output_dir) != optionTable.end() ? optionTable.at(o_output_dir).getStringVal() : ""; } bool dump_only() const { - return optionTable.find(o_dump_only) != optionTable.end() ? optionTable.at(o_dump_only).getValue().getBoolVal(): false; + return optionTable.find(o_dump_only) != optionTable.end() ? optionTable.at(o_dump_only).getBoolVal(): false; } bool dump_query() const { - return optionTable.find(o_dump_query) != optionTable.end() ? optionTable.at(o_dump_query).getValue().getBoolVal() : false; + return optionTable.find(o_dump_query) != optionTable.end() ? optionTable.at(o_dump_query).getBoolVal() : false; } void set_dump_query_name(std::string && dump_query_name) { @@ -695,16 +663,16 @@ struct SMTConfig std::string dump_query_name() const { return optionTable.find(o_dump_query_name) != optionTable.end() ? - append_output_dir(optionTable.at(o_dump_query_name).getValue().getStringVal()) : ""; + append_output_dir(optionTable.at(o_dump_query_name).getStringVal()) : ""; } bool sat_dump_learnts() const { return optionTable.find(o_sat_dump_learnts) != optionTable.end() ? - optionTable.at(o_sat_dump_learnts).getValue().getBoolVal() : false; } + optionTable.at(o_sat_dump_learnts).getBoolVal() : false; } bool sat_split_test_cube_and_conquer() const { return optionTable.find(o_sat_split_test_cube_and_conquer) != optionTable.end() ? - optionTable.at(o_sat_split_test_cube_and_conquer).getValue().getBoolVal() : false; + optionTable.at(o_sat_split_test_cube_and_conquer).getBoolVal() : false; } SpType sat_split_type() const { @@ -719,7 +687,7 @@ struct SMTConfig SpUnit sat_split_units() const { if (optionTable.find(o_sat_split_units) != optionTable.end()) { - std::string type = optionTable.at(o_sat_split_units).getValue().getStringVal(); + std::string type = optionTable.at(o_sat_split_units).getStringVal(); if (type == spts_search_counter) { return SpUnit::search_counter; } else if (type == spts_time) { @@ -731,74 +699,74 @@ struct SMTConfig double sat_split_inittune() const { return optionTable.find(o_sat_split_inittune) != optionTable.end() ? - optionTable.at(o_sat_split_inittune).getValue().getDoubleVal() : + optionTable.at(o_sat_split_inittune).getDoubleVal() : -1; } double sat_split_midtune() const { return optionTable.find(o_sat_split_midtune) != optionTable.end() ? - optionTable.at(o_sat_split_midtune).getValue().getDoubleVal() : + optionTable.at(o_sat_split_midtune).getDoubleVal() : -1; } uint32_t sat_split_num() const { return optionTable.find(o_sat_split_num) != optionTable.end() ? - optionTable.at(o_sat_split_num).getValue().getUint32Val() : + optionTable.at(o_sat_split_num).getUint32Val() : 2; } int sat_split_fixvars() const { return optionTable.find(o_sat_split_fix_vars) != optionTable.end() ? - optionTable.at(o_sat_split_fix_vars).getValue().getIntVal() : + optionTable.at(o_sat_split_fix_vars).getIntVal() : -1; } bool sat_split_asap() const { return optionTable.find(o_sat_split_asap) != optionTable.end() ? - optionTable.at(o_sat_split_asap).getValue().getBoolVal(): + optionTable.at(o_sat_split_asap).getBoolVal(): false; } bool sat_lookahead_split() const { return optionTable.find(o_sat_lookahead_split) != optionTable.end() ? - optionTable.at(o_sat_lookahead_split).getValue().getBoolVal(): + optionTable.at(o_sat_lookahead_split).getBoolVal(): false; } bool sat_scatter_split() const { return optionTable.find(o_sat_scatter_split) != optionTable.end() ? - optionTable.at(o_sat_scatter_split).getValue().getBoolVal() : + optionTable.at(o_sat_scatter_split).getBoolVal() : false; } bool sat_pure_lookahead() const { return optionTable.find(o_sat_pure_lookahead) != optionTable.end() ? - optionTable.at(o_sat_pure_lookahead).getValue().getBoolVal() : + optionTable.at(o_sat_pure_lookahead).getBoolVal() : false; } bool lookahead_score_deep() const { return optionTable.find(o_lookahead_score_deep) != optionTable.end() ? - optionTable.at(o_lookahead_score_deep).getValue().getBoolVal() : + optionTable.at(o_lookahead_score_deep).getBoolVal() : false; } bool randomize_lookahead() const { return optionTable.find(o_sat_split_randomize_lookahead) != optionTable.end() ? - optionTable.at(o_sat_split_randomize_lookahead).getValue().getBoolVal() : + optionTable.at(o_sat_split_randomize_lookahead).getBoolVal() : false; } uint32_t randomize_lookahead_bufsz() const { return optionTable.find(o_sat_split_randomize_lookahead_buf) != optionTable.end() ? - optionTable.at(o_sat_split_randomize_lookahead_buf).getValue().getUint32Val() : + optionTable.at(o_sat_split_randomize_lookahead_buf).getUint32Val() : true; } bool remove_symmetries() const { return optionTable.find(o_sat_remove_symmetries) != optionTable.end() ? - optionTable.at(o_sat_remove_symmetries).getValue().getBoolVal() : false; } + optionTable.at(o_sat_remove_symmetries).getBoolVal() : false; } bool dryrun() const { return optionTable.find(o_dryrun) != optionTable.end() ? - optionTable.at(o_dryrun).getValue().getBoolVal() : false; } + optionTable.at(o_dryrun).getBoolVal() : false; } void set_dryrun(bool b) { insertOption(o_dryrun, SMTOption(b)); } SpPref sat_split_preference() const { if (optionTable.find(o_sat_split_preference) != optionTable.end()) { - std::string type = optionTable.at(o_sat_split_preference).getValue().getStringVal(); + std::string type = optionTable.at(o_sat_split_preference).getStringVal(); if (type == spprefs_tterm) return sppref_tterm; if (type == spprefs_blind) return sppref_blind; if (type == spprefs_bterm) return sppref_bterm; @@ -812,24 +780,24 @@ struct SMTConfig bool use_ghost_vars() const { return optionTable.find(o_ghost_vars) != optionTable.end() ? - optionTable.at(o_ghost_vars).getValue().getBoolVal() : + optionTable.at(o_ghost_vars).getBoolVal() : false; } bool do_substitutions() const { return optionTable.find(o_do_substitutions) != optionTable.end()? - optionTable.at(o_do_substitutions).getValue().getBoolVal() : true; } + optionTable.at(o_do_substitutions).getBoolVal() : true; } bool use_theory_polarity_suggestion() const { return sat_theory_polarity_suggestion != 0; } uint32_t sat_solver_limit() const { return optionTable.find(o_sat_solver_limit) != optionTable.end() ? - optionTable.at(o_sat_solver_limit).getValue().getUint32Val() : 0; } + optionTable.at(o_sat_solver_limit).getUint32Val() : 0; } bool sat_split_mode() const { return optionTable.find(o_sat_split_mode) != optionTable.end() ? - optionTable.at(o_sat_split_mode).getValue().getBoolVal() : + optionTable.at(o_sat_split_mode).getBoolVal() : false; } @@ -842,11 +810,11 @@ struct SMTConfig int dump_formula; // Dump input formula bool verbosity() const { // Verbosity level return optionTable.find(o_verbosity) != optionTable.end() ? - optionTable.at(o_verbosity).getValue().getBoolVal() : false; + optionTable.at(o_verbosity).getBoolVal() : false; } bool printSuccess() const { return optionTable.find(":print-success") != optionTable.end() ? - optionTable.at(":print-success").getValue().getBoolVal() : false; + optionTable.at(":print-success").getBoolVal() : false; } int certification_level; // Level of certification char certifying_solver[256]; // Executable used for certification @@ -918,7 +886,7 @@ struct SMTConfig void setSimplifyInterpolant(int val) { const char* msg; - setOption(o_simplify_inter, SMTOption(val), msg); + setOption(o_simplify_inter, SMTOption(val)); } int getSimplifyInterpolant() const { diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index edb73a282..d919bd955 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -55,15 +55,7 @@ struct SpecConstNode : public GeneralNode { struct SymbolNode : public GeneralNode { std::variant,std::unique_ptr> name; - std::string getString() const { - if (auto str = std::get_if>(&name)) { - return {**str}; - } else if (auto specConstNode = std::get_if>(&name)) { - return {*(**specConstNode).value}; - } - assert(false); - return {}; - } + ConstType getType() const { if (std::get_if>(&name)) { return ConstType::string; @@ -107,6 +99,7 @@ struct SExpr : public GeneralNode { }; struct AttributeValueNode : public GeneralNode { + // Todo: Why do we need SpecConstNode if we have SymbolNode that can also be SpecConstNode? std::variant, std::unique_ptr, std::unique_ptr>> value; AttributeValueNode(std::unique_ptr && node) : value(std::move(node)) {} AttributeValueNode(std::unique_ptr && node) : value(std::move(node)) {} @@ -134,21 +127,27 @@ struct IdentifierNode : public GeneralNode { class OptionNode : public GeneralNode { public: - virtual ~OptionNode() = default; -}; - -struct PrintSuccess : public OptionNode { bool value; PrintSuccess(bool value) : value(value) {} }; -struct ExpandDefinitions : public OptionNode { bool value; ExpandDefinitions(bool value) : value(value) {} }; -struct InteractiveMode : public OptionNode { bool value; InteractiveMode(bool value) : value(value) {} }; -struct ProduceProofs : public OptionNode { bool value; ProduceProofs(bool value) : value(value) {} }; -struct ProduceUnsatCores : public OptionNode { bool value; ProduceUnsatCores(bool value) : value(value) {} }; -struct ProduceModels : public OptionNode { bool value; ProduceModels(bool value) : value(value) {} }; -struct ProduceAssignments : public OptionNode { bool value; ProduceAssignments(bool value): value(value) {} }; -struct RegularOutputChannel : public OptionNode { std::unique_ptr value; RegularOutputChannel(std::unique_ptr && value) : value(std::move(value)) {} }; -struct DiagnosticOutputChannel : public OptionNode { std::unique_ptr value; DiagnosticOutputChannel(std::unique_ptr && value) : value(std::move(value)) {} }; -struct RandomSeed : public OptionNode { int value; RandomSeed(int value) : value(value) {} }; -struct Verbosity : public OptionNode { int value; Verbosity(int value) : value(value) {} }; -struct Attribute : public OptionNode { std::unique_ptr value; Attribute(std::unique_ptr && value) : value(std::move(value)) {} }; + enum class OptionType { + Attribute, + DiagnosticOutputChannel, + ExpandDefinitions, + InteractiveMode, + PrintSuccess, + ProduceAssignments, + ProduceModels, + ProduceProofs, + ProduceUnsatCores, + RandomSeed, + RegularOutputChannel, + Verbosity, + }; + std::variant,std::unique_ptr> value; + OptionType type; + OptionNode(OptionType type, bool value) : type(type), value(value) {} + OptionNode(OptionType type, uint32_t value) : type(type), value(value) {} + OptionNode(OptionType type, std::unique_ptr && value) : type(type), value(std::move(value)) {} + OptionNode(OptionType type, std::unique_ptr && value) : type(type), value(std::move(value)) {} +}; // Note: classes derived from CommandNodes need to have a constructor because they need to be destructible as CommandNodes. // In particular, CommandNode needs to have a virtual member function (destructor), which forbids aggregate initialization. @@ -262,10 +261,9 @@ struct DeclareFun : public CommandNode { }; struct DeclareConst : public CommandNode { - std::variant,std::unique_ptr> name; + std::unique_ptr name; std::unique_ptr sort; DeclareConst(std::unique_ptr && name, std::unique_ptr && sort) : name(std::move(name)), sort(std::move(sort)) {} - DeclareConst(std::unique_ptr && name, std::unique_ptr && sort) : name(std::move(name)), sort(std::move(sort)) {} }; struct SortedVarNode : public GeneralNode { diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index 7c0fe9ad6..d11f3c3fe 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -60,11 +60,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "smt2newcontext.h" #include "smt2tokens.h" -using ASTNode_up = std::unique_ptr; -using ASTVec = std::vector; -using ASTVec_up = std::unique_ptr; -using string_up = std::unique_ptr; - std::unique_ptr mkUniqueStr(std::string const & s) { return std::make_unique(s); } @@ -400,29 +395,29 @@ b_value: symbol ; option: KW_PRINTSUCCESS b_value - { $$ = new PrintSuccess {$2}; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::PrintSuccess, $2}; delete $1; } | KW_EXPANDDEFINITIONS b_value - { $$ = new ExpandDefinitions {$2}; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::ExpandDefinitions, $2}; delete $1; } | KW_INTERACTIVEMODE b_value - { $$ = new InteractiveMode {$2}; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::InteractiveMode, $2}; delete $1; } | KW_PRODUCEPROOFS b_value - { $$ = new ProduceProofs {$2}; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::ProduceProofs, $2}; delete $1; } | KW_PRODUCEUNSATCORES b_value - { $$ = new ProduceUnsatCores {$2}; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::ProduceUnsatCores, $2}; delete $1; } | KW_PRODUCEMODELS b_value - { $$ = new ProduceModels {$2}; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::ProduceModels, $2}; delete $1; } | KW_PRODUCEASSIGNMENTS b_value - { $$ = new ProduceAssignments {$2}; delete $1;} + { $$ = new OptionNode {OptionNode::OptionType::ProduceAssignments, $2}; delete $1;} | KW_REGULAROUTPUTCHANNEL TK_STR - { $$ = new RegularOutputChannel {std::unique_ptr($2)}; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::RegularOutputChannel, std::unique_ptr($2)}; delete $1; } | KW_DIAGNOSTICOUTPUTCHANNEL TK_STR - { $$ = new DiagnosticOutputChannel {std::unique_ptr($2)}; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::DiagnosticOutputChannel, std::unique_ptr($2)}; delete $1; } | KW_RANDOMSEED TK_NUM - { $$ = new RandomSeed { std::stoi(*$2) }; delete $2; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::RandomSeed, static_cast(std::stoi(*$2)) }; delete $2; delete $1; } | KW_VERBOSITY TK_NUM - { $$ = new Verbosity { std::stoi(*$2) }; delete $2; delete $1; } + { $$ = new OptionNode {OptionNode::OptionType::Verbosity, static_cast(std::stoi(*$2)) }; delete $2; delete $1; } | attribute - { $$ = new Attribute { std::unique_ptr($1) }; } + { $$ = new OptionNode {OptionNode::OptionType::Attribute, std::unique_ptr($1) }; } ; predef_key: KW_SORTS From f40a0548ac44e1ded52fd4cb0fb7f5646020c303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 11:35:40 +0100 Subject: [PATCH 54/76] Itp-regression: Use boolean valued flags --- ...ocksynchro_3clocks.worst_case_skew.induct_delta_1.smt2 | 2 +- regression_itp/LIA/lia_itp_split.smt2 | 2 +- regression_itp/LIA/lia_itp_test.smt2 | 2 +- regression_itp/LIA/lia_itp_test2.smt2 | 2 +- regression_itp/LIA/lia_itp_test3.smt2 | 2 +- regression_itp/bug_mask_ite.smt2 | 4 ++-- regression_itp/bug_mask_ite_nested.smt2 | 4 ++-- regression_itp/dec-far1.smt2 | 2 +- regression_itp/dec-far2.smt2 | 2 +- regression_itp/distinct_unsat.smt2 | 4 ++-- regression_itp/incremental/inc_itp_theory_prop.smt2 | 2 +- regression_itp/incremental/incremental_itp.smt2 | 2 +- regression_itp/incremental/incremental_itp2.smt2 | 2 +- regression_itp/incremental/incremental_itp3.smt2 | 2 +- regression_itp/incremental/incremental_itp4.smt2 | 2 +- regression_itp/incremental/incremental_itp5.smt2 | 2 +- regression_itp/incremental/issue152_itp.smt2 | 2 +- regression_itp/incremental/lia_splits.smt2 | 2 +- regression_itp/incremental/lia_splits2.smt2 | 2 +- regression_itp/itp_bug.smt2 | 4 ++-- regression_itp/itp_bug_small.smt2 | 4 ++-- regression_itp/part_bug.smt2 | 4 ++-- regression_itp/preint-options.smt2 | 2 +- regression_itp/proof_duplicate_literals.smt2 | 8 ++++---- regression_itp/trivial-proof-A.smt2 | 4 ++-- regression_itp/trivial-proof-B.smt2 | 4 ++-- regression_itp/uf-itp-edge-split.smt2 | 4 ++-- regression_itp/uf_bug.smt2 | 4 ++-- regression_itp/uf_duplicates.smt2 | 4 ++-- regression_itp/uf_itp_problem.smt2 | 2 +- regression_itp/uf_local_colors_insufficient.smt2 | 4 ++-- 31 files changed, 46 insertions(+), 46 deletions(-) diff --git a/regression/QF_LRA/clocksynchro_3clocks.worst_case_skew.induct_delta_1.smt2 b/regression/QF_LRA/clocksynchro_3clocks.worst_case_skew.induct_delta_1.smt2 index 94f3c0ea5..e684be3f8 100644 --- a/regression/QF_LRA/clocksynchro_3clocks.worst_case_skew.induct_delta_1.smt2 +++ b/regression/QF_LRA/clocksynchro_3clocks.worst_case_skew.induct_delta_1.smt2 @@ -1,4 +1,4 @@ -(set-option :ghost-vars 1) +(set-option :ghost-vars true) (set-logic QF_LRA) (declare-fun v17 () Real) (declare-fun v23 () Real) diff --git a/regression_itp/LIA/lia_itp_split.smt2 b/regression_itp/LIA/lia_itp_split.smt2 index ac4b8f0b6..1600b6b4e 100644 --- a/regression_itp/LIA/lia_itp_split.smt2 +++ b/regression_itp/LIA/lia_itp_split.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LIA) (declare-fun x () Int) (declare-fun y () Int) diff --git a/regression_itp/LIA/lia_itp_test.smt2 b/regression_itp/LIA/lia_itp_test.smt2 index 33e76b9be..d50428625 100644 --- a/regression_itp/LIA/lia_itp_test.smt2 +++ b/regression_itp/LIA/lia_itp_test.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LIA) (declare-fun x () Int) (declare-fun y () Int) diff --git a/regression_itp/LIA/lia_itp_test2.smt2 b/regression_itp/LIA/lia_itp_test2.smt2 index ca7eafc4c..c3fa422df 100644 --- a/regression_itp/LIA/lia_itp_test2.smt2 +++ b/regression_itp/LIA/lia_itp_test2.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LIA) (declare-fun x () Int) (declare-fun y () Int) diff --git a/regression_itp/LIA/lia_itp_test3.smt2 b/regression_itp/LIA/lia_itp_test3.smt2 index 791783c1a..c30aab9a2 100644 --- a/regression_itp/LIA/lia_itp_test3.smt2 +++ b/regression_itp/LIA/lia_itp_test3.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LIA) (declare-fun x () Int) (declare-fun y () Int) diff --git a/regression_itp/bug_mask_ite.smt2 b/regression_itp/bug_mask_ite.smt2 index a0cda071d..d7f5f7b8c 100644 --- a/regression_itp/bug_mask_ite.smt2 +++ b/regression_itp/bug_mask_ite.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_LRA) (declare-fun x () Real) diff --git a/regression_itp/bug_mask_ite_nested.smt2 b/regression_itp/bug_mask_ite_nested.smt2 index 98ec3e865..968bbe93f 100644 --- a/regression_itp/bug_mask_ite_nested.smt2 +++ b/regression_itp/bug_mask_ite_nested.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_LRA) (declare-fun |state::state.pc| () Real) (declare-fun |state::state.old| () Real) diff --git a/regression_itp/dec-far1.smt2 b/regression_itp/dec-far1.smt2 index 6f39ed34c..64f89f4be 100644 --- a/regression_itp/dec-far1.smt2 +++ b/regression_itp/dec-far1.smt2 @@ -1,5 +1,5 @@ (set-option :produce-interpolants true) -(set-option :certify-interpolants 1) +(set-option :certify-interpolants true) (set-logic QF_LRA) (set-option :interpolation-lra-algorithm 11) ; decomposed Farkas (declare-fun x1 () Real) diff --git a/regression_itp/dec-far2.smt2 b/regression_itp/dec-far2.smt2 index 1aa35fd63..8d94ae6e2 100644 --- a/regression_itp/dec-far2.smt2 +++ b/regression_itp/dec-far2.smt2 @@ -1,5 +1,5 @@ (set-option :produce-interpolants true) -(set-option :certify-interpolants 1) +(set-option :certify-interpolants true) (set-logic QF_LRA) (set-option :interpolation-lra-algorithm 11) ; decomposed Farkas (declare-fun x1 () Real) diff --git a/regression_itp/distinct_unsat.smt2 b/regression_itp/distinct_unsat.smt2 index 11f55748c..cf08be503 100644 --- a/regression_itp/distinct_unsat.smt2 +++ b/regression_itp/distinct_unsat.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_LRA) (set-info :status unsat) (declare-fun a () Real) diff --git a/regression_itp/incremental/inc_itp_theory_prop.smt2 b/regression_itp/incremental/inc_itp_theory_prop.smt2 index 283023fca..c257b8139 100644 --- a/regression_itp/incremental/inc_itp_theory_prop.smt2 +++ b/regression_itp/incremental/inc_itp_theory_prop.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LRA) (declare-fun x () Real) (push 1) diff --git a/regression_itp/incremental/incremental_itp.smt2 b/regression_itp/incremental/incremental_itp.smt2 index bfd69f604..94a7a4241 100644 --- a/regression_itp/incremental/incremental_itp.smt2 +++ b/regression_itp/incremental/incremental_itp.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LRA) (declare-fun b () Bool) (assert (! diff --git a/regression_itp/incremental/incremental_itp2.smt2 b/regression_itp/incremental/incremental_itp2.smt2 index 672093f78..a53e3c6bb 100644 --- a/regression_itp/incremental/incremental_itp2.smt2 +++ b/regression_itp/incremental/incremental_itp2.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LRA) (declare-fun a () Real) (assert (! diff --git a/regression_itp/incremental/incremental_itp3.smt2 b/regression_itp/incremental/incremental_itp3.smt2 index 18a5bb60a..a0fb3d469 100644 --- a/regression_itp/incremental/incremental_itp3.smt2 +++ b/regression_itp/incremental/incremental_itp3.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LRA) (declare-fun a () Bool) (declare-fun b () Bool) diff --git a/regression_itp/incremental/incremental_itp4.smt2 b/regression_itp/incremental/incremental_itp4.smt2 index abc43f7de..432418db2 100644 --- a/regression_itp/incremental/incremental_itp4.smt2 +++ b/regression_itp/incremental/incremental_itp4.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_UF) (declare-fun a () Bool) (declare-fun b () Bool) diff --git a/regression_itp/incremental/incremental_itp5.smt2 b/regression_itp/incremental/incremental_itp5.smt2 index 4bbd05d90..5772a1d3c 100644 --- a/regression_itp/incremental/incremental_itp5.smt2 +++ b/regression_itp/incremental/incremental_itp5.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_UF) (declare-fun a () Bool) (declare-fun b () Bool) diff --git a/regression_itp/incremental/issue152_itp.smt2 b/regression_itp/incremental/issue152_itp.smt2 index f2d2e4bd5..ccb3db1ae 100644 --- a/regression_itp/incremental/issue152_itp.smt2 +++ b/regression_itp/incremental/issue152_itp.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LRA) (declare-fun r11 () Real) (check-sat) diff --git a/regression_itp/incremental/lia_splits.smt2 b/regression_itp/incremental/lia_splits.smt2 index 88f831b70..99ecc7454 100644 --- a/regression_itp/incremental/lia_splits.smt2 +++ b/regression_itp/incremental/lia_splits.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LIA) (declare-fun x () Int) (declare-fun y () Int) diff --git a/regression_itp/incremental/lia_splits2.smt2 b/regression_itp/incremental/lia_splits2.smt2 index 020b13b6a..e28bdada8 100644 --- a/regression_itp/incremental/lia_splits2.smt2 +++ b/regression_itp/incremental/lia_splits2.smt2 @@ -1,4 +1,4 @@ -(set-option :produce-interpolants 1) +(set-option :produce-interpolants true) (set-logic QF_LIA) (declare-fun x () Int) (declare-fun y () Int) diff --git a/regression_itp/itp_bug.smt2 b/regression_itp/itp_bug.smt2 index a1e19bc8d..32ca267d7 100644 --- a/regression_itp/itp_bug.smt2 +++ b/regression_itp/itp_bug.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_LRA) (declare-fun |state_type::state.delta| () Real) (declare-fun |state_type::state.v!0| () Real) diff --git a/regression_itp/itp_bug_small.smt2 b/regression_itp/itp_bug_small.smt2 index e81d5119d..86cd49fc2 100644 --- a/regression_itp/itp_bug_small.smt2 +++ b/regression_itp/itp_bug_small.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_LRA) (declare-fun x () Bool) diff --git a/regression_itp/part_bug.smt2 b/regression_itp/part_bug.smt2 index 056c957d2..d27b4b020 100644 --- a/regression_itp/part_bug.smt2 +++ b/regression_itp/part_bug.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_LRA) (declare-fun |hifrog::fun_start!0#3| () Bool) (declare-fun |hifrog::fun_end!0#3| () Bool) diff --git a/regression_itp/preint-options.smt2 b/regression_itp/preint-options.smt2 index 41a778b10..3cdd28b4d 100644 --- a/regression_itp/preint-options.smt2 +++ b/regression_itp/preint-options.smt2 @@ -1,4 +1,4 @@ (set-logic QF_LRA) (set-option :produce-interpolants true) -(set-option :certify-interpolants 1) +(set-option :certify-interpolants true) (check-sat) diff --git a/regression_itp/proof_duplicate_literals.smt2 b/regression_itp/proof_duplicate_literals.smt2 index a8b6a6711..1f0e2c7e2 100644 --- a/regression_itp/proof_duplicate_literals.smt2 +++ b/regression_itp/proof_duplicate_literals.smt2 @@ -1,8 +1,8 @@ -(set-option :produce-interpolants 1) -(set-option :proof-reduce 1) -;(set-option :proof-check 1) +(set-option :produce-interpolants true) +(set-option :proof-reduce true) +;(set-option :proof-check true) ;(set-option :verbosity 2) -(set-option :certify-interpolants 1) +(set-option :certify-interpolants true) (set-logic QF_UF) (declare-fun a () Bool) (declare-fun b () Bool) diff --git a/regression_itp/trivial-proof-A.smt2 b/regression_itp/trivial-proof-A.smt2 index 170c5cedb..ba3fac41e 100644 --- a/regression_itp/trivial-proof-A.smt2 +++ b/regression_itp/trivial-proof-A.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_UF) (declare-fun x () Bool) (assert (! false :named A)) diff --git a/regression_itp/trivial-proof-B.smt2 b/regression_itp/trivial-proof-B.smt2 index 365553729..9c6477f78 100644 --- a/regression_itp/trivial-proof-B.smt2 +++ b/regression_itp/trivial-proof-B.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_UF) (declare-fun x () Bool) (assert (! x :named A)) diff --git a/regression_itp/uf-itp-edge-split.smt2 b/regression_itp/uf-itp-edge-split.smt2 index a999c1af9..0ed3f5a67 100644 --- a/regression_itp/uf-itp-edge-split.smt2 +++ b/regression_itp/uf-itp-edge-split.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_UF) (declare-sort U 0) (declare-fun p () Bool) diff --git a/regression_itp/uf_bug.smt2 b/regression_itp/uf_bug.smt2 index 8458e4059..d04084cbc 100644 --- a/regression_itp/uf_bug.smt2 +++ b/regression_itp/uf_bug.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_UF) (declare-sort U 0) (declare-fun e () U) diff --git a/regression_itp/uf_duplicates.smt2 b/regression_itp/uf_duplicates.smt2 index 15b068e19..1fab207cf 100644 --- a/regression_itp/uf_duplicates.smt2 +++ b/regression_itp/uf_duplicates.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_UF) (declare-sort Real 0) (declare-fun .uf-not () Bool) diff --git a/regression_itp/uf_itp_problem.smt2 b/regression_itp/uf_itp_problem.smt2 index 03839e468..8d6848a9f 100644 --- a/regression_itp/uf_itp_problem.smt2 +++ b/regression_itp/uf_itp_problem.smt2 @@ -1,5 +1,5 @@ (set-option :produce-interpolants true) -(set-option :certify-interpolants 1) +(set-option :certify-interpolants true) (set-logic QF_UF) (declare-sort Real 0) (declare-fun g (Real Real ) Real) diff --git a/regression_itp/uf_local_colors_insufficient.smt2 b/regression_itp/uf_local_colors_insufficient.smt2 index 244895443..f7015fb2e 100644 --- a/regression_itp/uf_local_colors_insufficient.smt2 +++ b/regression_itp/uf_local_colors_insufficient.smt2 @@ -1,5 +1,5 @@ -(set-option :produce-interpolants 1) -(set-option :certify-interpolants 1) +(set-option :produce-interpolants true) +(set-option :certify-interpolants true) (set-logic QF_UF) (declare-sort U 0) (declare-fun f (U U) U) From 1734ae7bbbb5c298d5187d6dbcbd6d1406469ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 11:39:07 +0100 Subject: [PATCH 55/76] Interpret: Use correct string conversion for GetInfo --- src/api/Interpret.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 715b9ddd6..06a255931 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -62,7 +62,7 @@ void Interpret::interp(GetInfo const & n) { if (value.type == ConstType::empty) notify_formatted(true, "no value for info %s", name.c_str()); else { - auto val_str = value.getStringVal(); + auto val_str = value.toString(); notify_formatted(false, "%s %s", name.c_str(), val_str.c_str()); } } From 9456fa5e4f332c759f6f9e976b77bc063d0bc4a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 11:49:47 +0100 Subject: [PATCH 56/76] Interpret: allow only signed integers in options --- .../generic/pre-logic.smt2.expected.out | 8 +- src/api/Interpret.cc | 39 +++--- src/options/SMTConfig.cc | 4 +- src/options/SMTConfig.h | 121 +++++++++++------- src/parsers/smt2new/smt2newcontext.h | 7 +- src/parsers/smt2new/smt2newlexer.ll | 2 +- src/parsers/smt2new/smt2newparser.yy | 26 ++-- 7 files changed, 122 insertions(+), 85 deletions(-) diff --git a/regression/generic/pre-logic.smt2.expected.out b/regression/generic/pre-logic.smt2.expected.out index 0e4f217c2..b0e978f9a 100644 --- a/regression/generic/pre-logic.smt2.expected.out +++ b/regression/generic/pre-logic.smt2.expected.out @@ -6,7 +6,8 @@ success success success success -success +(error "Overflow in #xdeafbeef") + success success true @@ -17,8 +18,9 @@ Longer story (error "No value for attr :foo-option") 0 -3.14159 -3736059631 +3.141593 +(error "No value for option :hex") + 85 ( foo string 10 4075 1.23 2 ( ( ) bar ( :keyword ) ) ) (error "No value for attr :non-existing-option") diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 06a255931..2cb9ea0b3 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -48,8 +48,7 @@ Interpret::getParsedFormula() } void Interpret::interp(SetInfo const & n) { - std::string name = n.getName(); - config.setInfo(n.getName(), n.getValue()); + config.setInfo(n.getName(), SMTOption{n.getValue()}); notify_success(); } @@ -74,75 +73,83 @@ void Interpret::interp(SetOption const & n) { auto val = std::get_if>(&n.option->value); assert(val); assert(*val); - config.setOption(*(**val).name, *(**val).value); + try { + config.setOption(*(**val).name, SMTOption{*(**val).value}); + } catch (std::out_of_range & e) { + notify_formatted(true, "Overflow in %s", opensmt::nodeToString()(*(**val).value).c_str()); + return; + } catch (OsmtApiException & e) { + notify_formatted(true, "%s", e.what()); + return; + } break; } case OptionNode::OptionType::DiagnosticOutputChannel: { auto val = std::get_if>(&n.option->value); assert(val); assert(*val); - config.setOption("diagnostic-output-channel", std::move(**val)); + config.setOption(":diagnostic-output-channel", SMTOption{std::move(**val)}); break; } case OptionNode::OptionType::ExpandDefinitions: { auto val = std::get_if(&n.option->value); assert(val); - config.setOption("expand-definitions", *val); + config.setOption(":expand-definitions", SMTOption{*val}); break; } case OptionNode::OptionType::InteractiveMode: { auto val = std::get_if(&n.option->value); assert(val); - config.setOption("interactive-mode", *val); + config.setOption(":interactive-mode", SMTOption{*val}); break; } case OptionNode::OptionType::PrintSuccess: { auto val = std::get_if(&n.option->value); assert(val); - config.setOption("print-success", *val); + config.setOption(":print-success", SMTOption{*val}); break; } case OptionNode::OptionType::ProduceAssignments: { auto val = std::get_if(&n.option->value); assert(val); - config.setOption("produce-assignments", *val); + config.setOption(":produce-assignments", SMTOption{*val}); break; } case OptionNode::OptionType::ProduceModels: { auto val = std::get_if(&n.option->value); assert(val); - config.setOption("produce-models", *val); + config.setOption(":produce-models", SMTOption{*val}); break; } case OptionNode::OptionType::ProduceProofs: { auto val = std::get_if(&n.option->value); assert(val); - config.setOption("produce-proofs", *val); + config.setOption(":produce-proofs", SMTOption{*val}); break; } case OptionNode::OptionType::ProduceUnsatCores: { auto val = std::get_if(&n.option->value); assert(val); - config.setOption("produce-unsat-cores", *val); + config.setOption(":produce-unsat-cores", SMTOption{*val}); break; } case OptionNode::OptionType::RandomSeed: { - auto val = std::get_if(&n.option->value); + auto val = std::get_if(&n.option->value); assert(val); - config.setOption("random-seed", *val); + config.setOption(":random-seed", SMTOption{*val}); break; } case OptionNode::OptionType::RegularOutputChannel: { auto val = std::get_if>(&n.option->value); assert(val); assert(*val); - config.setOption("regular-output-channel", std::move(**val)); + config.setOption(":regular-output-channel", SMTOption{std::move(**val)}); break; } case OptionNode::OptionType::Verbosity: { - auto val = std::get_if(&n.option->value); + auto val = std::get_if(&n.option->value); assert(val); - config.setOption("verbosity", *val); + config.setOption(":verbosity", SMTOption{*val}); break; } default: diff --git a/src/options/SMTConfig.cc b/src/options/SMTConfig.cc index f5d04af8d..907fb0e64 100644 --- a/src/options/SMTConfig.cc +++ b/src/options/SMTConfig.cc @@ -79,10 +79,10 @@ void SMTConfig::setOption(std::string const & name, const SMTOption& value) { } if (name == o_random_seed) { - if (value.type != ConstType::numeral) { + if (value.type != ConstType::integral) { throw OsmtApiException(s_err_not_num); } - uint32_t seed = value.getUint32Val(); + uint32_t seed = value.getIntVal(); if (seed == 0) { throw OsmtApiException(s_err_seed_zero); } } diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index 4305508e8..9b6b24316 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -90,7 +90,7 @@ class SMTOption { public: ConstType type = ConstType::empty; - std::variant value = 0; + std::variant value = 0; std::string toString() const { if (auto val = std::get_if(&value)) { @@ -99,8 +99,6 @@ class SMTOption { return std::to_string(*val); } else if (auto val = std::get_if(&value)) { return std::to_string(*val); - } else if (auto val = std::get_if(&value)) { - return std::to_string(*val); } else if (auto val = std::get_if(&value)) { return *val ? "true" : "false"; } @@ -118,11 +116,9 @@ class SMTOption { } } double getDoubleVal() const { - if (type == ConstType::numeral) { + if (type == ConstType::integral) { if (auto val = std::get_if(&value)) { return static_cast(*val); - } else if (auto val = std::get_if(&value)) { - return static_cast(*val); } else { throw OsmtInternalException("Inconsistent value for option"); } @@ -135,7 +131,7 @@ class SMTOption { } } int getIntVal() const { - if (type == ConstType::numeral) { + if (type == ConstType::integral) { auto val = std::get_if(&value); assert(val); return *val; @@ -143,15 +139,6 @@ class SMTOption { throw OsmtApiException("Attempted to obtain int value for non-int type"); } } - uint32_t getUint32Val() const { - if (type == ConstType::uint32) { - auto val = std::get_if(&value); - assert(val); - return *val; - } else { - throw OsmtApiException("Attempted to obtain uint32 value for non-uint32 type"); - } - } bool getBoolVal() const { if (type == ConstType::boolean) { auto val = std::get_if(&value); @@ -163,19 +150,61 @@ class SMTOption { } } SMTOption() = default; - SMTOption(int i) : type(ConstType::numeral), value(i) {} - SMTOption(uint32_t i) : type(ConstType::uint32), value(i) {} - SMTOption(double i) : type(ConstType::decimal), value(i) {} - SMTOption(std::string && s) : type(ConstType::string), value(std::move(s)) {} - SMTOption(AttributeValueNode const & n) { + explicit SMTOption(bool i) : type(ConstType::boolean), value(i) {} + explicit SMTOption(int i) : type(ConstType::integral), value(i) {} + explicit SMTOption(double i) : type(ConstType::decimal), value(i) {} + explicit SMTOption(std::string && s) : type(ConstType::string), value(std::move(s)) {} + explicit SMTOption(AttributeValueNode const & n) { if (auto specConst_p = std::get_if>(&n.value)) { auto const & specConst = (**specConst_p); type = specConst.type; - value = *specConst.value; + switch (type) { + case ConstType::integral: { + value = std::stoi(*specConst.value); + break; + } + case ConstType::boolean: { + value = *specConst.value == "true"; + break; + } + case ConstType::string: { + value = *specConst.value; + break; + } + case ConstType::decimal: { + value = std::stod(*specConst.value); + break; + } + case ConstType::binary: { + value = std::stoi(static_cast(std::string_view(&(*specConst.value)[2], (*specConst.value).size()-2)), nullptr, 2); + break; + } + case ConstType::hexadecimal: { + value = std::stoi(static_cast(std::string_view(&(*specConst.value)[2], (*specConst.value).size()-2)), nullptr, 16); + break; + } + case ConstType::sexpr: + case ConstType::symbol: { + value = *specConst.value; + break; + } + case ConstType::empty: { + throw OsmtInternalException("Parsed an empty type"); + } + } } else if (auto symbol_p = std::get_if>(&n.value)) { auto const & symbol = (**symbol_p); - type = symbol.getType(); - value = opensmt::nodeToString()(symbol); + std::string symbolString = opensmt::nodeToString()(symbol); + if (not symbol.quoted and symbolString == "true") { + type = ConstType::boolean; + value = true; + } else if (not symbol.quoted and symbolString == "false") { + type = ConstType::boolean; + value = false; + } else { + type = symbol.getType(); + value = std::move(symbolString); + } } else if (auto sexprVec_p = std::get_if>>(&n.value)) { assert(sexprVec_p); type = ConstType::sexpr; @@ -404,7 +433,7 @@ struct SMTConfig void printHelp ( ); void printConfig ( std::ostream & out ); - inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getUint32Val(): 91648253; } + inline int getRandomSeed ( ) const { return optionTable.find(o_random_seed) != optionTable.end() ? optionTable.at(o_random_seed).getIntVal(): 91648253; } inline void setProduceModels( ) { insertOption(o_produce_models, SMTOption(1)); } inline bool setRandomSeed(int seed) { insertOption(o_random_seed, SMTOption(seed)); return true; } @@ -417,7 +446,7 @@ struct SMTConfig void setTimeQueries() { insertOption(o_time_queries, SMTOption(1)); } bool timeQueries() { return optionTable.find(o_time_queries) != optionTable.end() ? optionTable[o_time_queries].getBoolVal() : false; } // Set reduction params - inline void setReduction(int r) { insertOption(o_proof_reduce, SMTOption(r)); } + inline void setReduction(bool r) { insertOption(o_proof_reduce, SMTOption(r)); } inline void setReductionGraph(int r) { insertOption(o_proof_num_graph_traversals, SMTOption(r)); } @@ -437,16 +466,16 @@ struct SMTConfig // Get interpolation algorithms inline ItpAlgorithm getBooleanInterpolationAlgorithm() const { - return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getUint32Val()) + return optionTable.find(o_itp_bool_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_bool_alg).getIntVal()) : ItpAlgorithm::itp_alg_mcmillan; } inline ItpAlgorithm getEUFInterpolationAlgorithm() const { - return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getUint32Val()) + return optionTable.find(o_itp_euf_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_euf_alg).getIntVal()) : ItpAlgorithm::itp_euf_alg_strong; } inline ItpAlgorithm getLRAInterpolationAlgorithm() const { - return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getUint32Val()) + return optionTable.find(o_itp_lra_alg) != optionTable.end() ? static_cast(optionTable.at(o_itp_lra_alg).getIntVal()) : ItpAlgorithm::itp_lra_alg_strong; } @@ -482,10 +511,10 @@ struct SMTConfig optionTable.at(o_grow).getBoolVal() : 0; } int sat_clause_lim() const { return optionTable.find(o_clause_lim) != optionTable.end() ? - optionTable.at(o_clause_lim).getUint32Val() : 20; } + optionTable.at(o_clause_lim).getIntVal() : 20; } int sat_subsumption_lim() const { return optionTable.find(o_subsumption_lim) != optionTable.end() ? - optionTable.at(o_subsumption_lim).getUint32Val() : 1000; } + optionTable.at(o_subsumption_lim).getIntVal() : 1000; } double sat_simp_garbage_frac() const { return optionTable.find(o_simp_garbage_frac) != optionTable.end() ? optionTable.at(o_simp_garbage_frac).getDoubleVal() : 0.5; } @@ -511,14 +540,14 @@ struct SMTConfig optionTable.at(o_random_var_freq).getDoubleVal() : 0.02; } uint32_t sat_random_seed() const { return optionTable.find(o_random_seed) != optionTable.end() ? - optionTable.at(o_random_seed).getUint32Val() : 91648253; } + optionTable.at(o_random_seed).getIntVal() : 91648253; } bool sat_luby_restart() const { return optionTable.find(o_luby_restart) != optionTable.end() ? optionTable.at(o_luby_restart).getBoolVal() : true; } uint32_t sat_ccmin_mode() const { return optionTable.find(o_ccmin_mode) != optionTable.end() ? - optionTable.at(o_ccmin_mode).getUint32Val() : 2; + optionTable.at(o_ccmin_mode).getIntVal() : 2; } bool sat_rnd_pol() const { return optionTable.find(o_rnd_pol) != optionTable.end() ? @@ -533,7 +562,7 @@ struct SMTConfig } uint32_t sat_restart_first() const { return optionTable.find(o_restart_first) != optionTable.end() ? - optionTable.at(o_restart_first).getUint32Val() : 100; } + optionTable.at(o_restart_first).getIntVal() : 100; } double sat_restart_inc() const { return optionTable.find(o_restart_inc) != optionTable.end() ? optionTable.at(o_restart_inc).getDoubleVal() : 1.1; @@ -552,7 +581,7 @@ struct SMTConfig } uint32_t simplify_inter() const { return optionTable.find(o_simplify_inter) != optionTable.end() ? - optionTable.at(o_simplify_inter).getUint32Val() : false; + optionTable.at(o_simplify_inter).getIntVal() : false; } bool proof_struct_hash() const { return optionTable.find(o_proof_struct_hash) != optionTable.end() ? @@ -560,10 +589,10 @@ struct SMTConfig } uint32_t proof_num_graph_traversals() const { return optionTable.find(o_proof_num_graph_traversals) != optionTable.end() ? - optionTable.at(o_proof_num_graph_traversals).getUint32Val() : 3; } + optionTable.at(o_proof_num_graph_traversals).getIntVal() : 3; } uint32_t proof_red_trans() const { return optionTable.find(o_proof_red_trans) != optionTable.end() ? - optionTable.at(o_proof_red_trans).getUint32Val() : 2; + optionTable.at(o_proof_red_trans).getIntVal() : 2; } bool proof_rec_piv() const { return optionTable.find(o_proof_rec_piv) != optionTable.end() ? @@ -595,18 +624,18 @@ struct SMTConfig } uint32_t itp_bool_alg() const { return optionTable.find(o_itp_bool_alg) != optionTable.end() ? - optionTable.at(o_itp_bool_alg).getUint32Val() : 0; + optionTable.at(o_itp_bool_alg).getIntVal() : 0; } uint32_t itp_euf_alg() const { return optionTable.find(o_itp_euf_alg) != optionTable.end() ? - optionTable.at(o_itp_euf_alg).getUint32Val() : 0; + optionTable.at(o_itp_euf_alg).getIntVal() : 0; } uint32_t itp_lra_alg() const { return optionTable.find(o_itp_lra_alg) != optionTable.end() ? - optionTable.at(o_itp_lra_alg).getUint32Val() : 0; } + optionTable.at(o_itp_lra_alg).getIntVal() : 0; } uint32_t sat_dump_rnd_inter() const { return optionTable.find(o_sat_dump_rnd_inter) != optionTable.end() ? - optionTable.at(o_sat_dump_rnd_inter).getUint32Val() : 2; } + optionTable.at(o_sat_dump_rnd_inter).getIntVal() : 2; } bool declarations_are_global() const { return optionTable.find(o_global_declarations) != optionTable.end() ? @@ -709,7 +738,7 @@ struct SMTConfig } uint32_t sat_split_num() const { return optionTable.find(o_sat_split_num) != optionTable.end() ? - optionTable.at(o_sat_split_num).getUint32Val() : + optionTable.at(o_sat_split_num).getIntVal() : 2; } int sat_split_fixvars() const { @@ -750,7 +779,7 @@ struct SMTConfig uint32_t randomize_lookahead_bufsz() const { return optionTable.find(o_sat_split_randomize_lookahead_buf) != optionTable.end() ? - optionTable.at(o_sat_split_randomize_lookahead_buf).getUint32Val() : + optionTable.at(o_sat_split_randomize_lookahead_buf).getIntVal() : true; } @@ -793,7 +822,7 @@ struct SMTConfig uint32_t sat_solver_limit() const { return optionTable.find(o_sat_solver_limit) != optionTable.end() ? - optionTable.at(o_sat_solver_limit).getUint32Val() : 0; } + optionTable.at(o_sat_solver_limit).getIntVal() : 0; } bool sat_split_mode() const { return optionTable.find(o_sat_split_mode) != optionTable.end() ? @@ -808,9 +837,9 @@ struct SMTConfig bool rocset; // Regular Output Channel set ? bool docset; // Diagnostic Output Channel set ? int dump_formula; // Dump input formula - bool verbosity() const { // Verbosity level + uint32_t verbosity() const { // Verbosity level return optionTable.find(o_verbosity) != optionTable.end() ? - optionTable.at(o_verbosity).getBoolVal() : false; + optionTable.at(o_verbosity).getIntVal() : 0; } bool printSuccess() const { return optionTable.find(":print-success") != optionTable.end() ? diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index d919bd955..d273e3ac3 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -34,10 +34,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include enum class ConstType { - numeral, + integral, decimal, hexadecimal, - uint32, binary, string, empty, @@ -141,10 +140,10 @@ class OptionNode : public GeneralNode { RegularOutputChannel, Verbosity, }; - std::variant,std::unique_ptr> value; OptionType type; + std::variant,std::unique_ptr> value; OptionNode(OptionType type, bool value) : type(type), value(value) {} - OptionNode(OptionType type, uint32_t value) : type(type), value(value) {} + OptionNode(OptionType type, int value) : type(type), value(value) {} OptionNode(OptionType type, std::unique_ptr && value) : type(type), value(std::move(value)) {} OptionNode(OptionType type, std::unique_ptr && value) : type(type), value(std::move(value)) {} }; diff --git a/src/parsers/smt2new/smt2newlexer.ll b/src/parsers/smt2new/smt2newlexer.ll index 84c1c9cc7..c12177946 100644 --- a/src/parsers/smt2new/smt2newlexer.ll +++ b/src/parsers/smt2new/smt2newlexer.ll @@ -129,7 +129,7 @@ using namespace osmttokens; ":all-statistics" { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return KW_ALLSTATISTICS; } -0|-?[1-9][0-9]*(\/[1-9][0-9]*)? { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_NUM; } +0|-?[1-9][0-9]*(\/[1-9][0-9]*)? { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_INT; } -?[0-9]+\.0*[0-9]+ { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_DEC; } #x[0-9a-fA-F]+ { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_HEX; } #b[01]+ { yyget_lval(yyscanner)->str = new std::string(yyget_text(yyscanner)); return TK_BIN; } diff --git a/src/parsers/smt2new/smt2newparser.yy b/src/parsers/smt2new/smt2newparser.yy index d11f3c3fe..bab79c864 100644 --- a/src/parsers/smt2new/smt2newparser.yy +++ b/src/parsers/smt2new/smt2newparser.yy @@ -122,13 +122,13 @@ std::unique_ptr mkUniqueStr(std::string const & s) { return std::ma %token TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %token TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO -%token TK_NUM TK_SYM TK_QSYM TK_KEY TK_STR TK_DEC TK_HEX TK_BIN +%token TK_INT TK_SYM TK_QSYM TK_KEY TK_STR TK_DEC TK_HEX TK_BIN %token KW_SORTS KW_FUNS KW_SORTSDESCRIPTION KW_FUNSDESCRIPTION KW_DEFINITION KW_NOTES KW_THEORIES KW_EXTENSIONS KW_VALUES KW_PRINTSUCCESS KW_EXPANDDEFINITIONS KW_INTERACTIVEMODE KW_PRODUCEPROOFS KW_PRODUCEUNSATCORES KW_PRODUCEMODELS KW_PRODUCEASSIGNMENTS KW_REGULAROUTPUTCHANNEL KW_DIAGNOSTICOUTPUTCHANNEL KW_RANDOMSEED KW_VERBOSITY KW_ERRORBEHAVIOR KW_NAME KW_NAMED KW_AUTHORS KW_VERSION KW_STATUS KW_REASONUNKNOWN KW_ALLSTATISTICS %type TK_AS TK_DECIMAL TK_EXISTS TK_FORALL TK_LET TK_NUMERAL TK_PAR TK_STRING %type TK_ASSERT TK_CHECKSAT TK_DECLARESORT TK_DECLAREFUN TK_DECLARECONST TK_DEFINESORT TK_DEFINEFUN TK_EXIT TK_GETASSERTIONS TK_GETASSIGNMENT TK_GETINFO TK_GETOPTION TK_GETPROOF TK_GETUNSATCORE TK_GETVALUE TK_GETMODEL TK_POP TK_PUSH TK_SETLOGIC TK_SETINFO TK_SETOPTION TK_THEORY TK_GETITPS TK_WRSTATE TK_RDSTATE TK_SIMPLIFY TK_WRFUNS TK_ECHO -%type TK_NUM TK_SYM TK_QSYM TK_KEY TK_STR TK_DEC TK_HEX TK_BIN +%type TK_INT TK_SYM TK_QSYM TK_KEY TK_STR TK_DEC TK_HEX TK_BIN %type KW_SORTS KW_FUNS KW_SORTSDESCRIPTION KW_FUNSDESCRIPTION KW_DEFINITION KW_NOTES KW_THEORIES KW_EXTENSIONS KW_VALUES KW_PRINTSUCCESS KW_EXPANDDEFINITIONS KW_INTERACTIVEMODE KW_PRODUCEPROOFS KW_PRODUCEUNSATCORES KW_PRODUCEMODELS KW_PRODUCEASSIGNMENTS KW_REGULAROUTPUTCHANNEL KW_DIAGNOSTICOUTPUTCHANNEL KW_RANDOMSEED KW_VERBOSITY KW_ERRORBEHAVIOR KW_NAME KW_NAMED KW_AUTHORS KW_VERSION KW_STATUS KW_REASONUNKNOWN KW_ALLSTATISTICS predef_key %type sort %type identifier @@ -179,7 +179,7 @@ command: '(' TK_SETLOGIC symbol ')' { $$ = new SetOption {std::unique_ptr($3)}; } | '(' TK_SETINFO attribute ')' { $$ = new SetInfo {std::unique_ptr($3)}; } - | '(' TK_DECLARESORT symbol TK_NUM ')' + | '(' TK_DECLARESORT symbol TK_INT ')' { $$ = new DeclareSort {std::unique_ptr($3), std::unique_ptr($4)}; } | '(' TK_DEFINESORT symbol '(' symbol_list ')' sort ')' { $$ = new DefineSort {std::unique_ptr($3), std::unique_ptr>>($5), std::unique_ptr($7)}; } @@ -189,9 +189,9 @@ command: '(' TK_SETLOGIC symbol ')' { $$ = new DeclareConst {std::unique_ptr($3), std::unique_ptr($4)}; } | '(' TK_DEFINEFUN symbol '(' sorted_var_list ')' sort term ')' { $$ = new DefineFun {std::unique_ptr($3), std::unique_ptr>>($5), std::unique_ptr($7), std::unique_ptr($8)}; } - | '(' TK_PUSH TK_NUM ')' + | '(' TK_PUSH TK_INT ')' { $$ = new PushNode {std::stoi(*$3)}; delete $3; } - | '(' TK_POP TK_NUM ')' + | '(' TK_POP TK_INT ')' { $$ = new PopNode {std::stoi(*$3)}; delete $3; } | '(' TK_ASSERT term ')' { $$ = new AssertNode{std::unique_ptr($3)}; } @@ -290,8 +290,8 @@ s_expr_list: ; -spec_const: TK_NUM - { $$ = new SpecConstNode{{}, ConstType::numeral, std::unique_ptr($1)}; } +spec_const: TK_INT + { $$ = new SpecConstNode{{}, ConstType::integral, std::unique_ptr($1)}; } | TK_DEC { $$ = new SpecConstNode{{}, ConstType::decimal, std::unique_ptr($1)}; } | TK_HEX @@ -308,9 +308,9 @@ const_val: symbol { $$ = new SymbolNode {{}, std::unique_ptr($1), false}; } ; -numeral_list: numeral_list TK_NUM +numeral_list: numeral_list TK_INT { $1->emplace_back(std::unique_ptr($2)); } - | TK_NUM + | TK_INT { $$ = new std::vector>(); $$->emplace_back(std::unique_ptr{$1}); } ; @@ -412,10 +412,10 @@ option: KW_PRINTSUCCESS b_value { $$ = new OptionNode {OptionNode::OptionType::RegularOutputChannel, std::unique_ptr($2)}; delete $1; } | KW_DIAGNOSTICOUTPUTCHANNEL TK_STR { $$ = new OptionNode {OptionNode::OptionType::DiagnosticOutputChannel, std::unique_ptr($2)}; delete $1; } - | KW_RANDOMSEED TK_NUM - { $$ = new OptionNode {OptionNode::OptionType::RandomSeed, static_cast(std::stoi(*$2)) }; delete $2; delete $1; } - | KW_VERBOSITY TK_NUM - { $$ = new OptionNode {OptionNode::OptionType::Verbosity, static_cast(std::stoi(*$2)) }; delete $2; delete $1; } + | KW_RANDOMSEED TK_INT + { $$ = new OptionNode {OptionNode::OptionType::RandomSeed, static_cast(std::stoi(*$2)) }; delete $2; delete $1; } + | KW_VERBOSITY TK_INT + { $$ = new OptionNode {OptionNode::OptionType::Verbosity, static_cast(std::stoi(*$2)) }; delete $2; delete $1; } | attribute { $$ = new OptionNode {OptionNode::OptionType::Attribute, std::unique_ptr($1) }; } ; From 6ee55a9a0ee51273661dfaf9357311763a2d707a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 11:54:18 +0100 Subject: [PATCH 57/76] Interpret: fix s-expression printing --- regression/generic/pre-logic.smt2.expected.out | 10 ++++------ src/options/SMTConfig.h | 10 +++++----- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/regression/generic/pre-logic.smt2.expected.out b/regression/generic/pre-logic.smt2.expected.out index b0e978f9a..e66d95b0c 100644 --- a/regression/generic/pre-logic.smt2.expected.out +++ b/regression/generic/pre-logic.smt2.expected.out @@ -15,23 +15,21 @@ quux Longer story 3 /dev/null -(error "No value for attr :foo-option") - +() 0 3.141593 (error "No value for option :hex") 85 -( foo string 10 4075 1.23 2 ( ( ) bar ( :keyword ) ) ) -(error "No value for attr :non-existing-option") +(foo string #b1010 #xfeb 1.23 2 (() bar (:keyword))) +(error "No value for option :non-existing-option") success success success success success -(error "no value for info :foo") - +:foo () :error-behavior commit-adultery :name OpenSMT :authors Muumi-peikko diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index 9b6b24316..9d9d0c9d0 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -209,11 +209,11 @@ class SMTOption { assert(sexprVec_p); type = ConstType::sexpr; auto const & sexprVec = **sexprVec_p; - std::string s; - for (SExpr * sexpr_p : sexprVec) { - s += "(" + opensmt::nodeToString()(sexpr_p) + ")"; - } - value = s; + auto str = std::accumulate(sexprVec.begin(), sexprVec.end(), std::string{}, + [](std::string & a, SExpr const * b) { + return a += (a.empty() ? "" : " ") + opensmt::nodeToString()(b); + }); + value = "(" + str + ")"; } } inline bool isEmpty() const { return type == ConstType::empty; } From 859dd1a809632ed37980da28d4a610660f277ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 11:55:57 +0100 Subject: [PATCH 58/76] Interpret: miscellaneous output fixes --- src/api/Interpret.cc | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 2cb9ea0b3..c6878ef71 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -154,8 +154,9 @@ void Interpret::interp(SetOption const & n) { } default: notify_formatted(true, "unknown option"); - break; + return; } + notify_success(); } void Interpret::interp(GetOption const & n) { @@ -299,8 +300,11 @@ void Interpret::interp(Simplify const & n) { return; } sstat status = main_solver->simplifyFormulas(); - if (status == s_Error) + if (status == s_Error) { notify_formatted(true, "Simplify"); + } else { + notify_success(); + } } void Interpret::interp(CheckSatNode const & n) { @@ -451,6 +455,9 @@ void Interpret::interp(PushNode const & n) { } else if (not isInitialized()) { notify_formatted(true, "Illegal command before set-logic: push"); return; + } else if (n.num < 0) { + notify_formatted(true, "Incorrect push command, value is negative."); + return; } int num = n.num; while (num --) { @@ -631,7 +638,7 @@ PTRef Interpret::parseTerm(NormalTermNode const * term, LetRecords & letRecords) if (term->returnSort) { return resolveQualifiedIdentifier(name, *term->returnSort, isQuoted); } else { - if (term->arguments->empty()) { + if (not term->arguments) { PTRef tr = letNameResolve(name.c_str(), letRecords); if (tr != PTRef_Undef) { return tr; @@ -793,6 +800,10 @@ void Interpret::writeState(std::string const & filename) void Interpret::interp(DeclareFun const & n) // (const char* fname, const vec& args) { + if (not isInitialized()) { + notify_formatted(true, "Illegal command before set-logic: declare-fun"); + return; + } SymbolNode const & name_node = *n.name; auto const & args_vec = *n.argumentSorts; SortNode const & ret_sort = *n.returnSort; @@ -832,6 +843,7 @@ void Interpret::interp(DeclareFun const & n) // (const char* fname, const vec Date: Mon, 31 Oct 2022 11:56:50 +0100 Subject: [PATCH 59/76] Interpret: Clean unused variables --- src/api/Interpret.cc | 14 +++++++------- src/bin/opensmt.cc | 1 - src/options/SMTConfig.h | 1 - 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index c6878ef71..5ef824dbc 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -294,7 +294,7 @@ void Interpret::interp(AssertNode const & n) { } } -void Interpret::interp(Simplify const & n) { +void Interpret::interp(Simplify const &) { if (not isInitialized()) { notify_formatted(true, "Illegal command before set-logic: simplify"); return; @@ -307,7 +307,7 @@ void Interpret::interp(Simplify const & n) { } } -void Interpret::interp(CheckSatNode const & n) { +void Interpret::interp(CheckSatNode const &) { if (not isInitialized()) { notify_formatted(true, "Illegal command before set-logic: check-sat"); return; @@ -408,7 +408,7 @@ class NameClashResolver { }; } -void Interpret::interp(GetModel const & n) { +void Interpret::interp(GetModel const &) { if (not isInitialized()) { notify_formatted(true, "Illegal command before set-logic: get-model"); return; @@ -491,7 +491,7 @@ void Interpret::interp(PopNode const & n) { } } -void Interpret::interp(Exit const & n) { +void Interpret::interp(Exit const &) { exit(); notify_success(); } @@ -673,10 +673,10 @@ PTRef Interpret::parseTerm(NormalTermNode const * term, LetRecords & letRecords) } } -PTRef Interpret::parseTerm(ForallNode const * term, LetRecords & letRecords) { +PTRef Interpret::parseTerm(ForallNode const *, LetRecords &) { return PTRef_Undef; } -PTRef Interpret::parseTerm(ExistsNode const * term, LetRecords & letRecords) { +PTRef Interpret::parseTerm(ExistsNode const *, LetRecords &) { return PTRef_Undef; } @@ -684,7 +684,7 @@ PTRef Interpret::parseTerm(ExistsNode const * term, LetRecords & letRecords) { -void Interpret::interp(GetAssignment const & getAssignment) { +void Interpret::interp(GetAssignment const &) { if (not isInitialized()) { notify_formatted(true, "Illegal command before set-logic"); } diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc index 32e179bf3..0905d4c6a 100644 --- a/src/bin/opensmt.cc +++ b/src/bin/opensmt.cc @@ -92,7 +92,6 @@ int main( int argc, char * argv[] ) // context.getConfig( ).printHelp( ); break; case 'd': - const char* msg; c.setOption(SMTConfig::o_dryrun, SMTOption(true)); break; case 'r': diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index 9d9d0c9d0..bf7924f04 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -914,7 +914,6 @@ struct SMTConfig static uint16_t database_port; void setSimplifyInterpolant(int val) { - const char* msg; setOption(o_simplify_inter, SMTOption(val)); } From 3dee01d08d13ffb256a31c4ede7f835ddf684e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 11:57:28 +0100 Subject: [PATCH 60/76] Interpret: make main interp public --- src/api/Interpret.h | 2 +- src/bin/opensmt.cc | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/api/Interpret.h b/src/api/Interpret.h index fa6dcc7c5..372cb6c8f 100644 --- a/src/api/Interpret.h +++ b/src/api/Interpret.h @@ -159,7 +159,6 @@ class Interpret { bool storeDefinedFun(std::string const & fname, const vec& args, SRef ret_sort, const PTRef tr); virtual void exit(); - void interp(CommandNode const * n); void interp(SetLogic const & n); void interp(SetInfo const & n); void interp(SetOption const & n); @@ -198,6 +197,7 @@ class Interpret { , f_exit (false) { } + void interp(CommandNode const * n); int interpFile(FILE* in); int interpFile(char *content); int interpPipe(); diff --git a/src/bin/opensmt.cc b/src/bin/opensmt.cc index 0905d4c6a..4244727f7 100644 --- a/src/bin/opensmt.cc +++ b/src/bin/opensmt.cc @@ -207,9 +207,10 @@ void interpretInteractive(Interpret & interpret) { if (rval != 0) interpret.reportError("scanner"); else { - ASTNode const & r = context.getRoot(); - interpret.execute(r); - done = interpret.gotExit(); + for (auto command : context.getRoot()) { + if (rval == 0 and not interpret.gotExit()) { interpret.interp(command); } + delete command; + } } add_history(parse_buf); pb_sz = 0; From 37e479a4d2b7bbe334a79b9485b6e5a95af1375c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 11:58:26 +0100 Subject: [PATCH 61/76] unit tests: update Config::setOption signature --- test/unit/test_LIAInterpolation.cc | 9 ++-- .../unit/test_ResolutionProofInterpolation.cc | 9 ++-- test/unit/test_UFInterpolation.cc | 45 +++++++------------ 3 files changed, 21 insertions(+), 42 deletions(-) diff --git a/test/unit/test_LIAInterpolation.cc b/test/unit/test_LIAInterpolation.cc index 460da76cb..9d2d568d3 100644 --- a/test/unit/test_LIAInterpolation.cc +++ b/test/unit/test_LIAInterpolation.cc @@ -104,8 +104,7 @@ TEST_F(LIAInterpolationTest, test_Split_ALocal){ PTRef leq3 = logic.mkLeq(y, one); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "test"); PTRef partA = logic.mkAnd(leq1, leq2); PTRef partB = leq3; @@ -138,8 +137,7 @@ TEST_F(LIAInterpolationTest, test_Split_BLocal){ PTRef leq3 = logic.mkLeq(y, one); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "test"); PTRef partB = logic.mkAnd(leq1, leq2); PTRef partA = leq3; @@ -172,8 +170,7 @@ TEST_F(LIAInterpolationTest, test_Split_ABShared) { PTRef leq2 = logic.mkGeq(logic.mkMinus(logic.mkTimes(two, x), y), two); PTRef leq3 = logic.mkLeq(y, one); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "test"); PTRef partA = leq1; PTRef partB = logic.mkAnd(leq2, leq3); diff --git a/test/unit/test_ResolutionProofInterpolation.cc b/test/unit/test_ResolutionProofInterpolation.cc index dffa3cb5b..fd2e0e40f 100644 --- a/test/unit/test_ResolutionProofInterpolation.cc +++ b/test/unit/test_ResolutionProofInterpolation.cc @@ -16,8 +16,7 @@ class ResolutionProofInterpolationTest : public ::testing::Test { protected: ResolutionProofInterpolationTest(): logic{opensmt::Logic_t::QF_UF} {} virtual void SetUp() { - const char* msg; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); solver = std::make_unique(logic, config, "test"); a = logic.mkBoolVar("a"); b = logic.mkBoolVar("c"); @@ -83,8 +82,7 @@ class ResolutionProofInterpolationTestWithReduction : public ::testing::Test { protected: ResolutionProofInterpolationTestWithReduction(): logic{opensmt::Logic_t::QF_UF} {} virtual void SetUp() { - const char* msg; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); // config.setOption(SMTConfig::o_verbosity, SMTOption(2), msg); solver = std::make_unique(logic, config, "test"); a = logic.mkBoolVar("a"); @@ -134,8 +132,7 @@ class ResolutionProofIncrementalInterpolationTest : public ::testing::Test { protected: ResolutionProofIncrementalInterpolationTest(): logic{opensmt::Logic_t::QF_UF} {} virtual void SetUp() { - const char* msg; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); solver = std::make_unique(logic, config, "test"); a = logic.mkBoolVar("a"); b = logic.mkBoolVar("c"); diff --git a/test/unit/test_UFInterpolation.cc b/test/unit/test_UFInterpolation.cc index 6c6e186d1..3e3f531f2 100644 --- a/test/unit/test_UFInterpolation.cc +++ b/test/unit/test_UFInterpolation.cc @@ -54,8 +54,7 @@ TEST_F(UFInterpolationTest, test_SimpleTransitivity){ PTRef eq1 = logic.mkEq(x,y); PTRef eq2 = logic.mkEq(y,z1); PTRef eq3 = logic.mkEq(z1,x); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(eq1); solver.insertFormula(eq2); @@ -81,8 +80,7 @@ TEST_F(UFInterpolationTest, test_SimpleTransitivityReversed){ PTRef eq1 = logic.mkEq(x,y); PTRef eq2 = logic.mkEq(y,z1); PTRef eq3 = logic.mkEq(z1,x); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkNot(eq3)); solver.insertFormula(eq2); @@ -107,8 +105,7 @@ TEST_F(UFInterpolationTest, test_SimpleCongruence){ */ PTRef eq1 = logic.mkEq(x,y); PTRef eq2 = logic.mkEq(logic.mkUninterpFun(f, {x}), logic.mkUninterpFun(f, {y})); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(eq1); solver.insertFormula(logic.mkNot(eq2)); @@ -128,8 +125,7 @@ TEST_F(UFInterpolationTest, test_SimpleCongruenceReversed){ */ PTRef eq1 = logic.mkEq(x,y); PTRef eq2 = logic.mkEq(logic.mkUninterpFun(f, {x}), logic.mkUninterpFun(f, {y})); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkNot(eq2)); solver.insertFormula(eq1); @@ -151,8 +147,7 @@ TEST_F(UFInterpolationTest, test_NotImmediatelyColorableCGraph){ PTRef eqA2 = logic.mkEq(logic.mkUninterpFun(g, {x,z2}),z3); PTRef eqB1 = logic.mkEq(y,z2); PTRef eqB2 = logic.mkEq(logic.mkUninterpFun(g, {z1,y}),z3); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkAnd(eqA1, eqA2)); solver.insertFormula(logic.mkAnd(eqB1, logic.mkNot(eqB2))); @@ -180,8 +175,7 @@ TEST_F(UFInterpolationTest, test_NotImmediatelyColorableCGraphReversed){ PTRef eqB2 = logic.mkEq(logic.mkUninterpFun(g, {x,z2}),z3); PTRef eqA1 = logic.mkEq(y,z2); PTRef eqA2 = logic.mkEq(logic.mkUninterpFun(g, {z1,y}),z3); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkAnd(eqA1, logic.mkNot(eqA2))); solver.insertFormula(logic.mkAnd(eqB1, eqB2)); @@ -219,8 +213,7 @@ TEST_F(UFInterpolationTest, test_JustificationRequired){ PTRef eqB4 = logic.mkEq(y1,z7); PTRef eqB5 = logic.mkEq(z8,y2); PTRef eqB6 = logic.mkEq(y1,y2); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkAnd({eqA1, eqA2, eqA3, eqA4, eqA5, eqA6, eqA7, eqA8})); solver.insertFormula(logic.mkAnd({eqB1, eqB2, eqB3, eqB4, eqB5, logic.mkNot(eqB6)})); @@ -259,8 +252,7 @@ TEST_F(UFInterpolationTest, test_JustificationRequiredReversed){ PTRef eqA4 = logic.mkEq(y1,z7); PTRef eqA5 = logic.mkEq(z8,y2); PTRef eqA6 = logic.mkEq(y1,y2); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkAnd({eqA1, eqA2, eqA3, eqA4, eqA5, logic.mkNot(eqA6)})); solver.insertFormula(logic.mkAnd({eqB1, eqB2, eqB3, eqB4, eqB5, eqB6, eqB7,eqB8})); @@ -286,8 +278,7 @@ TEST_F(UFInterpolationTest, test_SimpleUninterpretedPredicate){ PTRef eq = logic.mkEq(x,y); PTRef px = logic.mkUninterpFun(p, {x}); PTRef py = logic.mkUninterpFun(p, {y}); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(px); solver.insertFormula(eq); @@ -310,8 +301,7 @@ TEST_F(UFInterpolationTest, test_ConstantsConflict){ PTRef d = logic.mkConst(ufsort, "d"); PTRef eqA = logic.mkEq(c,x); PTRef eqB = logic.mkEq(x,d); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(eqA); solver.insertFormula(eqB); @@ -337,8 +327,7 @@ TEST_F(UFInterpolationTest, test_TwoLevelJustification){ PTRef eqA2 = logic.mkEq(logic.mkUninterpFun(f, {z2}), x2); PTRef eqA3 = logic.mkEq(z3,z4); PTRef dis = logic.mkNot(logic.mkEq(x1, x2)); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkAnd({eqA1, eqA2, eqA3, dis})); solver.insertFormula(logic.mkAnd({eqB1, eqB2})); @@ -369,8 +358,7 @@ TEST_F(UFInterpolationTest, test_TwoLevelJustificationDiseqInB){ PTRef eqA2 = logic.mkEq(logic.mkUninterpFun(f, {z2}), x2); PTRef eqA3 = logic.mkEq(z3,z4); PTRef dis = logic.mkNot(logic.mkEq(x1, x2)); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkAnd({eqA1, eqA2, eqA3})); solver.insertFormula(logic.mkAnd({eqB1, eqB2, dis})); @@ -432,8 +420,7 @@ TEST_F(UFInterpolationTest, test_LocalColorInformationInsufficient){ logic.mkNot(logic.mkEq(r1, r2)) }); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkAnd(eqB1, eqB2)); solver.insertFormula(A); @@ -456,8 +443,7 @@ TEST_F(UFInterpolationTest, test_DistinctInA){ PTRef eqA1 = logic.mkEq(x1,x2); PTRef eqA2 = logic.mkEq(x2,x3); PTRef deqB = logic.mkDistinct({x1,x4,x3}); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(logic.mkAnd(eqA1, eqA2)); solver.insertFormula(deqB); @@ -481,8 +467,7 @@ TEST_F(UFInterpolationTest, test_DistinctInB){ PTRef eqB1 = logic.mkEq(x1,x2); PTRef eqB2 = logic.mkEq(x2,x3); PTRef deqA = logic.mkDistinct({x1,x4,x3}); - const char* msg = "ok"; - config.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config.setOption(SMTConfig::o_produce_inter, SMTOption(true)); MainSolver solver(logic, config, "ufinterpolator"); solver.insertFormula(deqA); solver.insertFormula(logic.mkAnd(eqB1, eqB2)); From da7d2b21534171b677352f87d8a0a95ea82d6106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 11:58:51 +0100 Subject: [PATCH 62/76] Parser: printer for nodes --- src/parsers/smt2new/ParseNodePrinter.h | 101 +++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 src/parsers/smt2new/ParseNodePrinter.h diff --git a/src/parsers/smt2new/ParseNodePrinter.h b/src/parsers/smt2new/ParseNodePrinter.h new file mode 100644 index 000000000..7b7955b65 --- /dev/null +++ b/src/parsers/smt2new/ParseNodePrinter.h @@ -0,0 +1,101 @@ +// +// Created by Antti Hyvärinen on 26.10.22. +// + +#ifndef OPENSMT_PARSENODEPRINTER_H +#define OPENSMT_PARSENODEPRINTER_H + +#include "smt2newcontext.h" +#include + +namespace opensmt { + +class nodeToString { +public: + std::string operator()(SymbolNode const & node) { + if (auto str = std::get_if>(&node.name)) { + return {**str}; + } else if (auto specConstNode = std::get_if>(&node.name)) { + return {*(**specConstNode).value}; + } + assert(false); + return {}; + } + std::string operator()(SortNode const & node) { + // Todo: better printing + return operator()(*node.identifier->symbol); + } + std::string operator()(IdentifierNode const & identifier) { + return operator()(*identifier.symbol); + } + std::string operator()(SExpr const * root) { + struct QEl { SExpr const * sexpr; unsigned long count; }; + std::vector childStrings; + std::vector stack; + stack.push_back({root, 0}); + while (not stack.empty()) { + auto & [sexpr, count] = stack.back(); + if (auto vec_p = std::get_if>>(&(*sexpr).data)) { + assert(*vec_p); + auto & vec = **vec_p; + if (count < vec.size()) { + // Note: the order is important since `count` is a reference to `stack` + ++count; + stack.push_back({ vec[count-1], 0 }); + continue; + } + // Vector, all children processed + auto childStringStart = childStrings.end() - vec.size(); + auto siblingString = std::accumulate(childStringStart, childStrings.end(), std::string(), + [](std::string & a, const std::string & b) { + return a += (a.empty() ? "" : " ") + b; + }); + childStrings.erase(childStringStart, childStrings.end()); + childStrings.emplace_back("(" + siblingString + ")"); + } else if (auto constNode = std::get_if>(&(*sexpr).data)) { + assert(*constNode); + childStrings.push_back(*(**constNode).value); + } else if (auto symbolNode = std::get_if>(&(*sexpr).data)) { + assert(*symbolNode); + childStrings.push_back(operator()(**symbolNode)); + } else if (auto string = std::get_if>(&(*sexpr).data)) { + assert(*string); + childStrings.push_back(**string); + } + stack.pop_back(); + } + if (auto sexprVec_p = std::get_if>>(&root->data)) { + auto sexprsString = std::accumulate((*sexprVec_p)->begin(), (*sexprVec_p)->end(), std::string{}, + [this](std::string & a, SExpr const * b) { + return a += (a.empty() ? "" : " ") + operator()(b); + }); + return "(" + sexprsString + ")"; + } else { + assert(childStrings.size() == 1); + return childStrings[0]; + } + } + std::string operator() (AttributeValueNode const & attributeValue) { + if (auto specConst_p = std::get_if>(&attributeValue.value)) { + return {*(**specConst_p).value}; + } else if (auto symbol_p = std::get_if>(&attributeValue.value)) { + return operator()(**symbol_p); + } else if (auto sexprVec_p = std::get_if>>(&attributeValue.value)) { + auto sexprsString = std::accumulate((*sexprVec_p)->begin(), (*sexprVec_p)->end(), std::string("("), + [this](std::string & a, SExpr const * b) { + return a += operator()(b) + ' '; + }); + return sexprsString += ')'; + } else { + assert(false); + return {}; + } + } +}; + + + + + +} +#endif // OPENSMT_PARSENODEPRINTER_H From 6e2fde6e1716cdee44a58952a262ec9e38efb751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:08:25 +0100 Subject: [PATCH 63/76] Split regression: use booleans for options --- regression_splitting/patches/init_unsat-deep.smt2 | 4 ++-- regression_splitting/patches/init_unsat-lookahead.smt2 | 2 +- regression_splitting/patches/init_unsat-scatter.smt2 | 2 +- regression_splitting/patches/iso_brn164-deep.smt2 | 4 ++-- regression_splitting/patches/iso_brn164-lookahead.smt2 | 2 +- regression_splitting/patches/iso_brn164-scatter.smt2 | 2 +- ...ti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 | 4 ++-- ...rski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 | 2 +- ...tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-scatter.smt2 | 2 +- regression_splitting/patches/p2-zenonumeric_s6-deep.smt2 | 4 ++-- regression_splitting/patches/p2-zenonumeric_s6-lookahead.smt2 | 2 +- regression_splitting/patches/p2-zenonumeric_s6-scatter.smt2 | 2 +- regression_splitting/patches/small-deep.smt2 | 4 ++-- regression_splitting/patches/small-lookahead.smt2 | 2 +- regression_splitting/patches/small-scatter.smt2 | 2 +- .../tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 | 4 ++-- ..._startup_simple_startup_3nodes.synchro.base-lookahead.smt2 | 2 +- ...ta_startup_simple_startup_3nodes.synchro.base-scatter.smt2 | 2 +- regression_splitting/patches/unsat-2-incremental-scatter.smt2 | 2 +- regression_splitting/patches/unsat-2-scatter.smt2 | 2 +- regression_splitting/patches/unsat-4-scatter.smt2 | 2 +- 21 files changed, 27 insertions(+), 27 deletions(-) diff --git a/regression_splitting/patches/init_unsat-deep.smt2 b/regression_splitting/patches/init_unsat-deep.smt2 index b5c3b3b6d..bae3d3169 100644 --- a/regression_splitting/patches/init_unsat-deep.smt2 +++ b/regression_splitting/patches/init_unsat-deep.smt2 @@ -1,6 +1,6 @@ 0a1,7 -> (set-option :lookahead-split) -> (set-option :lookahead-score-deep) +> (set-option :lookahead-split true) +> (set-option :lookahead-score-deep true) > (set-option :split-num 64) > (set-option :output-dir "splits_here") > (set-option :test_cube_and_conquer true) diff --git a/regression_splitting/patches/init_unsat-lookahead.smt2 b/regression_splitting/patches/init_unsat-lookahead.smt2 index adce06e9c..e5e311432 100644 --- a/regression_splitting/patches/init_unsat-lookahead.smt2 +++ b/regression_splitting/patches/init_unsat-lookahead.smt2 @@ -1,5 +1,5 @@ 0a1,6 -> (set-option :lookahead-split) +> (set-option :lookahead-split true) > (set-option :split-num 64) > (set-option :output-dir "splits_here") > (set-option :test_cube_and_conquer true) diff --git a/regression_splitting/patches/init_unsat-scatter.smt2 b/regression_splitting/patches/init_unsat-scatter.smt2 index 174d6ae1d..b62b0762d 100644 --- a/regression_splitting/patches/init_unsat-scatter.smt2 +++ b/regression_splitting/patches/init_unsat-scatter.smt2 @@ -1,4 +1,4 @@ 0a1,3 -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 2) > (set-option :output-dir "split_and_solve_work") diff --git a/regression_splitting/patches/iso_brn164-deep.smt2 b/regression_splitting/patches/iso_brn164-deep.smt2 index 3895a8cd7..5963f7e45 100644 --- a/regression_splitting/patches/iso_brn164-deep.smt2 +++ b/regression_splitting/patches/iso_brn164-deep.smt2 @@ -1,8 +1,8 @@ 0a1 -> (set-option :lookahead-split) +> (set-option :lookahead-split true) 5a7,13 > -> (set-option :lookahead-score-deep) +> (set-option :lookahead-score-deep true) > (set-option :split-num 16) > (set-option :output-dir "splits_here") > diff --git a/regression_splitting/patches/iso_brn164-lookahead.smt2 b/regression_splitting/patches/iso_brn164-lookahead.smt2 index 97a45b792..ed972d1c1 100644 --- a/regression_splitting/patches/iso_brn164-lookahead.smt2 +++ b/regression_splitting/patches/iso_brn164-lookahead.smt2 @@ -1,5 +1,5 @@ 0a1 -> (set-option :lookahead-split) +> (set-option :lookahead-split true) 5a7,12 > > (set-option :split-num 16) diff --git a/regression_splitting/patches/iso_brn164-scatter.smt2 b/regression_splitting/patches/iso_brn164-scatter.smt2 index 174d6ae1d..b62b0762d 100644 --- a/regression_splitting/patches/iso_brn164-scatter.smt2 +++ b/regression_splitting/patches/iso_brn164-scatter.smt2 @@ -1,4 +1,4 @@ 0a1,3 -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 2) > (set-option :output-dir "split_and_solve_work") diff --git a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 index b5c3b3b6d..bae3d3169 100644 --- a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 +++ b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 @@ -1,6 +1,6 @@ 0a1,7 -> (set-option :lookahead-split) -> (set-option :lookahead-score-deep) +> (set-option :lookahead-split true) +> (set-option :lookahead-score-deep true) > (set-option :split-num 64) > (set-option :output-dir "splits_here") > (set-option :test_cube_and_conquer true) diff --git a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 index adce06e9c..e5e311432 100644 --- a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 +++ b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 @@ -1,5 +1,5 @@ 0a1,6 -> (set-option :lookahead-split) +> (set-option :lookahead-split true) > (set-option :split-num 64) > (set-option :output-dir "splits_here") > (set-option :test_cube_and_conquer true) diff --git a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-scatter.smt2 b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-scatter.smt2 index 174d6ae1d..b62b0762d 100644 --- a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-scatter.smt2 +++ b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-scatter.smt2 @@ -1,4 +1,4 @@ 0a1,3 -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 2) > (set-option :output-dir "split_and_solve_work") diff --git a/regression_splitting/patches/p2-zenonumeric_s6-deep.smt2 b/regression_splitting/patches/p2-zenonumeric_s6-deep.smt2 index f9ac28b0f..ec8b943a1 100644 --- a/regression_splitting/patches/p2-zenonumeric_s6-deep.smt2 +++ b/regression_splitting/patches/p2-zenonumeric_s6-deep.smt2 @@ -1,6 +1,6 @@ 0a1,7 -> (set-option :lookahead-split) -> (set-option :lookahead-score-deep) +> (set-option :lookahead-split true) +> (set-option :lookahead-score-deep true) > (set-option :split-num 8) > (set-option :output-dir "split_and_solve_work") > diff --git a/regression_splitting/patches/p2-zenonumeric_s6-lookahead.smt2 b/regression_splitting/patches/p2-zenonumeric_s6-lookahead.smt2 index 0a4dc745c..1cf4241c0 100644 --- a/regression_splitting/patches/p2-zenonumeric_s6-lookahead.smt2 +++ b/regression_splitting/patches/p2-zenonumeric_s6-lookahead.smt2 @@ -1,5 +1,5 @@ 0a1,6 -> (set-option :lookahead-split) +> (set-option :lookahead-split true) > (set-option :split-num 8) > (set-option :output-dir "split_and_solve_work") > diff --git a/regression_splitting/patches/p2-zenonumeric_s6-scatter.smt2 b/regression_splitting/patches/p2-zenonumeric_s6-scatter.smt2 index 174d6ae1d..b62b0762d 100644 --- a/regression_splitting/patches/p2-zenonumeric_s6-scatter.smt2 +++ b/regression_splitting/patches/p2-zenonumeric_s6-scatter.smt2 @@ -1,4 +1,4 @@ 0a1,3 -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 2) > (set-option :output-dir "split_and_solve_work") diff --git a/regression_splitting/patches/small-deep.smt2 b/regression_splitting/patches/small-deep.smt2 index f8f344e49..9c1055d62 100644 --- a/regression_splitting/patches/small-deep.smt2 +++ b/regression_splitting/patches/small-deep.smt2 @@ -1,6 +1,6 @@ 0a1,5 -> (set-option :lookahead-split) -> (set-option :lookahead-score-deep) +> (set-option :lookahead-split true) +> (set-option :lookahead-score-deep true) > (set-option :output-dir "splits_here") > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/small-lookahead.smt2 b/regression_splitting/patches/small-lookahead.smt2 index bf0c4982f..06cac6312 100644 --- a/regression_splitting/patches/small-lookahead.smt2 +++ b/regression_splitting/patches/small-lookahead.smt2 @@ -1,5 +1,5 @@ 0a4 -> (set-option :lookahead-split) +> (set-option :lookahead-split true) > (set-option :output-dir "splits_here") > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/small-scatter.smt2 b/regression_splitting/patches/small-scatter.smt2 index 174d6ae1d..b62b0762d 100644 --- a/regression_splitting/patches/small-scatter.smt2 +++ b/regression_splitting/patches/small-scatter.smt2 @@ -1,4 +1,4 @@ 0a1,3 -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 2) > (set-option :output-dir "split_and_solve_work") diff --git a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 index b5c3b3b6d..bae3d3169 100644 --- a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 +++ b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 @@ -1,6 +1,6 @@ 0a1,7 -> (set-option :lookahead-split) -> (set-option :lookahead-score-deep) +> (set-option :lookahead-split true) +> (set-option :lookahead-score-deep true) > (set-option :split-num 64) > (set-option :output-dir "splits_here") > (set-option :test_cube_and_conquer true) diff --git a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 index adce06e9c..e5e311432 100644 --- a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 +++ b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 @@ -1,5 +1,5 @@ 0a1,6 -> (set-option :lookahead-split) +> (set-option :lookahead-split true) > (set-option :split-num 64) > (set-option :output-dir "splits_here") > (set-option :test_cube_and_conquer true) diff --git a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-scatter.smt2 b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-scatter.smt2 index 174d6ae1d..b62b0762d 100644 --- a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-scatter.smt2 +++ b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-scatter.smt2 @@ -1,4 +1,4 @@ 0a1,3 -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 2) > (set-option :output-dir "split_and_solve_work") diff --git a/regression_splitting/patches/unsat-2-incremental-scatter.smt2 b/regression_splitting/patches/unsat-2-incremental-scatter.smt2 index 6d5e7a634..17607b1bc 100644 --- a/regression_splitting/patches/unsat-2-incremental-scatter.smt2 +++ b/regression_splitting/patches/unsat-2-incremental-scatter.smt2 @@ -1,6 +1,6 @@ 0a1,4 > -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 2) > (set-option :output-dir "split_and_solve_work") 9c13,14 diff --git a/regression_splitting/patches/unsat-2-scatter.smt2 b/regression_splitting/patches/unsat-2-scatter.smt2 index 174d6ae1d..b62b0762d 100644 --- a/regression_splitting/patches/unsat-2-scatter.smt2 +++ b/regression_splitting/patches/unsat-2-scatter.smt2 @@ -1,4 +1,4 @@ 0a1,3 -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 2) > (set-option :output-dir "split_and_solve_work") diff --git a/regression_splitting/patches/unsat-4-scatter.smt2 b/regression_splitting/patches/unsat-4-scatter.smt2 index 7a1d24d85..0e207bc02 100644 --- a/regression_splitting/patches/unsat-4-scatter.smt2 +++ b/regression_splitting/patches/unsat-4-scatter.smt2 @@ -1,4 +1,4 @@ 0a1,3 -> (set-option :scatter-split) +> (set-option :scatter-split true) > (set-option :split-num 4) > (set-option :output-dir "split_and_solve_work") From 2e4ce844d8876b0ae3250eb1c1599f0ea3f89027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:09:08 +0100 Subject: [PATCH 64/76] Split regression: Use correct output directory --- regression_splitting/patches/init_unsat-deep.smt2 | 2 +- regression_splitting/patches/init_unsat-lookahead.smt2 | 2 +- regression_splitting/patches/iso_brn164-deep.smt2 | 2 +- regression_splitting/patches/iso_brn164-lookahead.smt2 | 2 +- ...meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 | 2 +- ...tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 | 2 +- regression_splitting/patches/small-deep.smt2 | 2 +- regression_splitting/patches/small-lookahead.smt2 | 2 +- .../tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 | 2 +- ...ta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/regression_splitting/patches/init_unsat-deep.smt2 b/regression_splitting/patches/init_unsat-deep.smt2 index bae3d3169..0c2b2cfd1 100644 --- a/regression_splitting/patches/init_unsat-deep.smt2 +++ b/regression_splitting/patches/init_unsat-deep.smt2 @@ -2,7 +2,7 @@ > (set-option :lookahead-split true) > (set-option :lookahead-score-deep true) > (set-option :split-num 64) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > (set-option :test_cube_and_conquer true) > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/init_unsat-lookahead.smt2 b/regression_splitting/patches/init_unsat-lookahead.smt2 index e5e311432..d75fbcfb0 100644 --- a/regression_splitting/patches/init_unsat-lookahead.smt2 +++ b/regression_splitting/patches/init_unsat-lookahead.smt2 @@ -1,7 +1,7 @@ 0a1,6 > (set-option :lookahead-split true) > (set-option :split-num 64) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > (set-option :test_cube_and_conquer true) > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/iso_brn164-deep.smt2 b/regression_splitting/patches/iso_brn164-deep.smt2 index 5963f7e45..361f5751b 100644 --- a/regression_splitting/patches/iso_brn164-deep.smt2 +++ b/regression_splitting/patches/iso_brn164-deep.smt2 @@ -4,7 +4,7 @@ > > (set-option :lookahead-score-deep true) > (set-option :split-num 16) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/iso_brn164-lookahead.smt2 b/regression_splitting/patches/iso_brn164-lookahead.smt2 index ed972d1c1..b23767ab6 100644 --- a/regression_splitting/patches/iso_brn164-lookahead.smt2 +++ b/regression_splitting/patches/iso_brn164-lookahead.smt2 @@ -3,7 +3,7 @@ 5a7,12 > > (set-option :split-num 16) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 index bae3d3169..0c2b2cfd1 100644 --- a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 +++ b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-deep.smt2 @@ -2,7 +2,7 @@ > (set-option :lookahead-split true) > (set-option :lookahead-score-deep true) > (set-option :split-num 64) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > (set-option :test_cube_and_conquer true) > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 index e5e311432..d75fbcfb0 100644 --- a/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 +++ b/regression_splitting/patches/meti-tarski_sqrt_1mcosq_7_sqrt-1mcosq-7-chunk-0100-lookahead.smt2 @@ -1,7 +1,7 @@ 0a1,6 > (set-option :lookahead-split true) > (set-option :split-num 64) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > (set-option :test_cube_and_conquer true) > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/small-deep.smt2 b/regression_splitting/patches/small-deep.smt2 index 9c1055d62..3b75dcd7f 100644 --- a/regression_splitting/patches/small-deep.smt2 +++ b/regression_splitting/patches/small-deep.smt2 @@ -1,6 +1,6 @@ 0a1,5 > (set-option :lookahead-split true) > (set-option :lookahead-score-deep true) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/small-lookahead.smt2 b/regression_splitting/patches/small-lookahead.smt2 index 06cac6312..355f75c61 100644 --- a/regression_splitting/patches/small-lookahead.smt2 +++ b/regression_splitting/patches/small-lookahead.smt2 @@ -1,5 +1,5 @@ 0a4 > (set-option :lookahead-split true) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 index bae3d3169..0c2b2cfd1 100644 --- a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 +++ b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-deep.smt2 @@ -2,7 +2,7 @@ > (set-option :lookahead-split true) > (set-option :lookahead-score-deep true) > (set-option :split-num 64) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > (set-option :test_cube_and_conquer true) > (set-option :split-format-length "brief") > (set-option :split-format smt2) diff --git a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 index e5e311432..d75fbcfb0 100644 --- a/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 +++ b/regression_splitting/patches/tta_startup_simple_startup_3nodes.synchro.base-lookahead.smt2 @@ -1,7 +1,7 @@ 0a1,6 > (set-option :lookahead-split true) > (set-option :split-num 64) -> (set-option :output-dir "splits_here") +> (set-option :output-dir "split_and_solve_work") > (set-option :test_cube_and_conquer true) > (set-option :split-format-length "brief") > (set-option :split-format smt2) From 4300d21dde9b0b0013d29fa494b101bf24d7fa8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:10:23 +0100 Subject: [PATCH 65/76] SplitterInterpret: Reintroduce splitting --- src/api/Interpret.cc | 5 +++++ src/api/Interpret.h | 1 + src/parallel/SplitterInterpret.cc | 19 ++++++++++++++++++- src/parallel/SplitterInterpret.h | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index 5ef824dbc..dd0286174 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -312,6 +312,10 @@ void Interpret::interp(CheckSatNode const &) { notify_formatted(true, "Illegal command before set-logic: check-sat"); return; } + (void)checkSat(); +} + +sstat Interpret::checkSat() { sstat res; res = main_solver->check(); @@ -341,6 +345,7 @@ void Interpret::interp(CheckSatNode const &) { if (!o_dump_state.isEmpty() && o_split == spt_none) writeState(name); } + return res; } namespace { diff --git a/src/api/Interpret.h b/src/api/Interpret.h index 372cb6c8f..57f208942 100644 --- a/src/api/Interpret.h +++ b/src/api/Interpret.h @@ -188,6 +188,7 @@ class Interpret { PTRef resolveQualifiedIdentifier(std::string const & name, SortNode const & sort, bool isQuoted); SRef sortFromSortNode(SortNode const & node) const; + virtual sstat checkSat(); virtual std::unique_ptr createMainSolver(std::string const & logic_name); public: diff --git a/src/parallel/SplitterInterpret.cc b/src/parallel/SplitterInterpret.cc index 30390a7a9..0c7831da0 100644 --- a/src/parallel/SplitterInterpret.cc +++ b/src/parallel/SplitterInterpret.cc @@ -44,4 +44,21 @@ sstat SplitterInterpret::interpSMTContent(char *content, vec SplitterInterpret::createMainSolver(std::string const & logic_name) { + if (config.sat_split_type() != spt_none) { + auto th = MainSolver::createTheory(*logic, config); + auto tm = std::make_unique(*logic); + auto thandler = new THandler(*th, *tm); + return std::make_unique(std::move(th), + std::move(tm), + std::unique_ptr(thandler), + MainSplitter::createInnerSolver(config, *thandler, channel), + *logic, + config, + std::string(logic_name) + + " splitter"); + } else + return std::make_unique(*logic, config, std::string(logic_name) + " solver"); +} diff --git a/src/parallel/SplitterInterpret.h b/src/parallel/SplitterInterpret.h index ee35a6b55..86f245b3c 100644 --- a/src/parallel/SplitterInterpret.h +++ b/src/parallel/SplitterInterpret.h @@ -18,6 +18,7 @@ class SplitterInterpret : public Interpret { protected: void writeSplits(std::string const & filename); + std::unique_ptr createMainSolver(std::string const & logic_name) override; sstat checkSat() override; void exit() override { return; } From b5c2e370204ab55b0525707ac8d890470f1cc6ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:11:38 +0100 Subject: [PATCH 66/76] SplitterInterpret: Fix handling of output file name --- src/options/SMTConfig.h | 2 +- src/parallel/SplitterInterpret.cc | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index bf7924f04..896ee5c4a 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -462,7 +462,7 @@ struct SMTConfig inline void setLRAStrengthFactor(const char *factor) { insertOption(o_itp_lra_factor, SMTOption(factor)); } - inline void setInstanceName(const char* name) { insertOption(o_inst_name, SMTOption(name)); } + inline void setInstanceName(std::string && name) { insertOption(o_inst_name, SMTOption(std::move(name))); } // Get interpolation algorithms inline ItpAlgorithm getBooleanInterpolationAlgorithm() const { diff --git a/src/parallel/SplitterInterpret.cc b/src/parallel/SplitterInterpret.cc index 0c7831da0..7e5ba81e3 100644 --- a/src/parallel/SplitterInterpret.cc +++ b/src/parallel/SplitterInterpret.cc @@ -28,7 +28,10 @@ sstat SplitterInterpret::checkSat() { auto name = config.dump_state(); sstat res = Interpret::checkSat(); - if (res == s_Undef and not config.output_dir().empty()) { + if (res == s_Undef) { + if (not config.output_dir().empty()) { + name = config.output_dir().append(name, name.rfind('/'), std::string::npos); + } writeSplits(name); } return res; From f2a1632cc3fa46350bf860ff62933118b5386ca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:12:09 +0100 Subject: [PATCH 67/76] SplitterInterpret: use signed integers in options --- src/options/SMTConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/options/SMTConfig.h b/src/options/SMTConfig.h index 896ee5c4a..77e25cc7e 100644 --- a/src/options/SMTConfig.h +++ b/src/options/SMTConfig.h @@ -736,7 +736,7 @@ struct SMTConfig optionTable.at(o_sat_split_midtune).getDoubleVal() : -1; } - uint32_t sat_split_num() const { + int sat_split_num() const { return optionTable.find(o_sat_split_num) != optionTable.end() ? optionTable.at(o_sat_split_num).getIntVal() : 2; From 8d291f397f1dce078fd5fc1c67aa4edb3970d02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:12:40 +0100 Subject: [PATCH 68/76] SplitterInterpret: fix initialization --- src/parallel/opensmtSplitter.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/parallel/opensmtSplitter.cc b/src/parallel/opensmtSplitter.cc index 05246e187..c17d949a4 100644 --- a/src/parallel/opensmtSplitter.cc +++ b/src/parallel/opensmtSplitter.cc @@ -81,17 +81,14 @@ int main( int argc, char * argv[] ) // context.getConfig( ).printHelp( ); break; case 'd': - const char* msg; - c.setOption(SMTConfig::o_dryrun, SMTOption(true), msg); + c.setOption(SMTConfig::o_dryrun, SMTOption(true)); break; case 'r': - if (!c.setOption(SMTConfig::o_random_seed, SMTOption(atoi(optarg)), msg)) - fprintf(stderr, "Error setting random seed: %s\n", msg); - else - fprintf(stderr, "; Using random seed %d\n", atoi(optarg)); + c.setOption(SMTConfig::o_random_seed, SMTOption(atoi(optarg))); + fprintf(stderr, "; Using random seed %d\n", atoi(optarg)); break; case 'i': - c.setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + c.setOption(SMTConfig::o_produce_inter, SMTOption(true)); break; case 'p': pipe = true; @@ -189,13 +186,14 @@ void interpretInteractive(SplitterInterpret & interpret) { // Parsing should be done from a string that I get from the readline // library. Smt2newContext context(parse_buf); - int rval = smt2newparse(&context); + int rval = yyparse(&context); if (rval != 0) interpret.reportError("scanner"); else { - const ASTNode* r = context.getRoot(); - interpret.execute(r); - done = interpret.gotExit(); + for (auto command : context.getRoot()) { + if (rval == 0 and not interpret.gotExit()) { interpret.interp(command); } + delete command; + } } add_history(parse_buf); pb_sz = 0; From 9b7934ec786aaad580dd32bcfff79abbe4b743a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:13:44 +0100 Subject: [PATCH 69/76] Regression: Fix error message --- regression/QF_BV/bar.smt2.expected.out | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression/QF_BV/bar.smt2.expected.out b/regression/QF_BV/bar.smt2.expected.out index a4cf0f18f..dc2c1f94f 100644 --- a/regression/QF_BV/bar.smt2.expected.out +++ b/regression/QF_BV/bar.smt2.expected.out @@ -1 +1 @@ -At line 4: syntax error, unexpected TK_SYM, expecting TK_NUM or ')' +At line 4: syntax error, unexpected TK_SYM, expecting TK_INT or ')' From 6ce1801cca52446302d7240f950d063a6d4db2bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:29:52 +0100 Subject: [PATCH 70/76] examples: fix setOption signature --- examples/test_itp.cc | 6 ++---- examples/test_lra_itp.cc | 6 ++---- examples/test_lra_value.cc | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/examples/test_itp.cc b/examples/test_itp.cc index 350f7bcb0..0a76396e6 100644 --- a/examples/test_itp.cc +++ b/examples/test_itp.cc @@ -5,8 +5,7 @@ Opensmt* pre() { auto config = std::make_unique(); - const char* msg; - config->setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config->setOption(SMTConfig::o_produce_inter, SMTOption(true)); Opensmt* osmt = new Opensmt(opensmt_logic::qf_lra, "test solver", std::move(config)); return osmt; } @@ -50,8 +49,7 @@ int main() { printf("unsat\n"); // Set labeling function - const char* msg; - c.setOption(SMTConfig::o_itp_bool_alg, SMTOption(0), msg); + c.setOption(SMTConfig::o_itp_bool_alg, SMTOption(0)); auto itp_context = mainSolver.getInterpolationContext(); // Create the partitioning mask diff --git a/examples/test_lra_itp.cc b/examples/test_lra_itp.cc index 8a2196c1f..ff5567a27 100644 --- a/examples/test_lra_itp.cc +++ b/examples/test_lra_itp.cc @@ -5,8 +5,7 @@ Opensmt* pre() { auto config = std::make_unique(); - const char* msg; - config->setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config->setOption(SMTConfig::o_produce_inter, SMTOption(true)); Opensmt* osmt = new Opensmt(opensmt_logic::qf_lra, "test solver", std::move(config)); return osmt; } @@ -57,8 +56,7 @@ int main() { printf("unsat\n"); // Set labeling function - const char* msg; - c.setOption(SMTConfig::o_itp_bool_alg, SMTOption(0), msg); + c.setOption(SMTConfig::o_itp_bool_alg, SMTOption(0)); // Create the proof graph auto itp_context = mainSolver.getInterpolationContext(); diff --git a/examples/test_lra_value.cc b/examples/test_lra_value.cc index 2a738dc49..3ad3d6c2a 100644 --- a/examples/test_lra_value.cc +++ b/examples/test_lra_value.cc @@ -5,8 +5,7 @@ Opensmt* pre() { auto config = std::unique_ptr(new SMTConfig()); - const char* msg; - config->setOption(SMTConfig::o_produce_inter, SMTOption(true), msg); + config->setOption(SMTConfig::o_produce_inter, SMTOption(true)); Opensmt* osmt = new Opensmt(opensmt_logic::qf_lra, "test solver", std::move(config)); return osmt; } @@ -90,8 +89,7 @@ int main() { printf("unsat\n"); // Set labeling function - const char* msg; - c.setOption(SMTConfig::o_itp_bool_alg, SMTOption(0), msg); + c.setOption(SMTConfig::o_itp_bool_alg, SMTOption(0)); auto itp_context = mainSolver.getInterpolationContext(); // Create the partitioning mask From d1b7ec46853ef7a416d2c33abbeb68c3d7a5026b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:30:19 +0100 Subject: [PATCH 71/76] Build: add missing includes to install --- src/common/CMakeLists.txt | 2 +- src/parsers/smt2new/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 57bc56054..5e0d21f3a 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -24,7 +24,7 @@ target_sources(common install(FILES Integer.h Number.h FastRational.h XAlloc.h Alloc.h StringMap.h Timer.h osmtinttypes.h TreeOps.h Real.h FlaPartitionMap.h PartitionInfo.h OsmtApiException.h TypeUtils.h - NumberUtils.h NatSet.h + NumberUtils.h NatSet.h OsmtInternalException.h DESTINATION ${INSTALL_HEADERS_DIR}) diff --git a/src/parsers/smt2new/CMakeLists.txt b/src/parsers/smt2new/CMakeLists.txt index 290fabfa6..e0f4f326b 100644 --- a/src/parsers/smt2new/CMakeLists.txt +++ b/src/parsers/smt2new/CMakeLists.txt @@ -24,5 +24,5 @@ target_sources(parsers target_compile_options(parsers PRIVATE -Wno-error) -install(FILES smt2newcontext.h +install(FILES smt2newcontext.h ParseNodePrinter.h DESTINATION ${INSTALL_HEADERS_DIR}) From 1942dfd81241c2194cb1eec82f9f28c742406c08 Mon Sep 17 00:00:00 2001 From: aehyvari Date: Mon, 31 Oct 2022 17:51:00 +0100 Subject: [PATCH 72/76] Parser: add missing include --- src/parsers/smt2new/smt2newcontext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/parsers/smt2new/smt2newcontext.h b/src/parsers/smt2new/smt2newcontext.h index d273e3ac3..1584af7cc 100644 --- a/src/parsers/smt2new/smt2newcontext.h +++ b/src/parsers/smt2new/smt2newcontext.h @@ -32,6 +32,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include enum class ConstType { integral, From a5c57335da7df9f8076582b83bc05057b36c0187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 17:57:27 +0100 Subject: [PATCH 73/76] parser: remove handwritten parser --- src/api/handwritten.h | 253 ------------------------------------------ 1 file changed, 253 deletions(-) delete mode 100644 src/api/handwritten.h diff --git a/src/api/handwritten.h b/src/api/handwritten.h deleted file mode 100644 index 0b70dab35..000000000 --- a/src/api/handwritten.h +++ /dev/null @@ -1,253 +0,0 @@ -// -// Created by Antti Hyvarinen on 29.08.22. -// - -#ifndef OPENSMT_HANDWRITTEN_H -#define OPENSMT_HANDWRITTEN_H -#include "smt2tokens.h" - -#include -#include -#include -#include -#include - - -class OsmtParserException: public std::exception { - std::string msg; -public: - OsmtParserException(const std::string & msg) : msg(msg) {} - virtual const char* what() const noexcept override { return msg.c_str(); } -}; - -class Expr {}; -class EmptyExpr : public Expr {}; -class DeclareFun : public Expr {}; - -struct Token { - std::string name; - osmttokens::token token; - opensmt::pair pos = {0, 0}; - Expr * parsedType = nullptr; -}; - -struct SExpr { - std::variant> data; - std::string toString() const { - if (auto token_p = std::get_if(&data)) { - return (token_p->name); - } else if (auto vec_p = std::get_if>(&data)) { - std::string out = "("; - for (unsigned long i = 0; i != vec_p->size(); ++i) { - out += (*vec_p)[i]->toString() + (i == vec_p->size()-1 ? "" : " "); - } - out += ")"; - return out; - } - assert(false); - return {}; - } -}; - -class SExprParser { - std::istream & input; - char token = 0; - std::vector stack; - uint32_t line = 0; - uint32_t column = 0; - - static bool isWhiteSpace(char token) { - return (token == ' ' or token == '\t' or token == '\r' or token == '\n'); - } - - char get() { - auto c = static_cast(input.get()); - if (c == '\n') { ++ line; column = 0; } - ++ column; - return c; - } - - void advance(bool comments = true) { - token = get(); - if (comments and token == ';') { - while (token != '\n' and token != 0) { - token = static_cast(get()); - } - } - } - - void skipWhitespace() { - while (isWhiteSpace(token)) { - advance(); - } - } - - osmttokens::token resolveToken(std::string const & name) { - if (osmttokens::nameToToken.find(name) != osmttokens::nameToToken.end()) { - return osmttokens::nameToToken.at(name); - } else { - return osmttokens::t_none; - } - } - - Token parseToken() { - std::string result; - skipWhitespace(); - opensmt::pair tokenStartPos {line, column}; - bool inQuotedSymbol = token == '|'; - bool inString = token == '"'; - bool isString = inString; - - if (inQuotedSymbol) { - advance(false); - } - while (token != 0) { - char c = token; - if (inQuotedSymbol and c == '|') { - advance(); - break; - } else if (inString and result.size() > 1 and c == '"') { - inString = false; - } else if (not inQuotedSymbol and not inString and (isWhiteSpace(token) or c == '(' or c == ')')) { - break; - } - result.push_back(c); - advance(not inString and not inQuotedSymbol); - } - osmttokens::token type = isString ? osmttokens::t_STRING : resolveToken(result); - return {result, type, tokenStartPos}; - } - - void parseError(std::string const & error) { - throw OsmtParserException("At line " + std::to_string(line) + ", column " + std::to_string(column) + ": " + error); - } - -public: - SExprParser(std::istream & input) : input(input), token(' '), line(1) {} - - bool isEOF() { - skipWhitespace(); - return input.eof(); - } - - SExpr * parseExpr() { - while (not isEOF()) { - skipWhitespace(); - if (token == '(') { - stack.emplace_back(new SExpr{std::vector()}); - advance(); - skipWhitespace(); - } else if (token == ')') { - if (stack.empty()) { - parseError("Unexpected `" + std::string(1, token) + "`"); - } else if (stack.size() == 1) { - advance(); - skipWhitespace(); - break; - } else { - // Copy the contents of this stack to the SExpr in the previous frame. - auto & prevData = std::get>((stack.rbegin()[1])->data); - prevData.emplace_back(stack.back()); - assert(stack.size() > 1); - stack.pop_back(); - advance(); - skipWhitespace(); - } - } else { - if (stack.empty()) { - parseError("Expected `(` or `;`, got " + std::string(1, token)); - } - assert(not stack.empty()); - auto & currentData = std::get>(stack.back()->data); - currentData.emplace_back(new SExpr{parseToken()}); - } - } - if (stack.size() != 1) { - parseError("Unexpected EOF"); - } - assert(stack.size() == 1); - auto res = stack[0]; - stack.pop_back(); - return res; - } -}; - -class HandWrittenParser { - std::istream & input; - -public: - HandWrittenParser(std::istream & input) : input(input) {} - template void traverse(SExpr * root, F & op) { - struct Qel { SExpr * node; uint32_t processed; }; - std::vector queue; - queue.emplace_back(Qel{root, static_cast(0)}); - while (not queue.empty()) { - auto & [node, processed] = queue.back(); - auto children = std::get_if>(&node->data); - if (children and processed < children->size()) { - ++ processed; - queue.emplace_back(Qel{(*children)[processed-1], 0}); - continue; - } - assert(not children or processed == children->size()); - assert(node); - op(node); - queue.pop_back(); - } - } - void parse() { - SExprParser parser(input); - class Counter { - uint32_t count = 0; - public: - void operator() (SExpr *) { - ++ count; - } - uint32_t getCount() const { return count; } - }; - class Deleter { - public: - void operator() (SExpr * e) { - delete e; - } - }; - - class Printer { - void error(Token * token, std::string const & msg) { - std::cout << "At line " - << std::to_string(token->pos.first) - << " column " - << std::to_string(token->pos.second) - << ", " - << token->name << " " << msg << std::endl; - } - public: - Expr * operator() (SExpr * e) { - if (auto expr_p = std::get_if>(&e->data)) { - if (expr_p->empty()) { return new EmptyExpr(); } - if (auto token_p = std::get_if(&((*expr_p)[0])->data)) { - if (token_p->token == osmttokens::t_declarefun) { - if (expr_p->size() != 3) { error(token_p, "expected 3 arguments"); } - } - } - } - return nullptr; - } - }; -// Counter counter; - Printer printer; - Deleter deleter; - while (not parser.isEOF()) { - try { - auto sexpr = parser.parseExpr(); - traverse(sexpr, printer); - traverse(sexpr, deleter); - } catch (OsmtParserException const & e) { - std::cout << e.what() << std::endl; - break; - } - } -// std::cout << std::to_string(counter.getCount()) << std::endl; - } -}; -#endif // OPENSMT_HANDWRITTEN_H \ No newline at end of file From 5e195daf20bf05a8a5a01e9b1525c46b811f7b98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 18:27:06 +0100 Subject: [PATCH 74/76] Interpret: Throw error on forall and exists --- src/api/Interpret.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/api/Interpret.cc b/src/api/Interpret.cc index dd0286174..9eeff78a9 100644 --- a/src/api/Interpret.cc +++ b/src/api/Interpret.cc @@ -679,9 +679,11 @@ PTRef Interpret::parseTerm(NormalTermNode const * term, LetRecords & letRecords) } PTRef Interpret::parseTerm(ForallNode const *, LetRecords &) { + throw OsmtApiException("Forall not implemented"); return PTRef_Undef; } PTRef Interpret::parseTerm(ExistsNode const *, LetRecords &) { + throw OsmtApiException("Exists not implemented"); return PTRef_Undef; } From 9a5ad2d4e09a01af8433953fefa70b8881fafd5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 18:27:36 +0100 Subject: [PATCH 75/76] Parser: remove unused structure --- src/api/smt2tokens.h | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/src/api/smt2tokens.h b/src/api/smt2tokens.h index 20b6035d8..42aa1e683 100644 --- a/src/api/smt2tokens.h +++ b/src/api/smt2tokens.h @@ -150,44 +150,7 @@ namespace osmttokens { {t_let, "let"}, {t_echo, "echo"} }; - inline const std::unordered_map nameToToken = { - {"none", t_none}, - {"as", t_as}, - {"decimal", t_DECIMAL}, - {"numeral", t_NUMERAL}, - {"par", t_par}, - {"string", t_STRING}, - {"exists", t_exists}, - {"forall", t_forall}, - {"assert", t_assert}, - {"check-sat", t_checksat}, - {"declare-sort", t_declaresort}, - {"define-sort", t_definesort}, - {"declare-fun", t_declarefun}, - {"declare-const", t_declareconst}, - {"define-fun", t_definefun}, - {"exit", t_exit}, - {"get-assertions", t_getassertions}, - {"get-assignment", t_getassignment}, - {"get-info", t_getinfo}, - {"set-info", t_setinfo}, - {"get-option", t_getoption}, - {"set-option", t_setoption}, - {"get-proof", t_getproof}, - {"get-unsat-core", t_getunsatcore}, - {"get-value", t_getvalue}, - {"get-model", t_getmodel}, - {"pop", t_pop}, - {"push", t_push}, - {"set-logic", t_setlogic}, - {"get-interpolants", t_getinterpolants}, - {"theory", t_theory}, - {"write-state", t_writestate}, - {"read-state", t_readstate}, - {"simplify", t_simplify}, - {"let", t_let}, - {"echo", t_echo} - }; + struct smt2token { token x; }; From ecac43e8f9f6ed6fbd88d0a71518f1247e1a3b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Hyv=C3=A4rinen?= Date: Mon, 31 Oct 2022 18:27:57 +0100 Subject: [PATCH 76/76] unit test: remove empty test --- test/unit/CMakeLists.txt | 8 -------- test/unit/test_ParserSymbols.cc | 11 ----------- 2 files changed, 19 deletions(-) delete mode 100644 test/unit/test_ParserSymbols.cc diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 11fa1a79f..610f6a073 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -245,11 +245,3 @@ PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/test_SATSolverTypes.cc" target_link_libraries(SATSolverTypesTest OpenSMT gtest gtest_main) gtest_add_tests(TARGET SATSolverTypesTest) - -add_executable(ParserSymbolsTest) -target_sources(ParserSymbolsTest -PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/test_ParserSymbols.cc" -) - -target_link_libraries(ParserSymbolsTest OpenSMT gtest gtest_main) -gtest_add_tests(TARGET ParserSymbolsTest) diff --git a/test/unit/test_ParserSymbols.cc b/test/unit/test_ParserSymbols.cc deleted file mode 100644 index 0e98f2fc4..000000000 --- a/test/unit/test_ParserSymbols.cc +++ /dev/null @@ -1,11 +0,0 @@ -// -// Created by Antti Hyvärinen on 20.09.22. -// - -#include -#include - -TEST(ParserSymbolsTest, test_DeclareSort) { -// auto str = new std::string("foo"); -// (void)SymbolNode{{}, std::unique_ptr(str), false}; -} \ No newline at end of file