From: Christian Bauer <Christian.Bauer@uni-mainz.de>
Date: Mon, 25 Aug 2003 18:47:33 +0000 (+0000)
Subject: print_tree prints the object addresses
X-Git-Tag: release_1-2-0~120
X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=13896261ee985f23e5b5648532e70f0cce704ede

print_tree prints the object addresses
---

diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index 73f10723..b8690079 100644
--- 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 c8c93040..e0ccf544 100644
--- 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 d2ff8fb5..24e2b560 100644
--- 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 1c766996..d2ebc15c 100644
--- 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 749df21d..7e5d0dac 100755
--- 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 be9d6b41..67603cf2 100644
--- 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 3fad73f8..562ca1d5 100644
--- 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 6074aeaf..f9c4a278 100644
--- 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 8820e4ea..a99725e5 100644
--- 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 31fc1d66..3b3c8820 100644
--- 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 7828c273..6cf5aaea 100644
--- 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 a538838b..fa4153f1 100644
--- 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;
 }