X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Foperators.cpp;h=00c33a73c0a0971bd71cae6d767fd558c62d04f7;hp=506f47b7a77e9d9b9072c4fca09e1e4683908f4f;hb=6399332bf75937cf57b5352884680897b517f4ba;hpb=703c6cebb5d3d395437e73e6935f3691aed68e0a

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index 506f47b7..00c33a73 100644
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's overloaded operators. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -20,76 +20,92 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <iostream>
-#include <stdexcept>
-
 #include "operators.h"
-#include "basic.h"
-#include "ex.h"
 #include "numeric.h"
+#include "add.h"
+#include "mul.h"
 #include "power.h"
+#include "ncmul.h"
 #include "relational.h"
+#include "print.h"
 #include "debugmsg.h"
 #include "utils.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
+
+/** Used internally by operator+() to add two ex objects together. */
+static inline const ex exadd(const ex & lh, const ex & rh)
+{
+	return (new add(lh,rh))->setflag(status_flags::dynallocated);
+}
+
+/** Used internally by operator*() to multiply two ex objects together. */
+static inline const ex exmul(const ex & lh, const ex & rh)
+{
+	// Check if we are constructing a mul object or a ncmul object.  Due to
+	// ncmul::eval()'s rule to pull out commutative elements we need to check
+	// only one of the elements.
+	if (rh.return_type()==return_types::commutative ||
+	    lh.return_type()==return_types::commutative)
+		return (new mul(lh,rh))->setflag(status_flags::dynallocated);
+	else
+		return (new ncmul(lh,rh))->setflag(status_flags::dynallocated);
+}
+
+/** Used internally by operator-() and friends to change the sign of an argument. */
+static inline const ex exminus(const ex & lh)
+{
+	return (new mul(lh,_ex_1()))->setflag(status_flags::dynallocated);
+}
 
 // binary arithmetic operators ex with ex
 
-ex operator+(const ex & lh, const ex & rh)
+const ex operator+(const ex & lh, const ex & rh)
 {
 	debugmsg("operator+(ex,ex)",LOGLEVEL_OPERATOR);
-	return lh.exadd(rh);
+	return exadd(lh, rh);
 }
 
-ex operator-(const ex & lh, const ex & rh)
+const ex operator-(const ex & lh, const ex & rh)
 {
 	debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
-	return lh.exadd(rh.exmul(_ex_1()));
+	return exadd(lh, exminus(rh));
 }
 
-ex operator*(const ex & lh, const ex & rh)
+const ex operator*(const ex & lh, const ex & rh)
 {
 	debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
-	return lh.exmul(rh);
+	return exmul(lh, rh);
 }
 
-ex operator/(const ex & lh, const ex & rh)
+const ex operator/(const ex & lh, const ex & rh)
 {
 	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);
+	return exmul(lh, power(rh,_ex_1()));
 }
 
 
 // binary arithmetic operators numeric with numeric
 
-numeric operator+(const numeric & lh, const numeric & rh)
+const numeric operator+(const numeric & lh, const numeric & rh)
 {
 	debugmsg("operator+(numeric,numeric)",LOGLEVEL_OPERATOR);
 	return lh.add(rh);
 }
 
-numeric operator-(const numeric & lh, const numeric & rh)
+const numeric operator-(const numeric & lh, const numeric & rh)
 {
 	debugmsg("operator-(numeric,numeric)",LOGLEVEL_OPERATOR);
 	return lh.sub(rh);
 }
 
-numeric operator*(const numeric & lh, const numeric & rh)
+const numeric operator*(const numeric & lh, const numeric & rh)
 {
 	debugmsg("operator*(numeric,numeric)",LOGLEVEL_OPERATOR);
 	return lh.mul(rh);
 }
 
