X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Frelational.h;h=20e720dc0f4524e10d78b2c1b426b880d545efce;hp=591cc3b718486421006ed41cd051575641b04449;hb=67467d256b44f5e08498ca81c946d9ffaa25d1e2;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926

diff --git a/ginac/relational.h b/ginac/relational.h
index 591cc3b7..20e720dc 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__
@@ -51,23 +51,26 @@ 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;
 	ex op(size_t i) const;
 	ex map(map_function & f) const;
-	ex subs(const lst & ls, const lst & lr, unsigned options = 0) const;
+	ex subs(const exmap & m, unsigned options = 0) const;
 	ex eval(int level=0) const;
 
 protected:
 	ex eval_ncmul(const exvector & v) const;
 	bool match_same_type(const basic & other) const;
 	unsigned return_type() const;
-	unsigned return_type_tinfo() const;
+	tinfo_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() const;
 	virtual ex rhs() const;
@@ -100,12 +103,6 @@ protected:
 
 // utility functions
 
-/** Specialization of is_exactly_a<relational>(obj) for relational objects. */
-template<> inline bool is_exactly_a<relational>(const basic & obj)
-{
-	return obj.tinfo()==TINFO_relational;
-}
-
 // inlined functions for efficiency
 inline relational::safe_bool relational::operator!() const
 {