print_tree prints the object addresses

diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index 73f1072317c77d45e46754207223f5ba387f549d..b86900795d950c542bf5f0dc9e281c6c4063fc4e 100644 (file)
--- a/ginac/basic.cpp
+++ b/ginac/basic.cpp
@@ -184,7 +184,7 @@ 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()
+       c.s << std::string(level, ' ') << class_name() << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec;
        if (nops())
                c.s << ", nops=" << nops();

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index c8c930406f40861c23b39abc4720151a1074af68..e0ccf54428902d3e3d72b7e531bb28b8e538ab59 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -118,7 +118,7 @@ void constant::do_print(const print_context & c, unsigned level) const
 
 void constant::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
+       c.s << std::string(level, ' ') << name << " (" << class_name() << ")" << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << std::endl;
 }

diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index d2ff8fb56e5159dba8faf1ae9b00c4523e209e40..24e2b5602d6e6dfe0c196f22ef220acdb3338133 100644 (file)
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -188,7 +188,7 @@ void expairseq::do_print(const print_context & c, unsigned level) const
 
 void expairseq::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name()
+       c.s << std::string(level, ' ') << class_name() << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << ", nops=" << nops()
            << std::endl;

diff --git a/ginac/fderivative.cpp b/ginac/fderivative.cpp
index 1c766996c8b8ae1f1f806e2982dd392302b983bf..d2ebc15c34cf680e012b88bd1c730c112fc3fcb7 100644 (file)
--- a/ginac/fderivative.cpp
+++ b/ginac/fderivative.cpp
@@ -109,7 +109,7 @@ void fderivative::do_print(const print_context & c, unsigned level) const
 void fderivative::do_print_tree(const print_tree & c, unsigned level) const
 {
        c.s << std::string(level, ' ') << class_name() << " "
-           << registered_functions()[serial].name
+           << registered_functions()[serial].name << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << ", nops=" << nops()
            << ", params=";

diff --git a/ginac/function.pl b/ginac/function.pl
index 749df21dc31e1e332f449541b6c065145bc13bb1..7e5d0dac0307ca6db6dbe4427a0461bc9bfb5871 100755 (executable)
--- a/ginac/function.pl
+++ b/ginac/function.pl
@@ -735,7 +735,7 @@ next_context:
                if (is_a<print_tree>(c)) {
 
                        c.s << std::string(level, ' ') << class_name() << " "
-                           << opt.name
+                           << opt.name << " @" << this
                            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
                            << ", nops=" << nops()
                            << std::endl;

diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index be9d6b41d91b5e2ad328c3a5f7ec492b9d361549..67603cf271fb7efca16b0e76d8f1420fe53af2b2 100644 (file)
--- a/ginac/idx.cpp
+++ b/ginac/idx.cpp
@@ -163,7 +163,7 @@ void idx::do_print_latex(const print_latex & c, unsigned level) const
 
 void idx::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name()
+       c.s << std::string(level, ' ') << class_name() << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << std::endl;
        value.print(c, level +  c.delta_indent);
@@ -181,7 +181,7 @@ void varidx::do_print(const print_context & c, unsigned level) const
 
 void varidx::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name()
+       c.s << std::string(level, ' ') << class_name() << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << (covariant ? ", covariant" : ", contravariant")
            << std::endl;
@@ -212,7 +212,7 @@ void spinidx::do_print_latex(const print_latex & c, unsigned level) const
 
 void spinidx::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name()
+       c.s << std::string(level, ' ') << class_name() << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << (covariant ? ", covariant" : ", contravariant")
            << (dotted ? ", dotted" : ", undotted")

diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index 3fad73f8eb22ae2e533f8b889ac247dafbba5a2e..562ca1d5c6c0bd95dbc0584df003b11cf1b505be 100644 (file)
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -237,7 +237,7 @@ void indexed::do_print_latex(const print_latex & c, unsigned level) const
 
 void indexed::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name()
+       c.s << std::string(level, ' ') << class_name() << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << ", " << seq.size()-1 << " indices"
            << ", symmetry=" << symtree << std::endl;

diff --git a/ginac/numeric.cpp b/ginac/numeric.cpp
index 6074aeaf5cc0b15ae48492561d8ba6430e8be578..f9c4a2781be7cdaecb22cbb7f3b2aee20d41a998 100644 (file)
--- a/ginac/numeric.cpp
+++ b/ginac/numeric.cpp
@@ -545,7 +545,7 @@ void numeric::do_print_csrc_cl_N(const print_csrc_cl_N & c, unsigned level) cons
 void numeric::do_print_tree(const print_tree & c, unsigned level) const
 {
        c.s << std::string(level, ' ') << cln::the<cln::cl_N>(value)
-           << " (" << class_name() << ")"
+           << " (" << class_name() << ")" << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << std::endl;
 }

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 8820e4ea750d30d1e5f735188e6e9b8493d404d3..a99725e56e98e93b61ad0ce2d73580ab0de1d974 100644 (file)
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -188,7 +188,7 @@ void pseries::do_print_python(const print_python & c, unsigned level) const
 
 void pseries::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name()
+       c.s << std::string(level, ' ') << class_name() << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << std::endl;
        size_t num = seq.size();

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 31fc1d66117f7455a6d08127c621c9f69d9d4f94..3b3c88202463c5a71d8797741395be5f63641ff8 100644 (file)
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -123,7 +123,7 @@ void symbol::do_print_latex(const print_latex & c, unsigned level) const
 
 void symbol::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
+       c.s << std::string(level, ' ') << name << " (" << class_name() << ")" << " @" << this
            << ", serial=" << serial
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << std::endl;

diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index 7828c273eeec6c2ac8b98a2301667ab9c748fd9c..6cf5aaeac223a109f6280c8044bbd7cc68142748 100644 (file)
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -175,7 +175,7 @@ void symmetry::do_print(const print_context & c, unsigned level) const
 
 void symmetry::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name()
+       c.s << std::string(level, ' ') << class_name() << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << ", type=";
 

diff --git a/ginac/wildcard.cpp b/ginac/wildcard.cpp
index a538838b18beb30704660aaf3eaec87ab2ac08da..fa4153f1b5bff0b5fc5009ad1afa5f48c74f597a 100644 (file)
--- a/ginac/wildcard.cpp
+++ b/ginac/wildcard.cpp
@@ -91,7 +91,7 @@ void wildcard::do_print(const print_context & c, unsigned level) const
 
 void wildcard::do_print_tree(const print_tree & c, unsigned level) const
 {
-       c.s << std::string(level, ' ') << class_name() << " (" << label << ")"
+       c.s << std::string(level, ' ') << class_name() << "(" << label << ")" << " @" << this
            << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
            << std::endl;
 }