-numeric operator/(const numeric & lh, const numeric & rh)
+const numeric operator/(const numeric & lh, const numeric & rh)
 {
 	debugmsg("operator/(numeric,ex)",LOGLEVEL_OPERATOR);
 	return lh.div(rh);
@@ -98,94 +114,130 @@ numeric operator/(const numeric & lh, const numeric & rh)
 
 // binary arithmetic assignment operators with ex
 
-const ex & operator+=(ex & lh, const ex & rh)
+ex & operator+=(ex & lh, const ex & rh)
 {
 	debugmsg("operator+=(ex,ex)",LOGLEVEL_OPERATOR);
-	return (lh=lh+rh);
+	return lh = exadd(lh, rh);
 }
 
-const ex & operator-=(ex & lh, const ex & rh)
+ex & operator-=(ex & lh, const ex & rh)
 {
 	debugmsg("operator-=(ex,ex)",LOGLEVEL_OPERATOR);
-	return (lh=lh-rh);
+	return lh = exadd(lh, exminus(rh));
 }
 
-const ex & operator*=(ex & lh, const ex & rh)
+ex & operator*=(ex & lh, const ex & rh)
 {
 	debugmsg("operator*=(ex,ex)",LOGLEVEL_OPERATOR);
-	return (lh=lh*rh);
+	return lh = exmul(lh, rh);
 }
 
-const ex & operator/=(ex & lh, const ex & rh)
+ex & operator/=(ex & lh, const ex & 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);
+	return lh = exmul(lh, power(rh,_ex_1()));
 }
 
 
 // binary arithmetic assignment operators with numeric
 
-const numeric & operator+=(numeric & lh, const numeric & rh)
+numeric & operator+=(numeric & lh, const numeric & rh)
 {
 	debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
-	return (lh=lh.add(rh));
+	lh = lh.add(rh);
+	return lh;
 }
 
-const numeric & operator-=(numeric & lh, const numeric & rh)
+numeric & operator-=(numeric & lh, const numeric & rh)
 {
 	debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
-	return (lh=lh.sub(rh));
+	lh = lh.sub(rh);
+	return lh;
 }
 
-const numeric & operator*=(numeric & lh, const numeric & rh)
+numeric & operator*=(numeric & lh, const numeric & rh)
 {
 	debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
-	return (lh=lh.mul(rh));
+	lh = lh.mul(rh);
+	return lh;
 }
 
-const numeric & operator/=(numeric & lh, const numeric & rh)
+numeric & operator/=(numeric & lh, const numeric & rh)
 {
 	debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
-	return (lh=lh.div(rh));
+	lh = lh.div(rh);
+	return lh;
 }
 
+
 // unary operators
 
-ex operator+(const ex & lh)
+const ex operator+(const ex & lh)
 {
 	debugmsg("operator+(ex)",LOGLEVEL_OPERATOR);
 	return lh;
 }
 
-ex operator-(const ex & lh)
+const ex operator-(const ex & lh)
 {
 	debugmsg("operator-(ex)",LOGLEVEL_OPERATOR);
-	return lh.exmul(_ex_1());
+	return exminus(lh);
 }
 
-numeric operator+(const numeric & lh)
+const numeric operator+(const numeric & lh)
 {
 	debugmsg("operator+(numeric)",LOGLEVEL_OPERATOR);
 	return lh;
 }
 
-numeric operator-(const numeric & lh)
+const numeric operator-(const numeric & lh)
 {
 	debugmsg("operator-(numeric)",LOGLEVEL_OPERATOR);
-	return _num_1()*lh;
+	return _num_1().mul(lh);
+}
+
+
+// increment / decrement operators
+
+/** Expression prefix increment.  Adds 1 and returns incremented ex. */
+ex & operator++(ex & rh)
+{
+	debugmsg("operator++(ex)",LOGLEVEL_OPERATOR);
+	return rh = exadd(rh, _ex1());
+}
+
+/** Expression prefix decrement.  Subtracts 1 and returns decremented ex. */
+ex & operator--(ex & rh)
+{
+	debugmsg("operator--(ex)",LOGLEVEL_OPERATOR);
+	return rh = exadd(rh, _ex_1());
+}
+
+/** Expression postfix increment.  Returns the ex and leaves the original
+ *  incremented by 1. */
+const ex operator++(ex & lh, int)
+{
+	debugmsg("operator++(ex,int)",LOGLEVEL_OPERATOR);
+	ex tmp(lh);
+	lh = exadd(lh, _ex1());
+	return tmp;
+}
+
+/** Expression Postfix decrement.  Returns the ex and leaves the original
+ *  decremented by 1. */
+const ex operator--(ex & lh, int)
+{
+	debugmsg("operator--(ex,int)",LOGLEVEL_OPERATOR);
+	ex tmp(lh);
+	lh = exadd(lh, _ex_1());
+	return tmp;
 }
 
 /** Numeric prefix increment.  Adds 1 and returns incremented number. */
 numeric& operator++(numeric & rh)
 {
 	debugmsg("operator++(numeric)",LOGLEVEL_OPERATOR);
-	rh = rh+_num1();
+	rh = rh.add(_num1());
 	return rh;
 }
 
