- replaced the various print*() member functions by a single print() that

[ginac.git] / ginac / idx.cpp

diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index 0a8686de4593a06e61b2b252226e0809026c5edb..9f31a9ad8f997788f484d274ca1a07059745e76a 100644 (file)
--- a/ginac/idx.cpp
+++ b/ginac/idx.cpp
@@ -25,12 +25,11 @@
 #include "idx.h"
 #include "symbol.h"
 #include "lst.h"
+#include "print.h"
 #include "archive.h"
 #include "utils.h"
 #include "debugmsg.h"
 
-#include "exprseq.h" // !!
-
 namespace GiNaC {
 
 GINAC_IMPLEMENT_REGISTERED_CLASS(idx, basic)
@@ -122,59 +121,58 @@ DEFAULT_UNARCHIVE(varidx)
 // functions overriding virtual functions from bases classes
 //////////
 
-void idx::printraw(std::ostream & os) const
+void idx::print(const print_context & c, unsigned level) const
 {
-       debugmsg("idx printraw", LOGLEVEL_PRINT);
-
-       os << class_name() << "(";
-       value.printraw(os);
-       os << ",dim=";
-       dim.printraw(os);
-       os << ",hash=" << hashvalue << ",flags=" << flags;
-       os << ")";
-}
+       debugmsg("idx print", LOGLEVEL_PRINT);
 
-void idx::printtree(std::ostream & os, unsigned indent) const
-{
-       debugmsg("idx printtree",LOGLEVEL_PRINT);
-
-       os << std::string(indent, ' ') << "type=" << class_name();
-       value.printtree(os, indent + delta_indent);
-       os << std::string(indent, ' ');
-       os << ", hash=" << hashvalue
-          << " (0x" << std::hex << hashvalue << std::dec << ")"
-          << ", flags=" << flags << std::endl;
-}
+       if (is_of_type(c, print_tree)) {
 
-void idx::print(std::ostream & os, unsigned upper_precedence) const
-{
-       debugmsg("idx print", LOGLEVEL_PRINT);
+               c.s << std::string(level, ' ') << class_name()
+                   << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+                   << std::endl;
+               unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
+               value.print(c, level + delta_indent);
+               dim.print(c, level + delta_indent);
 
-       os << ".";
+       } else {
 
-       bool need_parens = !(is_ex_exactly_of_type(value, numeric) || is_ex_of_type(value, symbol));
-       if (need_parens)
-               os << "(";
-       os << value;
-       if (need_parens)
-               os << ")";
+               c.s << ".";
+               bool need_parens = !(is_ex_exactly_of_type(value, numeric) || is_ex_of_type(value, symbol));
+               if (need_parens)
+                       c.s << "(";
+               c.s << value;
+               if (need_parens)
+                       c.s << ")";
+       }
 }
 
-void varidx::print(std::ostream & os, unsigned upper_precedence) const
+void varidx::print(const print_context & c, unsigned level) const
 {
        debugmsg("varidx print", LOGLEVEL_PRINT);
 
-       if (covariant)
-               os << ".";
-       else
-               os << "~";
-
-       bool need_parens = !(is_ex_exactly_of_type(value, numeric) || is_ex_of_type(value, symbol));
-       if (need_parens)
-               os << "(";
-       os << value;
-       if (need_parens)
-               os << ")";
+       if (is_of_type(c, print_tree)) {
+
+               c.s << std::string(level, ' ') << class_name()
+                   << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+                   << (covariant ? ", covariant" : ", contravariant")
+                   << std::endl;
+               unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
+               value.print(c, level + delta_indent);
+               dim.print(c, level + delta_indent);
+
+       } else {
+
+               if (covariant)
+                       c.s << ".";
+               else
+                       c.s << "~";
+               bool need_parens = !(is_ex_exactly_of_type(value, numeric) || is_ex_of_type(value, symbol));
+               if (need_parens)
+                       c.s << "(";
+               c.s << value;
+               if (need_parens)
+                       c.s << ")";
+       }
 }
 
 bool idx::info(unsigned inf) const