X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Frelational.cpp;h=51fd0f18ef9865b38b7ad91e908c74b81b24a757;hp=b22a6387b837e4f0193d01ce5369d1a1dad92eb8;hb=d508ca04e9c2f4ee103c9f21f33a98c87116df13;hpb=4e3a4ac2bcb0837611ea31bc8fc05d84a20c33ac

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index b22a6387..51fd0f18 100644
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -24,6 +24,7 @@
 
 #include "relational.h"
 #include "numeric.h"
+#include "print.h"
 #include "archive.h"
 #include "utils.h"
 #include "debugmsg.h"
@@ -36,15 +37,11 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(relational, basic)
 // default ctor, dtor, copy ctor assignment operator and helpers
 //////////
 
-// public
-
 relational::relational() : basic(TINFO_relational)
 {
 	debugmsg("relational default ctor",LOGLEVEL_CONSTRUCT);
 }
 
-// protected
-
 void relational::copy(const relational & other)
 {
 	basic::copy(other);
@@ -53,10 +50,7 @@ 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 ctors
@@ -76,7 +70,6 @@ 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 ctor from archive_node", LOGLEVEL_CONSTRUCT);
@@ -88,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);
@@ -103,115 +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
 
-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