@@ -193,63 +245,63 @@ numeric& operator++(numeric & rh)
 numeric& operator--(numeric & rh)
 {
 	debugmsg("operator--(numeric)",LOGLEVEL_OPERATOR);
-	rh = rh-_num1();
+	rh = rh.add(_num_1());
 	return rh;
 }
 
 /** Numeric postfix increment.  Returns the number and leaves the original
  *  incremented by 1. */
-numeric operator++(numeric & lh, int)
+const numeric operator++(numeric & lh, int)
 {
 	debugmsg("operator++(numeric,int)",LOGLEVEL_OPERATOR);
-	numeric tmp = lh;
-	lh = lh+_num1();
+	numeric tmp(lh);
+	lh = lh.add(_num1());
 	return tmp;
 }
 
 /** Numeric Postfix decrement.  Returns the number and leaves the original
  *  decremented by 1. */
-numeric operator--(numeric & lh, int)
+const numeric operator--(numeric & lh, int)
 {
 	debugmsg("operator--(numeric,int)",LOGLEVEL_OPERATOR);
-	numeric tmp = lh;
-	lh = lh-_num1();
+	numeric tmp(lh);
+	lh = lh.add(_num_1());
 	return tmp;
 }
 
 // binary relational operators ex with ex
 
-relational operator==(const ex & lh, const ex & rh)
+const relational operator==(const ex & lh, const ex & rh)
 {
 	debugmsg("operator==(ex,ex)",LOGLEVEL_OPERATOR);
 	return relational(lh,rh,relational::equal);
 }
 
-relational operator!=(const ex & lh, const ex & rh)
+const relational operator!=(const ex & lh, const ex & rh)
 {
 	debugmsg("operator!=(ex,ex)",LOGLEVEL_OPERATOR);
 	return relational(lh,rh,relational::not_equal);
 }
 
-relational operator<(const ex & lh, const ex & rh)
+const relational operator<(const ex & lh, const ex & rh)
 {
 	debugmsg("operator<(ex,ex)",LOGLEVEL_OPERATOR);
 	return relational(lh,rh,relational::less);
 }
 
-relational operator<=(const ex & lh, const ex & rh)
+const relational operator<=(const ex & lh, const ex & rh)
 {
 	debugmsg("operator<=(ex,ex)",LOGLEVEL_OPERATOR);
 	return relational(lh,rh,relational::less_or_equal);
 }
 
-relational operator>(const ex & lh, const ex & rh)
+const relational operator>(const ex & lh, const ex & rh)
 {
 	debugmsg("operator>(ex,ex)",LOGLEVEL_OPERATOR);
 	return relational(lh,rh,relational::greater);
 }
 
-relational operator>=(const ex & lh, const ex & rh)
+const relational operator>=(const ex & lh, const ex & rh)
 {
 	debugmsg("operator>=(ex,ex)",LOGLEVEL_OPERATOR);
 	return relational(lh,rh,relational::greater_or_equal);
@@ -259,7 +311,7 @@ relational operator>=(const ex & lh, const ex & rh)
 
 std::ostream & operator<<(std::ostream & os, const ex & e)
 {
-	e.print(os);
+	e.print(print_context(os));
 	return os;
 }
 
@@ -268,6 +320,4 @@ std::istream & operator>>(std::istream & is, ex & e)
 	throw (std::logic_error("expression input from streams not implemented"));
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC