diff options
| author | ajreynol <andrew.j.reynolds@gmail.com> | 2014-11-07 11:37:43 +0100 |
|---|---|---|
| committer | ajreynol <andrew.j.reynolds@gmail.com> | 2014-11-07 11:37:43 +0100 |
| commit | 56a523d9c4dd04cedbd812570cd80e3bc94cce4c (patch) | |
| tree | d53f96c61369f826ef38dbf07eea264d27f64c03 /src/theory/theory_model.cpp | |
| parent | e6a588264154bf4b93abd0aaac39dbf10c496e6f (diff) | |
Properly distinguish which EQC to assign values in datatypes, use assertRepresentative. Disable regression related to records. Enable fmf-fun related regression (modified). Apply modified version of Morgan's patch to fix tuples/records in model. Fix bug with sort inference + patterns. Minor infrastructure.
Diffstat (limited to 'src/theory/theory_model.cpp')
| -rw-r--r-- | src/theory/theory_model.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/theory/theory_model.cpp b/src/theory/theory_model.cpp index 7e1129e7b..b67140db8 100644 --- a/src/theory/theory_model.cpp +++ b/src/theory/theory_model.cpp @@ -681,7 +681,10 @@ void TheoryEngineModelBuilder::buildModel(Model* m, bool fullModel) continue; } TypeNode t = TypeSet::getType(it); - TypeNode tb = t.getBaseType(); + if(t.isTuple() || t.isRecord()) { + t = NodeManager::currentNM()->getDatatypeForTupleRecord(t); + } + TypeNode tb = t.getBaseType(); if (!assignOne) { set<Node>* repSet = typeRepSet.getSet(tb); if (repSet != NULL && !repSet->empty()) { |