- ginac/operators.cpp: added some missing debugmsg()'s, which would have

[ginac.git] / ginac / operators.cpp

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index ea256a8ecb597bb30b4e23c4a87c277be453d7e3..f901760e72e3eb0421f6a4d076aed1d3e04ba8de 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -58,7 +58,7 @@ ex operator*(const ex & lh, const ex & rh)
 
 ex operator/(const ex & lh, const ex & rh)
 {
 
 ex operator/(const ex & lh, const ex & rh)
 {

-    debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
+    debugmsg("operator/(ex,ex)",LOGLEVEL_OPERATOR);

     return lh.exmul(power(rh,_ex_1()));
 }
 
     return lh.exmul(power(rh,_ex_1()));
 }
 


@@ -159,27 +159,32 @@ const numeric & operator/=(numeric & lh, const numeric & rh)
 
 ex operator+(const ex & lh)
 {
 
 ex operator+(const ex & lh)
 {

+    debugmsg("operator+(ex)",LOGLEVEL_OPERATOR);

     return lh;
 }
 
 ex operator-(const ex & lh)
 {
     return lh;
 }
 
 ex operator-(const ex & lh)
 {

+    debugmsg("operator-(ex)",LOGLEVEL_OPERATOR);

     return lh.exmul(_ex_1());
 }
 
 numeric operator+(const numeric & lh)
 {
     return lh.exmul(_ex_1());
 }
 
 numeric operator+(const numeric & lh)
 {

+    debugmsg("operator+(numeric)",LOGLEVEL_OPERATOR);

     return lh;
 }
 
 numeric operator-(const numeric & lh)
 {
     return lh;
 }
 
 numeric operator-(const numeric & lh)
 {

+    debugmsg("operator-(numeric)",LOGLEVEL_OPERATOR);

     return _num_1()*lh;
 }
 
 /** Numeric prefix increment.  Adds 1 and returns incremented number. */
 numeric& operator++(numeric & rh)
 {
     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;
 }
     rh = rh+_num1();
     return rh;
 }


@@ -187,6 +192,7 @@ numeric& operator++(numeric & rh)
 /** Numeric prefix decrement.  Subtracts 1 and returns decremented number. */
 numeric& operator--(numeric & rh)
 {
 /** Numeric prefix decrement.  Subtracts 1 and returns decremented number. */
 numeric& operator--(numeric & rh)
 {

+    debugmsg("operator--(numeric)",LOGLEVEL_OPERATOR);

     rh = rh-_num1();
     return rh;
 }
     rh = rh-_num1();
     return rh;
 }


@@ -195,6 +201,7 @@ numeric& operator--(numeric & rh)
  *  incremented by 1. */
 numeric operator++(numeric & lh, int)
 {
  *  incremented by 1. */
 numeric operator++(numeric & lh, int)
 {

+    debugmsg("operator++(numeric,int)",LOGLEVEL_OPERATOR);

     numeric tmp = lh;
     lh = lh+_num1();
     return tmp;
     numeric tmp = lh;
     lh = lh+_num1();
     return tmp;


@@ -204,6 +211,7 @@ numeric operator++(numeric & lh, int)
  *  decremented by 1. */
 numeric operator--(numeric & lh, int)
 {
  *  decremented by 1. */
 numeric operator--(numeric & lh, int)
 {

+    debugmsg("operator--(numeric,int)",LOGLEVEL_OPERATOR);

     numeric tmp = lh;
     lh = lh-_num1();
     return tmp;
     numeric tmp = lh;
     lh = lh-_num1();
     return tmp;


@@ -247,86 +255,6 @@ relational operator>=(const ex & lh, const ex & rh)
     return relational(lh,rh,relational::greater_or_equal);
 }
 
     return relational(lh,rh,relational::greater_or_equal);
 }
 

-/*
-
-// binary relational operators ex with numeric
-
-relational operator==(const ex & lh, const numeric & rh)
-{
-    debugmsg("operator==(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::equal);
-}
-
-relational operator!=(const ex & lh, const numeric & rh)
-{
-    debugmsg("operator!=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::not_equal);
-}
-
-relational operator<(const ex & lh, const numeric & rh)
-{
-    debugmsg("operator<(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less);
-}
-
-relational operator<=(const ex & lh, const numeric & rh)
-{
-    debugmsg("operator<=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less_or_equal);
-}
-
-relational operator>(const ex & lh, const numeric & rh)
-{
-    debugmsg("operator>(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater);
-}
-
-relational operator>=(const ex & lh, const numeric & rh)
-{
-    debugmsg("operator>=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater_or_equal);
-}
-
-// binary relational operators numeric with ex
-
-relational operator==(const numeric & lh, const ex & rh)
-{
-    debugmsg("operator==(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::equal);
-}
-
-relational operator!=(const numeric & lh, const ex & rh)
-{
-    debugmsg("operator!=(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::not_equal);
-}
-
-relational operator<(const numeric & lh, const ex & rh)
-{
-    debugmsg("operator<(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less);
-}
-
-relational operator<=(const numeric & lh, const ex & rh)
-{
-    debugmsg("operator<=(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less_or_equal);
-}
-
-relational operator>(const numeric & lh, const ex & rh)
-{
-    debugmsg("operator>(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater);
-}
-
-relational operator>=(const numeric & lh, const ex & rh)
-{
-    debugmsg("operator>=(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater_or_equal);
-}
-
-*/
-

 // input/output stream operators
 
 ostream & operator<<(ostream & os, const ex & e)
 // input/output stream operators
 
 ostream & operator<<(ostream & os, const ex & e)