X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Foperators.cpp;h=506f47b7a77e9d9b9072c4fca09e1e4683908f4f;hb=9e2d60e206395fc9908e1f9025e50c76b3d7c182;hp=f901760e72e3eb0421f6a4d076aed1d3e04ba8de;hpb=be6cad814c18ff39f4e16c32441e98e6d72f32d4;p=ginac.git

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index f901760e..506f47b7 100644
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -40,32 +40,32 @@ namespace GiNaC {
 
 ex operator+(const ex & lh, const ex & rh)
 {
-    debugmsg("operator+(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exadd(rh);
+	debugmsg("operator+(ex,ex)",LOGLEVEL_OPERATOR);
+	return lh.exadd(rh);
 }
 
 ex operator-(const ex & lh, const ex & rh)
 {
-    debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exadd(rh.exmul(_ex_1()));
+	debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
+	return lh.exadd(rh.exmul(_ex_1()));
 }
 
 ex operator*(const ex & lh, const ex & rh)
 {
-    debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exmul(rh);
+	debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
+	return lh.exmul(rh);
 }
 
 ex operator/(const ex & lh, const ex & rh)
 {
-    debugmsg("operator/(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exmul(power(rh,_ex_1()));
+	debugmsg("operator/(ex,ex)",LOGLEVEL_OPERATOR);
+	return lh.exmul(power(rh,_ex_1()));
 }
 
 ex operator%(const ex & lh, const ex & rh)
 {
-    debugmsg("operator%(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exncmul(rh);
+	debugmsg("operator%(ex,ex)",LOGLEVEL_OPERATOR);
+	return lh.exncmul(rh);
 }
 
 
@@ -73,26 +73,26 @@ ex operator%(const ex & lh, const ex & rh)
 
 numeric operator+(const numeric & lh, const numeric & rh)
 {
-    debugmsg("operator+(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return lh.add(rh);
+	debugmsg("operator+(numeric,numeric)",LOGLEVEL_OPERATOR);
+	return lh.add(rh);
 }
 
 numeric operator-(const numeric & lh, const numeric & rh)
 {
-    debugmsg("operator-(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return lh.sub(rh);
+	debugmsg("operator-(numeric,numeric)",LOGLEVEL_OPERATOR);
+	return lh.sub(rh);
 }
 
 numeric operator*(const numeric & lh, const numeric & rh)
 {
-    debugmsg("operator*(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return lh.mul(rh);
+	debugmsg("operator*(numeric,numeric)",LOGLEVEL_OPERATOR);
+	return lh.mul(rh);
 }
 
 numeric operator/(const numeric & lh, const numeric & rh)
 {
-    debugmsg("operator/(numeric,ex)",LOGLEVEL_OPERATOR);
-    return lh.div(rh);
+	debugmsg("operator/(numeric,ex)",LOGLEVEL_OPERATOR);
+	return lh.div(rh);
 }
 
 
@@ -100,32 +100,32 @@ numeric operator/(const numeric & lh, const numeric & rh)
 
 const ex & operator+=(ex & lh, const ex & rh)
 {
-    debugmsg("operator+=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh+rh);
+	debugmsg("operator+=(ex,ex)",LOGLEVEL_OPERATOR);
+	return (lh=lh+rh);
 }
 
 const ex & operator-=(ex & lh, const ex & rh)
 {
-    debugmsg("operator-=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh-rh);
+	debugmsg("operator-=(ex,ex)",LOGLEVEL_OPERATOR);
+	return (lh=lh-rh);
 }
 
 const ex & operator*=(ex & lh, const ex & rh)
 {
-    debugmsg("operator*=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh*rh);
+	debugmsg("operator*=(ex,ex)",LOGLEVEL_OPERATOR);
+	return (lh=lh*rh);
 }
 
 const ex & operator/=(ex & lh, const ex & rh)
 {
-    debugmsg("operator/=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh/rh);
+	debugmsg("operator/=(ex,ex)",LOGLEVEL_OPERATOR);
+	return (lh=lh/rh);
 }
 
 const ex & operator%=(ex & lh, const ex & rh)
 {
-    debugmsg("operator%=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh%rh);
+	debugmsg("operator%=(ex,ex)",LOGLEVEL_OPERATOR);
+	return (lh=lh%rh);
 }
 
 
@@ -133,139 +133,139 @@ const ex & operator%=(ex & lh, const ex & rh)
 
 const numeric & operator+=(numeric & lh, const numeric & rh)
 {
-    debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh.add(rh));
+	debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
+	return (lh=lh.add(rh));
 }
 
 const numeric & operator-=(numeric & lh, const numeric & rh)
 {
-    debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh.sub(rh));
+	debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
+	return (lh=lh.sub(rh));
 }
 
 const numeric & operator*=(numeric & lh, const numeric & rh)
 {
-    debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh.mul(rh));
+	debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
+	return (lh=lh.mul(rh));
 }
 
 const numeric & operator/=(numeric & lh, const numeric & rh)
 {
-    debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh.div(rh));
+	debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
+	return (lh=lh.div(rh));
 }
 
 // unary operators
 
 ex operator+(const ex & lh)
 {
-    debugmsg("operator+(ex)",LOGLEVEL_OPERATOR);
-    return lh;
+	debugmsg("operator+(ex)",LOGLEVEL_OPERATOR);
+	return lh;
 }
 
 ex operator-(const ex & lh)
 {
-    debugmsg("operator-(ex)",LOGLEVEL_OPERATOR);
-    return lh.exmul(_ex_1());
+	debugmsg("operator-(ex)",LOGLEVEL_OPERATOR);
+	return lh.exmul(_ex_1());
 }
 
 numeric operator+(const numeric & lh)
 {
-    debugmsg("operator+(numeric)",LOGLEVEL_OPERATOR);
-    return lh;
+	debugmsg("operator+(numeric)",LOGLEVEL_OPERATOR);
+	return lh;
 }
 
 numeric operator-(const numeric & lh)
 {
-    debugmsg("operator-(numeric)",LOGLEVEL_OPERATOR);
-    return _num_1()*lh;
+	debugmsg("operator-(numeric)",LOGLEVEL_OPERATOR);
+	return _num_1()*lh;
 }
 
 /** Numeric prefix increment.  Adds 1 and returns incremented number. */
 numeric& operator++(numeric & rh)
 {
-    debugmsg("operator++(numeric)",LOGLEVEL_OPERATOR);
-    rh = rh+_num1();
-    return rh;
+	debugmsg("operator++(numeric)",LOGLEVEL_OPERATOR);
+	rh = rh+_num1();
+	return rh;
 }
 
 /** Numeric prefix decrement.  Subtracts 1 and returns decremented number. */
 numeric& operator--(numeric & rh)
 {
-    debugmsg("operator--(numeric)",LOGLEVEL_OPERATOR);
-    rh = rh-_num1();
-    return rh;
+	debugmsg("operator--(numeric)",LOGLEVEL_OPERATOR);
+	rh = rh-_num1();
+	return rh;
 }
 
 /** Numeric postfix increment.  Returns the number and leaves the original
  *  incremented by 1. */
 numeric operator++(numeric & lh, int)
 {
-    debugmsg("operator++(numeric,int)",LOGLEVEL_OPERATOR);
-    numeric tmp = lh;
-    lh = lh+_num1();
-    return tmp;
+	debugmsg("operator++(numeric,int)",LOGLEVEL_OPERATOR);
+	numeric tmp = lh;
+	lh = lh+_num1();
+	return tmp;
 }
 
 /** Numeric Postfix decrement.  Returns the number and leaves the original
  *  decremented by 1. */
 numeric operator--(numeric & lh, int)
 {
-    debugmsg("operator--(numeric,int)",LOGLEVEL_OPERATOR);
-    numeric tmp = lh;
-    lh = lh-_num1();
-    return tmp;
+	debugmsg("operator--(numeric,int)",LOGLEVEL_OPERATOR);
+	numeric tmp = lh;
+	lh = lh-_num1();
+	return tmp;
 }
 
 // binary relational operators ex with ex
 
 relational operator==(const ex & lh, const ex & rh)
 {
-    debugmsg("operator==(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::equal);
+	debugmsg("operator==(ex,ex)",LOGLEVEL_OPERATOR);
+	return relational(lh,rh,relational::equal);
 }
 
 relational operator!=(const ex & lh, const ex & rh)
 {
-    debugmsg("operator!=(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::not_equal);
+	debugmsg("operator!=(ex,ex)",LOGLEVEL_OPERATOR);
+	return relational(lh,rh,relational::not_equal);
 }
 
 relational operator<(const ex & lh, const ex & rh)
 {
-    debugmsg("operator<(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less);
+	debugmsg("operator<(ex,ex)",LOGLEVEL_OPERATOR);
+	return relational(lh,rh,relational::less);
 }
 
 relational operator<=(const ex & lh, const ex & rh)
 {
-    debugmsg("operator<=(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less_or_equal);
+	debugmsg("operator<=(ex,ex)",LOGLEVEL_OPERATOR);
+	return relational(lh,rh,relational::less_or_equal);
 }
 
 relational operator>(const ex & lh, const ex & rh)
 {
-    debugmsg("operator>(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater);
+	debugmsg("operator>(ex,ex)",LOGLEVEL_OPERATOR);
+	return relational(lh,rh,relational::greater);
 }
 
 relational operator>=(const ex & lh, const ex & rh)
 {
-    debugmsg("operator>=(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater_or_equal);
+	debugmsg("operator>=(ex,ex)",LOGLEVEL_OPERATOR);
+	return relational(lh,rh,relational::greater_or_equal);
 }
 
 // input/output stream operators
 
-ostream & operator<<(ostream & os, const ex & e)
+std::ostream & operator<<(std::ostream & os, const ex & e)
 {
-    e.print(os);
-    return os;
+	e.print(os);
+	return os;
 }
 
-istream & operator>>(istream & is, ex & e)
+std::istream & operator>>(std::istream & is, ex & e)
 {
-    throw (std::logic_error("expression input from streams not implemented"));
+	throw (std::logic_error("expression input from streams not implemented"));
 }
 
 #ifndef NO_NAMESPACE_GINAC