X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Frelational.h;h=01c7eb23d9170aa09a9482d7f16c586dbf3ad0d1;hp=cbe51468eeb9691199a10c79d59a4bb41c8986cd;hb=b9bb1375207fef63d28d48420db42bd0461e73b3;hpb=5ef801553eb39aed7bd2df9dd1aff9d752c3ea9d diff --git a/ginac/relational.h b/ginac/relational.h index cbe51468..01c7eb23 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-2007 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,7 +51,6 @@ 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; @@ -64,10 +63,14 @@ 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(obj) for relational objects. */ -template<> inline bool is_exactly_a(const basic & obj) -{ - return obj.tinfo()==TINFO_relational; -} - // inlined functions for efficiency inline relational::safe_bool relational::operator!() const {