use new-style print methods

diff --git a/ginac/idx.cpp b/ginac/idx.cpp
index 1b4bf6f5e3d2f781d00080892f8f719ce2c2012d..4dd4d1afb016690f08fc4724c084dbca52572d3e 100644 (file)
--- a/ginac/idx.cpp
+++ b/ginac/idx.cpp
@@ -134,7 +134,7 @@ DEFAULT_UNARCHIVE(spinidx)
 // functions overriding virtual functions from base classes
 //////////
 
 // functions overriding virtual functions from base classes
 //////////
 

-void idx::do_print_idx(const print_context & c, unsigned level) const
+void idx::print_index(const print_context & c, unsigned level) const

 {
        bool need_parens = !(is_exactly_a<numeric>(value) || is_a<symbol>(value));
        if (need_parens)
 {
        bool need_parens = !(is_exactly_a<numeric>(value) || is_a<symbol>(value));
        if (need_parens)


@@ -152,13 +152,13 @@ void idx::do_print_idx(const print_context & c, unsigned level) const
 void idx::do_print(const print_context & c, unsigned level) const
 {
        c.s << ".";
 void idx::do_print(const print_context & c, unsigned level) const
 {
        c.s << ".";

-       do_print_idx(c, level);
+       print_index(c, level);

 }
 
 void idx::do_print_latex(const print_latex & c, unsigned level) const
 {
        c.s << "{";
 }
 
 void idx::do_print_latex(const print_latex & c, unsigned level) const
 {
        c.s << "{";

-       do_print_idx(c, level);
+       print_index(c, level);

        c.s << "}";
 }
 
        c.s << "}";
 }
 


@@ -177,7 +177,7 @@ void varidx::do_print(const print_context & c, unsigned level) const
                c.s << ".";
        else
                c.s << "~";
                c.s << ".";
        else
                c.s << "~";

-       do_print_idx(c, level);
+       print_index(c, level);

 }
 
 void varidx::do_print_tree(const print_tree & c, unsigned level) const
 }
 
 void varidx::do_print_tree(const print_tree & c, unsigned level) const


@@ -198,7 +198,7 @@ void spinidx::do_print(const print_context & c, unsigned level) const
                c.s << "~";
        if (dotted)
                c.s << "*";
                c.s << "~";
        if (dotted)
                c.s << "*";

-       do_print_idx(c, level);
+       print_index(c, level);

 }
 
 void spinidx::do_print_latex(const print_latex & c, unsigned level) const
 }
 
 void spinidx::do_print_latex(const print_latex & c, unsigned level) const


@@ -207,7 +207,7 @@ void spinidx::do_print_latex(const print_latex & c, unsigned level) const
                c.s << "\\dot{";
        else
                c.s << "{";
                c.s << "\\dot{";
        else
                c.s << "{";

-       do_print_idx(c, level);
+       print_index(c, level);

        c.s << "}";
 }
 
        c.s << "}";
 }
 

diff --git a/ginac/idx.h b/ginac/idx.h
index 16c515f22380e7c929f09d30a46fa5bebf35b0fb..13004fd4db8359e36d723b63225773a6b1ccff19 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -94,7 +94,7 @@ public:
        ex minimal_dim(const idx & other) const;
 
 protected:
        ex minimal_dim(const idx & other) const;
 
 protected:

