Applied print_csrc patch [Grabner/Sheplyakov]

diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index 80e66bce5092c8939313704e5cc6e5a362070ef1..3e17569a1a869f37bff5f3916288639b66781a05 100644 (file)
--- a/ginac/idx.cpp
+++ b/ginac/idx.cpp
@@ -37,6 +37,7 @@ namespace GiNaC {
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(idx, basic,
   print_func<print_context>(&idx::do_print).
   print_func<print_latex>(&idx::do_print_latex).
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(idx, basic,
   print_func<print_context>(&idx::do_print).
   print_func<print_latex>(&idx::do_print_latex).

+  print_func<print_csrc>(&idx::do_print_csrc).

   print_func<print_tree>(&idx::do_print_tree))
 
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(varidx, idx,
   print_func<print_tree>(&idx::do_print_tree))
 
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(varidx, idx,


@@ -161,6 +162,16 @@ void idx::do_print_latex(const print_latex & c, unsigned level) const
        c.s << "}";
 }
 
        c.s << "}";
 }
 

+void idx::do_print_csrc(const print_csrc & c, unsigned level) const
+{
+       c.s << "[";
+       if (value.info(info_flags::integer))
+               c.s << ex_to<numeric>(value).to_int();
+       else
+               value.print(c);
+       c.s << "]";
+}
+

 void idx::do_print_tree(const print_tree & c, unsigned level) const
 {
        c.s << std::string(level, ' ') << class_name() << " @" << this
 void idx::do_print_tree(const print_tree & c, unsigned level) const
 {
        c.s << std::string(level, ' ') << class_name() << " @" << this

diff --git a/ginac/idx.h b/ginac/idx.h
index 930994d18f93bc5c8ae78151e58ee4e247dcc298..d859b2ee1976aee3198f3b294989a30b1af10fc8 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -96,6 +96,7 @@ public:
 protected:
        void print_index(const print_context & c, unsigned level) const;
        void do_print(const print_context & c, unsigned level) const;
 protected:
        void print_index(const print_context & c, unsigned level) const;
        void do_print(const print_context & c, unsigned level) const;

+       void do_print_csrc(const print_csrc & c, unsigned level) const;

        void do_print_latex(const print_latex & c, unsigned level) const;
        void do_print_tree(const print_tree & c, unsigned level) const;
 
        void do_print_latex(const print_latex & c, unsigned level) const;
        void do_print_tree(const print_tree & c, unsigned level) const;