summaryrefslogtreecommitdiff
path: root/src/theory
diff options
context:
space:
mode:
authorlianah <lianahady@gmail.com>2013-03-21 20:43:29 -0400
committerlianah <lianahady@gmail.com>2013-03-21 20:43:29 -0400
commit73bc28dd03f68c2c1b8510f3200c3950622e0295 (patch)
treeea3fb4372057b84dc873db657c52de9fc602fb0c /src/theory
parentc728dee765f0d07b8743fcbb452585202f3c9c96 (diff)
parent36816ad2537a2e6163037e9592c513b9a69aa9dc (diff)
Merge branch 'master' into bv-core
Diffstat (limited to 'src/theory')
-rw-r--r--src/theory/uf/equality_engine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/theory/uf/equality_engine.cpp b/src/theory/uf/equality_engine.cpp
index b2713d420..45f161143 100644
--- a/src/theory/uf/equality_engine.cpp
+++ b/src/theory/uf/equality_engine.cpp
@@ -603,9 +603,9 @@ bool EqualityEngine::merge(EqualityNode& class1, EqualityNode& class2, std::vect
Debug("equality") << d_name << "::eq::merge(" << class1.getFind() << "," << class2.getFind() << "): " << d_nodes[currentId] << " in " << d_nodes[funId] << std::endl;
const FunctionApplication& fun = d_applications[useNode.getApplicationId()].normalized;
// If it's interpreted and we can interpret
- if (fun.isInterpreted() && class1isConstant && !d_isInternal[funId]) {
+ if (fun.isInterpreted() && class1isConstant && !d_isInternal[currentId]) {
// Get the actual term id
- TNode term = d_nodes[useNode.getApplicationId()];
+ TNode term = d_nodes[funId];
subtermEvaluates(getNodeId(term));
}
// Check if there is an application with find arguments
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback