diff options
| author | ajreynol <andrew.j.reynolds@gmail.com> | 2016-11-01 13:33:38 -0500 |
|---|---|---|
| committer | ajreynol <andrew.j.reynolds@gmail.com> | 2016-11-01 13:33:38 -0500 |
| commit | f4c783f97201753bf63c70c5c16b7861a236d57c (patch) | |
| tree | 8e4a9e85d7485200bdfb52b5afc5032993938488 /src/smt/boolean_terms.cpp | |
| parent | 8e0fce94790249ff7aff84ff4500bb96e2ebb9e9 (diff) | |
Revert change to datatypes API for passing pointers, instead make deep copy during call to mkMutualDatatypes.
Diffstat (limited to 'src/smt/boolean_terms.cpp')
| -rw-r--r-- | src/smt/boolean_terms.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/smt/boolean_terms.cpp b/src/smt/boolean_terms.cpp index e9b51c47b..0771cfc06 100644 --- a/src/smt/boolean_terms.cpp +++ b/src/smt/boolean_terms.cpp @@ -60,10 +60,10 @@ BooleanTermConverter::BooleanTermConverter(SmtEngine& smt) : d_ffDt = d_ff; d_ttDt = d_tt; } else { - Datatype* spec = new Datatype("BooleanTerm"); + Datatype spec("BooleanTerm"); // don't change the order; false is assumed to come first by the model postprocessor - spec->addConstructor(DatatypeConstructor("BT_False")); - spec->addConstructor(DatatypeConstructor("BT_True")); + spec.addConstructor(DatatypeConstructor("BT_False")); + spec.addConstructor(DatatypeConstructor("BT_True")); const Datatype& dt = NodeManager::currentNM()->toExprManager()->mkDatatypeType(spec).getDatatype(); d_ffDt = NodeManager::currentNM()->mkNode(kind::APPLY_CONSTRUCTOR, Node::fromExpr(dt["BT_False"].getConstructor())); d_ttDt = NodeManager::currentNM()->mkNode(kind::APPLY_CONSTRUCTOR, Node::fromExpr(dt["BT_True"].getConstructor())); @@ -255,13 +255,13 @@ const Datatype& BooleanTermConverter::convertDatatype(const Datatype& dt) throw( mySelfType = NodeManager::currentNM()->toExprManager()->mkSortConstructor(dt.getName() + "'", dt.getNumParameters()); unresolvedTypes.insert(mySelfType); } - vector<Datatype*> newDtVector; + vector<Datatype> newDtVector; if(dt.isParametric()) { - newDtVector.push_back(new Datatype(dt.getName() + "'", dt.getParameters(), false)); + newDtVector.push_back(Datatype(dt.getName() + "'", dt.getParameters(), false)); } else { - newDtVector.push_back(new Datatype(dt.getName() + "'", false)); + newDtVector.push_back(Datatype(dt.getName() + "'", false)); } - Datatype * newDt = newDtVector.front(); + Datatype& newDt = newDtVector.front(); Debug("boolean-terms") << "found a Boolean arg in constructor " << (*c).getName() << endl; for(c = dt.begin(); c != dt.end(); ++c) { DatatypeConstructor ctor((*c).getName() + "'", (*c).getTesterName() + "'"); @@ -286,7 +286,7 @@ const Datatype& BooleanTermConverter::convertDatatype(const Datatype& dt) throw( } } } - newDt->addConstructor(ctor); + newDt.addConstructor(ctor); } vector<DatatypeType> newDttVector; NodeManager::currentNM()->toExprManager()->mkMutualDatatypeTypes(newDtVector, unresolvedTypes, newDttVector); |