X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Foperators.cpp;h=9e1f2b1d038af44a60bd8d540fa4c4187a156787;hp=d9882c0e235f5ba5c36e22461c7dc4e1c27e2c38;hb=cf8f92747d9bd3f54f9dd206f7952eba12f7c791;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index d9882c0e..9e1f2b1d 100644
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's overloaded operators. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -30,8 +30,11 @@
 #include "power.h"
 #include "relational.h"
 #include "debugmsg.h"
+#include "utils.h"
 
+#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 // binary arithmetic operators ex with ex
 
@@ -44,7 +47,7 @@ ex operator+(ex const & lh, ex const & rh)
 ex operator-(ex const & lh, ex const & rh)
 {
     debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exadd(rh.exmul(exMINUSONE()));
+    return lh.exadd(rh.exmul(_ex_1()));
 }
 
 ex operator*(ex const & lh, ex const & rh)
@@ -56,7 +59,7 @@ ex operator*(ex const & lh, ex const & rh)
 ex operator/(ex const & lh, ex const & rh)
 {
     debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exmul(power(rh,exMINUSONE()));
+    return lh.exmul(power(rh,_ex_1()));
 }
 
 ex operator%(ex const & lh, ex const & rh)
@@ -65,73 +68,6 @@ ex operator%(ex const & lh, ex const & rh)
     return lh.exncmul(rh);
 }
 
-/*
-
-// binary arithmetic operators ex with numeric
-
-ex operator+(ex const & lh, numeric const & rh)
-{
-    debugmsg("operator+(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh+ex(rh);
-}
-
-ex operator-(ex const & lh, numeric const & rh)
-{
-    debugmsg("operator-(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh-ex(rh);
-}
-
-ex operator*(ex const & lh, numeric const & rh)
-{
-    debugmsg("operator*(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh*ex(rh);
-}
-
-ex operator/(ex const & lh, numeric const & rh)
-{
-    debugmsg("operator/(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh/ex(rh);
-}
-
-ex operator%(ex const & lh, numeric const & rh)
-{
-    debugmsg("operator%(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh%ex(rh);
-}
-
-// binary arithmetic operators numeric with ex
-
-ex operator+(numeric const & lh, ex const & rh)
-{
-    debugmsg("operator+(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)+rh;
-}
-
-ex operator-(numeric const & lh, ex const & rh)
-{
-    debugmsg("operator-(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)-rh;
-}
-
-ex operator*(numeric const & lh, ex const & rh)
-{
-    debugmsg("operator*(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)*rh;
-}
-
-ex operator/(numeric const & lh, ex const & rh)
-{
-    debugmsg("operator/(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)/rh;
-}
-
-ex operator%(numeric const & lh, ex const & rh)
-{
-    debugmsg("operator%(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)%rh;
-}
-
-*/
 
 // binary arithmetic operators numeric with numeric
 
@@ -159,6 +95,7 @@ numeric operator/(numeric const & lh, numeric const & rh)
     return lh.div(rh);
 }
 
+
 // binary arithmetic assignment operators with ex
 
 ex const & operator+=(ex & lh, ex const & rh)
@@ -191,41 +128,6 @@ ex const & operator%=(ex & lh, ex const & rh)
     return (lh=lh%rh);
 }
 
-/*
-
-// binary arithmetic assignment operators with numeric
-
-ex const & operator+=(ex & lh, numeric const & rh)
-{
-    debugmsg("operator+=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh+ex(rh));
-}
-
-ex const & operator-=(ex & lh, numeric const & rh)
-{
-    debugmsg("operator-=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh-ex(rh));
-}
-
-ex const & operator*=(ex & lh, numeric const & rh)
-{
-    debugmsg("operator*=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh*ex(rh));
-}
-
-ex const & operator/=(ex & lh, numeric const & rh)
-{
-    debugmsg("operator/=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh/ex(rh));
-}
-
-ex const & operator%=(ex & lh, numeric const & rh)
-{
-    debugmsg("operator%=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh%ex(rh));
-}
-
-*/
 
 // binary arithmetic assignment operators with numeric
 
@@ -262,7 +164,7 @@ ex operator+(ex const & lh)
 
 ex operator-(ex const & lh)
 {
-    return exMINUSONE()*lh;
+    return lh.exmul(_ex_1());
 }
 
 numeric operator+(numeric const & lh)
@@ -272,7 +174,39 @@ numeric operator+(numeric const & lh)
 
 numeric operator-(numeric const & lh)
 {
-    return (numeric(-1)*lh);
+    return _num_1()*lh;
+}
+
+/** Numeric prefix increment.  Adds 1 and returns incremented number. */
+numeric& operator++(numeric & rh)
+{
+    rh = rh+_num1();
+    return rh;
+}
+
+/** Numeric prefix decrement.  Subtracts 1 and returns decremented number. */
+numeric& operator--(numeric & rh)
+{
+    rh = rh-_num1();
+    return rh;
+}
+
+/** Numeric postfix increment.  Returns the number and leaves the original
+ *  incremented by 1. */
+numeric operator++(numeric & lh, int)
+{
+    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)
+{
+    numeric tmp = lh;
+    lh = lh-_num1();
+    return tmp;
 }
 
 // binary relational operators ex with ex
@@ -406,4 +340,6 @@ istream & operator>>(istream & is, ex & e)
     throw(std::logic_error("input from streams not yet implemented"));
 }
 
+#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE