- Fix GCC 2.95.x brokenness.

[ginac.git] / ginac / relational.cpp

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index c8b504313bde667710232fd5ad8d6b2c22029cd3..d539b700c9591e9b5489872bf30afae2e6ddd33b 100644 (file)
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -24,29 +24,24 @@
 
 #include "relational.h"
 #include "numeric.h"
+#include "print.h"
 #include "archive.h"
 #include "utils.h"
 #include "debugmsg.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 GINAC_IMPLEMENT_REGISTERED_CLASS(relational, basic)
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor assignment operator and helpers
 //////////
 
-// public
-
 relational::relational() : basic(TINFO_relational)
 {
-       debugmsg("relational default constructor",LOGLEVEL_CONSTRUCT);
+       debugmsg("relational default ctor",LOGLEVEL_CONSTRUCT);
 }
 
-// protected
-
 void relational::copy(const relational & other)
 {
        basic::copy(other);
@@ -55,20 +50,17 @@ void relational::copy(const relational & other)
        o=other.o;
 }
 
-void relational::destroy(bool call_parent)
-{
-       if (call_parent) basic::destroy(call_parent);
-}
+DEFAULT_DESTROY(relational)
 
 //////////
-// other constructors
+// other ctors
 //////////
 
 // public
 
 relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(TINFO_relational)
 {
-       debugmsg("relational constructor ex,ex,operator",LOGLEVEL_CONSTRUCT);
+       debugmsg("relational ctor ex,ex,operator",LOGLEVEL_CONSTRUCT);
        lh=lhs;
        rh=rhs;
        o=oper;
@@ -78,10 +70,9 @@ relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(T
 // archiving
 //////////
 
-/** Construct object from archive_node. */
 relational::relational(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-       debugmsg("relational constructor from archive_node", LOGLEVEL_CONSTRUCT);
+       debugmsg("relational ctor from archive_node", LOGLEVEL_CONSTRUCT);
        unsigned int opi;
        if (!(n.find_unsigned("op", opi)))
                throw (std::runtime_error("unknown relational operator in archive"));
@@ -90,13 +81,6 @@ relational::relational(const archive_node &n, const lst &sym_lst) : inherited(n,
        n.find_ex("rh", rh, sym_lst);
 }
 
-/** Unarchive the object. */
-ex relational::unarchive(const archive_node &n, const lst &sym_lst)
-{
-       return (new relational(n, sym_lst))->setflag(status_flags::dynallocated);
-}
-
-/** Archive the object. */
 void relational::archive(archive_node &n) const
 {
        inherited::archive(n);
@@ -105,121 +89,53 @@ void relational::archive(archive_node &n) const
        n.add_unsigned("op", o);
 }
 
+DEFAULT_UNARCHIVE(relational)
+
 //////////
 // functions overriding virtual functions from bases classes
 //////////
 
 // public
 
-basic * relational::duplicate() const
-{
-       debugmsg("relational duplicate",LOGLEVEL_DUPLICATE);
-       return new relational(*this);
-}
-
-void relational::print(std::ostream & os, unsigned upper_precedence) const
+void relational::print(const print_context & c, unsigned level) const
 {
        debugmsg("relational print",LOGLEVEL_PRINT);
-       if (precedence<=upper_precedence) os << "(";
-       lh.print(os,precedence);
-       switch (o) {
-       case equal:
-               os << "==";
-               break;
-       case not_equal:
-               os << "!=";
-               break;
-       case less:
-               os << "<";
-               break;
-       case less_or_equal:
-               os << "<=";
-               break;
-       case greater:
-               os << ">";
-               break;
-       case greater_or_equal:
-               os << ">=";
-               break;
-       default:
-               os << "(INVALID RELATIONAL OPERATOR)";
-       }
-       rh.print(os,precedence);
-       if (precedence<=upper_precedence) os << ")";
-}
 
-void relational::printraw(std::ostream & os) const
-{
-       debugmsg("relational printraw",LOGLEVEL_PRINT);
-       os << "RELATIONAL(";
-       lh.printraw(os);
-       os << ",";
-       rh.printraw(os);
-       os << ",";
-       switch (o) {
-       case equal:
-               os << "==";
-               break;
-       case not_equal:
-               os << "!=";
-               break;
-       case less:
-               os << "<";
-               break;
-       case less_or_equal:
-               os << "<=";
-               break;
-       case greater:
-               os << ">";
-               break;
-       case greater_or_equal:
-               os << ">=";
-               break;
-       default:
-               os << "(INVALID RELATIONAL OPERATOR)";
-       }
-       os << ")";
-}
+       if (is_of_type(c, print_tree)) {
 
-void relational::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
-{
-       debugmsg("relational print csrc", LOGLEVEL_PRINT);
-       if (precedence<=upper_precedence)
-               os << "(";
+               inherited::print(c, level);
 
-       // Print left-hand expression
-       lh.bp->printcsrc(os, type, precedence);
+       } else {
 
-       // Print relational operator
-       switch (o) {
+               if (precedence() <= level)
+                       c.s << "(";
+               lh.print(c, precedence());
+               switch (o) {
                case equal:
-                       os << "==";
+                       c.s << "==";
                        break;
                case not_equal:
-                       os << "!=";
+                       c.s << "!=";
                        break;
                case less:
-                       os << "<";
+                       c.s << "<";
                        break;
                case less_or_equal:
-                       os << "<=";
+                       c.s << "<=";
                        break;
                case greater:
-                       os << ">";
+                       c.s << ">";
                        break;
                case greater_or_equal:
-                       os << ">=";
+                       c.s << ">=";
                        break;
                default:
-                       os << "(INVALID RELATIONAL OPERATOR)";
-                       break;
+                       c.s << "(INVALID RELATIONAL OPERATOR)";
+               }
+               rh.print(c, precedence());
+               if (precedence() <= level)
+                       c.s << ")";
        }
-
-       // Print right-hand operator
-       rh.bp->printcsrc(os, type, precedence);
-
-       if (precedence <= upper_precedence)
-               os << ")";
 }
 
 bool relational::info(unsigned inf) const
@@ -255,15 +171,15 @@ ex & relational::let_op(int i)
 
        return i==0 ? lh : rh;
 }
-       
+
 ex relational::eval(int level) const
 {
-       if (level==1) {
+       if (level==1)
                return this->hold();
-       }
-       if (level == -max_recursion_level) {
+       
+       if (level == -max_recursion_level)
                throw(std::runtime_error("max recursion level reached"));
-       }
+       
        return (new relational(lh.eval(level-1),rh.eval(level-1),o))->setflag(status_flags::dynallocated | status_flags::evaluated);
 }
 
@@ -366,14 +282,4 @@ relational::operator bool() const
        }
 }
 
-//////////
-// static member variables
-//////////
-
-// protected
-
-unsigned relational::precedence=20;
-
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC