X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=inline;f=ginac%2Foperators.h;h=a602323bf73bc40dc1bb342e95d7a2906a5a1e83;hb=38e03cb00e07aa13d10ba75f79a5fee593b6f2cb;hp=7ccd39f69bf17cdcafe665281bc28f0be0811229;hpb=a8507b8af1c08d9b27d98d57f95c7ca1a8671e27;p=ginac.git

diff --git a/ginac/operators.h b/ginac/operators.h
index 7ccd39f6..a602323b 100644
--- a/ginac/operators.h
+++ b/ginac/operators.h
@@ -1,8 +1,9 @@
 /** @file operators.h
  *
- *  Interface to GiNaC's overloaded operators.
- *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  Interface to GiNaC's overloaded operators. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -16,106 +17,88 @@
  *
  *  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_OPERATORS_H__
-#define __GINAC_OPERATORS_H__
+#ifndef GINAC_OPERATORS_H
+#define GINAC_OPERATORS_H
 
-#include <iostream>
+#include <iosfwd>
 
-// binary arithmetic operators ex with ex
-ex operator+(ex const & lh, ex const & rh);
-ex operator-(ex const & lh, ex const & rh);
-ex operator*(ex const & lh, ex const & rh);
-ex operator/(ex const & lh, ex const & rh);
-ex operator%(ex const & lh, ex const & rh); // non-commutative multiplication
+namespace GiNaC {
 
-/*
+class ex;
+class numeric;
+class relational;
 
-// binary arithmetic operators ex with numeric
-ex operator+(ex const & lh, numeric const & rh);
-ex operator-(ex const & lh, numeric const & rh);
-ex operator*(ex const & lh, numeric const & rh);
-ex operator/(ex const & lh, numeric const & rh);
-ex operator%(ex const & lh, numeric const & rh); // non-commutative multiplication
-
-// binary arithmetic operators numeric with ex
-ex operator+(numeric const & lh, ex const & rh);
-ex operator-(numeric const & lh, ex const & rh);
-ex operator*(numeric const & lh, ex const & rh);
-ex operator/(numeric const & lh, ex const & rh);
-ex operator%(numeric const & lh, ex const & rh); // non-commutative multiplication
-
-*/
+// binary arithmetic operators ex with ex
+const ex operator+(const ex & lh, const ex & rh);
+const ex operator-(const ex & lh, const ex & rh);
+const ex operator*(const ex & lh, const ex & rh);
+const ex operator/(const ex & lh, const ex & rh);
 
 // binary arithmetic operators numeric with numeric
-numeric operator+(numeric const & lh, numeric const & rh);
-numeric operator-(numeric const & lh, numeric const & rh);
-numeric operator*(numeric const & lh, numeric const & rh);
-numeric operator/(numeric const & lh, numeric const & rh);
+const numeric operator+(const numeric & lh, const numeric & rh);
+const numeric operator-(const numeric & lh, const numeric & rh);
+const numeric operator*(const numeric & lh, const numeric & rh);
+const numeric operator/(const numeric & lh, const numeric & rh);
 
 // binary arithmetic assignment operators with ex
-ex const & operator+=(ex & lh, ex const & rh);
-ex const & operator-=(ex & lh, ex const & rh);
-ex const & operator*=(ex & lh, ex const & rh);
-ex const & operator/=(ex & lh, ex const & rh);
-ex const & operator%=(ex & lh, ex const & rh); // non-commutative multiplication
-
-/*
-  
-// binary arithmetic assignment operators with numeric
-ex const & operator+=(ex & lh, numeric const & rh);
-ex const & operator-=(ex & lh, numeric const & rh);
-ex const & operator*=(ex & lh, numeric const & rh);
-ex const & operator/=(ex & lh, numeric const & rh);
-ex const & operator%=(ex & lh, numeric const & rh); // non-commutative multiplication
-
-*/
+ex & operator+=(ex & lh, const ex & rh);
+ex & operator-=(ex & lh, const ex & rh);
+ex & operator*=(ex & lh, const ex & rh);
+ex & operator/=(ex & lh, const ex & rh);
 
 // binary arithmetic assignment operators with numeric
-numeric const & operator+=(numeric & lh, numeric const & rh);
-numeric const & operator-=(numeric & lh, numeric const & rh);
-numeric const & operator*=(numeric & lh, numeric const & rh);
-numeric const & operator/=(numeric & lh, numeric const & rh);
+numeric & operator+=(numeric & lh, const numeric & rh);
+numeric & operator-=(numeric & lh, const numeric & rh);
+numeric & operator*=(numeric & lh, const numeric & rh);
+numeric & operator/=(numeric & lh, const numeric & rh);
 
 // unary operators
-ex operator+(ex const & lh);
-ex operator-(ex const & lh);
+const ex operator+(const ex & lh);
+const ex operator-(const ex & lh);
 
-numeric operator+(numeric const & lh);
-numeric operator-(numeric const & lh);
+const numeric operator+(const numeric & lh);
+const numeric operator-(const numeric & lh);
 
-// binary relational operators ex with ex
-relational operator==(ex const & lh, ex const & rh);
-relational operator!=(ex const & lh, ex const & rh);
-relational operator<(ex const & lh, ex const & rh);
-relational operator<=(ex const & lh, ex const & rh);
-relational operator>(ex const & lh, ex const & rh);
-relational operator>=(ex const & lh, ex const & rh);
+// increment / decrement operators
+ex & operator++(ex & rh);
+ex & operator--(ex & rh);
+const ex operator++(ex & lh, int);
+const ex operator--(ex & lh, int);
 
-/*
+numeric& operator++(numeric & rh);
+numeric& operator--(numeric & rh);
+const numeric operator++(numeric & lh, int);
+const numeric operator--(numeric & lh, int);
 
-// binary relational operators ex with numeric
-relational operator==(ex const & lh, numeric const & rh);
-relational operator!=(ex const & lh, numeric const & rh);
-relational operator<(ex const & lh, numeric const & rh);
-relational operator<=(ex const & lh, numeric const & rh);
-relational operator>(ex const & lh, numeric const & rh);
-relational operator>=(ex const & lh, numeric const & rh);
-
-// binary relational operators numeric with ex
-relational operator==(numeric const & lh, ex const & rh);
-relational operator!=(numeric const & lh, ex const & rh);
-relational operator<(numeric const & lh, ex const & rh);
-relational operator<=(numeric const & lh, ex const & rh);
-relational operator>(numeric const & lh, ex const & rh);
-relational operator>=(numeric const & lh, ex const & rh);
-
-*/
+// binary relational operators ex with ex
+const relational operator==(const ex & lh, const ex & rh);
+const relational operator!=(const ex & lh, const ex & rh);
+const relational operator<(const ex & lh, const ex & rh);
+const relational operator<=(const ex & lh, const ex & rh);
+const relational operator>(const ex & lh, const ex & rh);
+const relational operator>=(const ex & lh, const ex & rh);
 
 // input/output stream operators
-ostream & operator<<(ostream & os, ex const & e);
-istream & operator>>(istream & is, ex & e);
-
-#endif // ndef __GINAC_OPERATORS_H__
+std::ostream & operator<<(std::ostream & os, const ex & e);
+std::istream & operator>>(std::istream & is, ex & e);
+
+// input/output stream manipulators
+std::ostream & dflt(std::ostream & os);
+std::ostream & latex(std::ostream & os);
+std::ostream & python(std::ostream & os);
+std::ostream & python_repr(std::ostream & os);
+std::ostream & tree(std::ostream & os);
+std::ostream & csrc(std::ostream & os); // same as csrc_double
+std::ostream & csrc_float(std::ostream & os);
+std::ostream & csrc_double(std::ostream & os);
+std::ostream & csrc_cl_N(std::ostream & os);
+
+std::ostream & index_dimensions(std::ostream & os);
+std::ostream & no_index_dimensions(std::ostream & os);
+
+} // namespace GiNaC
+
+#endif // ndef GINAC_OPERATORS_H