- Banned exZERO(), exONE(), exMINUSHALF() and all this from the interface.

[ginac.git] / ginac / operators.cpp

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index b589c3c450b00d1dfb3d504f7866ce19e425082e..0fc42e78a6393b04a0d00ad64f67d942c971d728 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -1,7 +1,8 @@
 /** @file operators.cpp
  *
- *  Implementation of GiNaC's overloaded operators.
- *
+ *  Implementation of GiNaC's overloaded operators. */
+
+/*
  *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -22,7 +23,18 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "ginac.h"
+#include "operators.h"
+#include "basic.h"
+#include "ex.h"
+#include "numeric.h"
+#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
 
@@ -35,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)
@@ -47,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)
@@ -56,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
 
@@ -150,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)
@@ -182,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
 
@@ -253,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)
@@ -263,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
@@ -397,3 +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