diff options
| author | ajreynol <andrew.j.reynolds@gmail.com> | 2016-11-01 14:23:30 -0500 |
|---|---|---|
| committer | ajreynol <andrew.j.reynolds@gmail.com> | 2016-11-01 14:23:30 -0500 |
| commit | 9b3c5499d253e964c7bf0239271940ac756a67fb (patch) | |
| tree | 456727dbcf64624bcb91d4d01bfb19627633d559 /src/parser/smt2/Smt2.g | |
| parent | f4c783f97201753bf63c70c5c16b7861a236d57c (diff) | |
Revert change to Datatypes API to return vector of DatatypeTypes, as before. ASAN failures with datatypes should now be mostly fixed.
Diffstat (limited to 'src/parser/smt2/Smt2.g')
| -rw-r--r-- | src/parser/smt2/Smt2.g | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/parser/smt2/Smt2.g b/src/parser/smt2/Smt2.g index 3bd308559..f88b30212 100644 --- a/src/parser/smt2/Smt2.g +++ b/src/parser/smt2/Smt2.g @@ -640,8 +640,7 @@ sygusCommand returns [CVC4::Command* cmd = NULL] Debug("parser-sygus") << " " << i << " : " << datatypes[i].getName() << std::endl; } seq = new CommandSequence(); - std::vector<DatatypeType> datatypeTypes; - PARSER_STATE->mkMutualDatatypeTypes(datatypes, datatypeTypes); + std::vector<DatatypeType> datatypeTypes = PARSER_STATE->mkMutualDatatypeTypes(datatypes); seq->addCommand(new DatatypeDeclarationCommand(datatypeTypes)); std::map<DatatypeType, Expr> evals; if( sorts[0]!=range ){ @@ -1326,7 +1325,6 @@ extendedCommand[CVC4::Command*& cmd] datatypesDefCommand[bool isCo, CVC4::Command*& cmd] @declarations { std::vector<CVC4::Datatype> dts; - std::vector<CVC4::DatatypeType> dtts; std::string name; std::vector<Type> sorts; } @@ -1340,8 +1338,7 @@ datatypesDefCommand[bool isCo, CVC4::Command*& cmd] RPAREN_TOK LPAREN_TOK ( LPAREN_TOK datatypeDef[isCo, dts, sorts] RPAREN_TOK )+ RPAREN_TOK { PARSER_STATE->popScope(); - PARSER_STATE->mkMutualDatatypeTypes(dts, dtts); - cmd = new DatatypeDeclarationCommand(dtts); } + cmd = new DatatypeDeclarationCommand(PARSER_STATE->mkMutualDatatypeTypes(dts)); } ; rewriterulesCommand[CVC4::Command*& cmd] |