X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Frelational.h;h=b16b9d3f4f2aa0d59253f143fb3bd2d18cbb5c0b;hp=9f58e0c7125e0a2aae73e50e4822d014181eddd3;hb=9d92d4b442fc4c1a95685884be4ba0494cd02bbe;hpb=dbd9c306a74f1cb258c0d15a346b973b39deaad2;ds=sidebyside

diff --git a/ginac/relational.h b/ginac/relational.h
index 9f58e0c7..b16b9d3f 100644
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -3,7 +3,7 @@
  *  Interface to relations between expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __GINAC_RELATIONAL_H__
@@ -25,6 +25,7 @@
 
 #include "basic.h"
 #include "ex.h"
+#include "archive.h"
 
 namespace GiNaC {
 
@@ -45,36 +46,58 @@ public:
 		greater_or_equal
 	};
 	
-	// other ctors
+	// other constructors
 public:
 	relational(const ex & lhs, const ex & rhs, operators oper=equal);
 	
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
-	unsigned precedence(void) const {return 20;}
+	unsigned precedence() const {return 20;}
 	bool info(unsigned inf) const;
-	unsigned nops() const;
-	ex & let_op(int i);
+	size_t nops() const;
+	ex op(size_t i) const;
+	ex map(map_function & f) const;
+	ex subs(const exmap & m, unsigned options = 0) const;
 	ex eval(int level=0) const;
-	ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
-	ex simplify_ncmul(const exvector & v) const;
 
+	/** Save (a.k.a. serialize) object into archive. */
+	void archive(archive_node& n) const;
+	/** Read (a.k.a. deserialize) object from archive. */
+	void read_archive(const archive_node& n, lst& syms);
 protected:
+	ex eval_ncmul(const exvector & v) const;
 	bool match_same_type(const basic & other) const;
-	unsigned return_type(void) const;
-	unsigned return_type_tinfo(void) const;
-	unsigned calchash(void) const;
+	unsigned return_type() const;
+	return_type_t return_type_tinfo() const;
+	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(void) const;
-	virtual ex rhs(void) const;
+	virtual ex lhs() const;
+	virtual ex rhs() const;
 
 	// non-virtual functions in this class
-public:
-	operator bool(void) const;
+private:
+	// For conversions to boolean, as would be used in an if conditional,
+	// implicit conversions from bool to int have a large number of
+	// undesirable side effects.  The following safe_bool type enables
+	// use of relational objects in conditionals without those side effects
+	struct safe_bool_helper {
+		void nonnull() {};
+	};
+
+	typedef void (safe_bool_helper::*safe_bool)();
 	
+	safe_bool make_safe_bool(bool) const;
+
+public:
+	operator safe_bool() const;
+	safe_bool operator!() const;
+
 // member variables
 	
 protected:
@@ -82,13 +105,14 @@ protected:
 	ex rh;
 	operators o;
 };
+GINAC_DECLARE_UNARCHIVER(relational); 
 
 // utility functions
 
-/** Specialization of is_exactly_a<relational>(obj) for relational objects. */
-template<> inline bool is_exactly_a<relational>(const basic & obj)
+// inlined functions for efficiency
+inline relational::safe_bool relational::operator!() const
 {
-	return obj.tinfo()==TINFO_relational;
+	return make_safe_bool(!static_cast<bool>(*this));
 }
 
 } // namespace GiNaC