-       void do_print_idx(const print_context & c, unsigned level) const;
+       void print_index(const print_context & c, unsigned level) const;

        void do_print(const print_context & 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(const print_context & 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;

diff --git a/ginac/matrix.cpp b/ginac/matrix.cpp
index 4828bb9392db1e87666e382a77e5c4a5368f0cfb..c9b3521a4665cdd8f210782809e244288de7efa1 100644 (file)
--- a/ginac/matrix.cpp
+++ b/ginac/matrix.cpp
@@ -37,13 +37,16 @@
 #include "symbol.h"
 #include "operators.h"
 #include "normal.h"
 #include "symbol.h"
 #include "operators.h"
 #include "normal.h"

-#include "print.h"

 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 

-GINAC_IMPLEMENT_REGISTERED_CLASS(matrix, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(matrix, basic,
+  print_func<print_context>(&matrix::do_print).
+  print_func<print_latex>(&matrix::do_print_latex).
+  print_func<print_tree>(&basic::do_print_tree).
+  print_func<print_python_repr>(&matrix::do_print_python_repr))

 
 //////////
 // default constructor
 
 //////////
 // default constructor


@@ -134,54 +137,41 @@ DEFAULT_UNARCHIVE(matrix)
 
 // public
 
 
 // public
 

-void matrix::print(const print_context & c, unsigned level) const
+void matrix::print_elements(const print_context & c, const std::string & row_start, const std::string & row_end, const std::string & row_sep, const std::string & col_sep) const

 {
 {

-       if (is_a<print_tree>(c)) {
-
-               inherited::print(c, level);
-
-       } else {
-
-               if (is_a<print_python_repr>(c))
-                       c.s << class_name() << '(';
-
-               if (is_a<print_latex>(c))
-                       c.s << "\\left(\\begin{array}{" << std::string(col,'c') << "}";
-               else
-                       c.s << "[";
-
-               for (unsigned ro=0; ro<row; ++ro) {
-                       if (!is_a<print_latex>(c))
-                               c.s << "[";
-                       for (unsigned co=0; co<col; ++co) {
-                               m[ro*col+co].print(c);
-                               if (co<col-1) {
-                                       if (is_a<print_latex>(c))
-                                               c.s << "&";
-                                       else
-                                               c.s << ",";
-                               } else {
-                                       if (!is_a<print_latex>(c))
-                                               c.s << "]";
-                               }
-                       }
-                       if (ro<row-1) {
-                               if (is_a<print_latex>(c))
-                                       c.s << "\\\\";
-                               else
-                                       c.s << ",";
-                       }
+       for (unsigned ro=0; ro<row; ++ro) {
+               c.s << row_start;
+               for (unsigned co=0; co<col; ++co) {
+                       m[ro*col+co].print(c);
+                       if (co < col-1)
+                               c.s << col_sep;
+                       else
+                               c.s << row_end;

                }
                }

+               if (ro < row-1)
+                       c.s << row_sep;
+       }
+}

 
 

-               if (is_a<print_latex>(c))
-                       c.s << "\\end{array}\\right)";
-               else
-                       c.s << "]";
+void matrix::do_print(const print_context & c, unsigned level) const
+{
+       c.s << "[";
+       print_elements(c, "[", "]", ",", ",");
+       c.s << "]";
+}

 
 

-               if (is_a<print_python_repr>(c))
-                       c.s << ')';
+void matrix::do_print_latex(const print_latex & c, unsigned level) const
+{
+       c.s << "\\left(\\begin{array}{" << std::string(col,'c') << "}";
+       print_elements(c, "", "", "\\\\", "&");
+       c.s << "\\end{array}\\right)";
+}

 
 

-       }
+void matrix::do_print_python_repr(const print_python_repr & c, unsigned level) const
+{
+       c.s << class_name() << '(';
+       print_elements(c, "[", "]", ",", ",");
+       c.s << ')';

 }
 
 /** nops is defined to be rows x columns. */
 }
 
 /** nops is defined to be rows x columns. */

diff --git a/ginac/matrix.h b/ginac/matrix.h
index f951850c29d30e54db81baa7c0dc759fef090618..f5cd5de83dde6d208d3afabbf511c9c840e44650 100644 (file)
--- a/ginac/matrix.h
+++ b/ginac/matrix.h
@@ -43,7 +43,6 @@ public:
        
        // functions overriding virtual functions from base classes
 public:
        
        // functions overriding virtual functions from base classes
 public:

-       void print(const print_context & c, unsigned level = 0) const;

        size_t nops() const;
        ex op(size_t i) const;
        ex & let_op(size_t i);
        size_t nops() const;
        ex op(size_t i) const;
        ex & let_op(size_t i);


@@ -87,6 +86,11 @@ protected:
        int division_free_elimination(const bool det = false);
        int fraction_free_elimination(const bool det = false);
        int pivot(unsigned ro, unsigned co, bool symbolic = true);
        int division_free_elimination(const bool det = false);
        int fraction_free_elimination(const bool det = false);
        int pivot(unsigned ro, unsigned co, bool symbolic = true);

+
+       void print_elements(const print_context & c, const std::string & row_start, const std::string & row_end, const std::string & row_sep, const std::string & col_sep) const;
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;

        
 // member variables
 protected:
        
 // member variables
 protected:

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index 453b4c00a9b18b278db2f830eac5d2e8f758d1bd..05fe56e8b0103b8348ad6d7d418c8a17b11d0d7d 100644 (file)
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -26,13 +26,15 @@
 #include "relational.h"
 #include "operators.h"
 #include "numeric.h"
 #include "relational.h"
 #include "operators.h"
 #include "numeric.h"

-#include "print.h"

 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 

-GINAC_IMPLEMENT_REGISTERED_CLASS(relational, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(relational, basic,
+  print_func<print_context>(&relational::do_print).
+  print_func<print_tree>(&basic::do_print_tree).
+  print_func<print_python_repr>(&relational::do_print_python_repr))

 
 //////////
 // default constructor
 
 //////////
 // default constructor


@@ -78,57 +80,55 @@ DEFAULT_UNARCHIVE(relational)
 
 // public
 
 
 // public
 

-void relational::print(const print_context & c, unsigned level) const
+static void print_operator(const print_context & c, relational::operators o)

 {
 {

-       if (is_a<print_tree>(c)) {
-
-               inherited::print(c, level);
-
-       } else {
-
-               if (is_a<print_python_repr>(c)) {
-                       c.s << class_name() << '(';
-                       lh.print(c);
-                       c.s << ',';
-                       rh.print(c);
-                       c.s << ",'";
-               } else {
-                       if (precedence() <= level)
-                               c.s << "(";
-                       lh.print(c, precedence());
-               }
-               switch (o) {
-                       case equal:
-                               c.s << "==";
-                               break;
-                       case not_equal:
-                               c.s << "!=";
-                               break;
-                       case less:
-                               c.s << "<";
-                               break;
-                       case less_or_equal:
-                               c.s << "<=";
-                               break;
-                       case greater:
-                               c.s << ">";
-                               break;
-                       case greater_or_equal:
-                               c.s << ">=";
-                               break;
-                       default:
-                               c.s << "(INVALID RELATIONAL OPERATOR)";
-               }
-               if (is_a<print_python_repr>(c))
-                       c.s << "')";
-               else {
-                       rh.print(c, precedence());
-                       if (precedence() <= level)
-                               c.s << ")";
-               }
+       switch (o) {
+       case relational::equal:
+               c.s << "==";
+               break;
+       case relational::not_equal:
+               c.s << "!=";
+               break;
+       case relational::less:
+               c.s << "<";
+               break;
+       case relational::less_or_equal:
+               c.s << "<=";
+               break;
+       case relational::greater:
+               c.s << ">";
+               break;
+       case relational::greater_or_equal:
+               c.s << ">=";
+               break;
+       default:
+               c.s << "(INVALID RELATIONAL OPERATOR)";
+               break;

        }
 }
 
        }
 }
 

+void relational::do_print(const print_context & c, unsigned level) const
+{
+       if (precedence() <= level)
+               c.s << "(";
+       lh.print(c, precedence());
+       print_operator(c, o);
+       rh.print(c, precedence());
+       if (precedence() <= level)
+               c.s << ")";
+}
+
+void relational::do_print_python_repr(const print_python_repr & c, unsigned level) const
+{
+       c.s << class_name() << '(';
+       lh.print(c);
+       c.s << ',';
+       rh.print(c);
+       c.s << ",'";
+       print_operator(c, o);
+       c.s << "')";
+}
+

 bool relational::info(unsigned inf) const
 {
        switch (inf) {
 bool relational::info(unsigned inf) const
 {
        switch (inf) {

diff --git a/ginac/relational.h b/ginac/relational.h
index cbe51468eeb9691199a10c79d59a4bb41c8986cd..a6727de194810f287328fd31c1160ff9c7f8f830 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -51,7 +51,6 @@ public:
        
        // functions overriding virtual functions from base classes
 public:
        
        // functions overriding virtual functions from base classes
 public:

-       void print(const print_context & c, unsigned level = 0) const;

        unsigned precedence() const {return 20;}
        bool info(unsigned inf) const;
        size_t nops() const;
        unsigned precedence() const {return 20;}
        bool info(unsigned inf) const;
        size_t nops() const;


@@ -68,6 +67,10 @@ protected:
        unsigned calchash() const;
 
        // new virtual functions which can be overridden by derived classes
        unsigned calchash() const;
 
        // new virtual functions which can be overridden by derived classes

+protected:
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+

 public:
        virtual ex lhs() const;
        virtual ex rhs() const;
 public:
        virtual ex lhs() const;
        virtual ex rhs() const;