* Oops, forgot to cvs add the two new files in last commit.

[ginac.git] / ginac / basic.cpp

diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index 483844c0ee0a81bd66b2e5bb03a2d29b23620179..b86900795d950c542bf5f0dc9e281c6c4063fc4e 100644 (file)
--- a/ginac/basic.cpp
+++ b/ginac/basic.cpp
@@ -68,7 +68,7 @@ const basic & basic::operator=(const basic & other)
                // The other object is of a derived class, so clear the flags as they
                // might no longer apply (especially hash_calculated). Oh, and don't
                // copy the tinfo_key: it is already set correctly for this object.
-               flags = 0;
+               fl &= ~(status_flags::evaluated | status_flags::expanded | status_flags::hash_calculated);
        } else {
                // The objects are of the exact same class, so copy the hash value.
                hashvalue = other.hashvalue;
@@ -184,10 +184,11 @@ void basic::do_print(const print_context & c, unsigned level) const
 /** Tree output to stream. */
 void basic::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name()
-           << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
-           << ", nops=" << nops()
-           << std::endl;
+       c.s << std::string(level, ' ') << class_name() << " @" << this
+           << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec;
+       if (nops())
+               c.s << ", nops=" << nops();
+       c.s << std::endl;
        for (size_t i=0; i<nops(); ++i)
                op(i).print(c, level + c.delta_indent);
 }