diff options
| -rw-r--r-- | gprofng/src/Expression.cc | 34 | ||||
| -rw-r--r-- | gprofng/src/Expression.h | 2 |
2 files changed, 18 insertions, 18 deletions
diff --git a/gprofng/src/Expression.cc b/gprofng/src/Expression.cc index 49c94a8..df44092 100644 --- a/gprofng/src/Expression.cc +++ b/gprofng/src/Expression.cc @@ -91,12 +91,18 @@ Expression::Expression (const Expression &rhs) op = rhs.op; arg0 = NULL; arg1 = NULL; + v = Value (rhs.v); if (rhs.arg0) - arg0 = rhs.arg0->copy (); + { + arg0 = rhs.arg0->copy (); + if (v.next) + { + assert (arg0 && v.next == &(rhs.arg0->v)); + v.next = &(arg0->v); + } + } if (rhs.arg1) arg1 = rhs.arg1->copy (); - v = Value (rhs.v); - fixupValues (); } Expression::Expression (const Expression *rhs) @@ -114,12 +120,18 @@ Expression::copy (const Expression *rhs) delete arg1; arg0 = NULL; arg1 = NULL; + v = Value (rhs->v); if (rhs->arg0) - arg0 = rhs->arg0->copy (); + { + arg0 = rhs->arg0->copy (); + if (v.next) + { + assert (arg0 && v.next == &(rhs->arg0->v)); + v.next = &(arg0->v); + } + } if (rhs->arg1) arg1 = rhs->arg1->copy (); - v = Value (rhs->v); - fixupValues (); } Expression & @@ -131,16 +143,6 @@ Expression::operator= (const Expression &rhs) return *this; } -void -Expression::fixupValues () -{ - if (v.next) - { - assert (arg0 && v.next == &(arg0->v)); - v.next = &(arg0->v); - } -} - bool Expression::getVal (int propId, Context *ctx) { diff --git a/gprofng/src/Expression.h b/gprofng/src/Expression.h index 7542853..29d3e4e 100644 --- a/gprofng/src/Expression.h +++ b/gprofng/src/Expression.h @@ -166,9 +166,7 @@ private: bool getVal (int propId, Context *ctx); bool bEval (Context *ctx); - bool hasLoadObject (); - void fixupValues (); OpCode op; Value v; |