* Implementation of GiNaC's overloaded operators. */
/*
- * GiNaC Copyright (C) 1999 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
* 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"
-// binary arithmetic operators ex with ex
-
-ex operator+(ex const & lh, ex const & rh)
-{
- debugmsg("operator+(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exadd(rh);
-}
-
-ex operator-(ex const & lh, ex const & rh)
-{
- debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exadd(rh.exmul(exMINUSONE()));
-}
-
-ex operator*(ex const & lh, ex const & rh)
-{
- debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exmul(rh);
-}
+namespace GiNaC {
-ex operator/(ex const & lh, ex const & rh)
+/** Used internally by operator+() to add two ex objects together. */
+static inline const ex exadd(const ex & lh, const ex & rh)
{
- debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exmul(power(rh,exMINUSONE()));
+ return (new add(lh,rh))->setflag(status_flags::dynallocated);
}
-ex operator%(ex const & lh, ex const & rh)
+/** Used internally by operator*() to multiply two ex objects together. */
+static inline const ex exmul(const ex & lh, const ex & rh)
{
- debugmsg("operator%(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exncmul(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);
}
-/*
-
-// binary arithmetic operators ex with numeric
-
-ex operator+(ex const & lh, numeric const & rh)
+/** Used internally by operator-() and friends to change the sign of an argument. */
+static inline const ex exminus(const ex & lh)
{
- debugmsg("operator+(ex,numeric)",LOGLEVEL_OPERATOR);
- return lh+ex(rh);
+ return (new mul(lh,_ex_1()))->setflag(status_flags::dynallocated);
}
-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;
-}
+// binary arithmetic operators ex with ex
-ex operator-(numeric const & lh, ex const & rh)
+const ex operator+(const ex & lh, const ex & rh)
{
- debugmsg("operator-(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)-rh;
+ debugmsg("operator+(ex,ex)",LOGLEVEL_OPERATOR);
+ return exadd(lh, rh);
}
-ex operator*(numeric const & lh, ex const & rh)
+const ex operator-(const ex & lh, const ex & rh)
{
- debugmsg("operator*(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)*rh;
+ debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
+ return exadd(lh, exminus(rh));
}
-ex operator/(numeric const & lh, ex const & rh)
+const ex operator*(const ex & lh, const ex & rh)
{
- debugmsg("operator/(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)/rh;
+ debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
+ return exmul(lh, rh);
}
-ex operator%(numeric const & lh, ex const & rh)
+const ex operator/(const ex & lh, const ex & rh)
{
- debugmsg("operator%(numeric,ex)",LOGLEVEL_OPERATOR);
- return ex(lh)%rh;
+ debugmsg("operator/(ex,ex)",LOGLEVEL_OPERATOR);
+ return exmul(lh, power(rh,_ex_1()));
}
-*/
// binary arithmetic operators numeric with numeric
-numeric operator+(numeric const & lh, numeric const & rh)
+const 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-(numeric const & lh, numeric const & rh)
+const 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*(numeric const & lh, numeric const & rh)
+const 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/(numeric const & lh, numeric const & rh)
+const 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);
}
-// binary arithmetic assignment operators with ex
-ex const & operator+=(ex & lh, ex const & rh)
-{
- debugmsg("operator+=(ex,ex)",LOGLEVEL_OPERATOR);
- return (lh=lh+rh);
-}
+// binary arithmetic assignment operators with ex
-ex const & operator-=(ex & lh, ex const & rh)
+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 = exadd(lh, rh);
}
-ex const & operator*=(ex & lh, ex const & rh)
+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 = exadd(lh, exminus(rh));
}
-ex const & operator/=(ex & lh, ex const & rh)
+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 = exmul(lh, rh);
}
-ex const & operator%=(ex & lh, ex const & rh)
+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 = exmul(lh, power(rh,_ex_1()));
}
-/*
// binary arithmetic assignment operators with numeric
-ex const & operator+=(ex & lh, numeric const & rh)
+numeric & operator+=(numeric & lh, const numeric & rh)
{
- debugmsg("operator+=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh+ex(rh));
+ debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ lh = lh.add(rh);
+ return lh;
}
-ex const & operator-=(ex & lh, numeric const & rh)
+numeric & operator-=(numeric & lh, const numeric & rh)
{
- debugmsg("operator-=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh-ex(rh));
+ debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ lh = lh.sub(rh);
+ return lh;
}
-ex const & operator*=(ex & lh, numeric const & rh)
+numeric & operator*=(numeric & lh, const numeric & rh)
{
- debugmsg("operator*=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh*ex(rh));
+ debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ lh = lh.mul(rh);
+ return lh;
}
-ex const & operator/=(ex & lh, numeric const & rh)
+numeric & operator/=(numeric & lh, const numeric & rh)
{
- debugmsg("operator/=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh/ex(rh));
+ debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ lh = lh.div(rh);
+ return lh;
}
-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
-
-numeric const & operator+=(numeric & lh, numeric const & rh)
-{
- debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.add(rh));
-}
-
-numeric const & operator-=(numeric & lh, numeric const & rh)
-{
- debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.sub(rh));
-}
-
-numeric const & operator*=(numeric & lh, numeric const & rh)
-{
- debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.mul(rh));
-}
-
-numeric const & operator/=(numeric & lh, numeric const & rh)
-{
- debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.div(rh));
-}
// unary operators
-ex operator+(ex const & lh)
+const ex operator+(const ex & lh)
{
- return lh;
+ debugmsg("operator+(ex)",LOGLEVEL_OPERATOR);
+ return lh;
}
-ex operator-(ex const & lh)
+const ex operator-(const ex & lh)
{
- return exMINUSONE()*lh;
+ debugmsg("operator-(ex)",LOGLEVEL_OPERATOR);
+ return exminus(lh);
}
-numeric operator+(numeric const & lh)
+const numeric operator+(const numeric & lh)
{
- return lh;
+ debugmsg("operator+(numeric)",LOGLEVEL_OPERATOR);
+ return lh;
}
-numeric operator-(numeric const & lh)
+const numeric operator-(const numeric & lh)
{
- return (numeric(-1)*lh);
+ debugmsg("operator-(numeric)",LOGLEVEL_OPERATOR);
+ return _num_1().mul(lh);
}
-// binary relational operators ex with ex
-relational operator==(ex const & lh, ex const & rh)
-{
- debugmsg("operator==(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::equal);
-}
+// increment / decrement operators
-relational operator!=(ex const & lh, ex const & rh)
+/** Expression prefix increment. Adds 1 and returns incremented ex. */
+ex & operator++(ex & rh)
{
- debugmsg("operator!=(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::not_equal);
+ debugmsg("operator++(ex)",LOGLEVEL_OPERATOR);
+ return rh = exadd(rh, _ex1());
}
-relational operator<(ex const & lh, ex const & rh)
+/** Expression prefix decrement. Subtracts 1 and returns decremented ex. */
+ex & operator--(ex & rh)
{
- debugmsg("operator<(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less);
+ debugmsg("operator--(ex)",LOGLEVEL_OPERATOR);
+ return rh = exadd(rh, _ex_1());
}
-relational operator<=(ex const & lh, ex const & rh)
+/** Expression postfix increment. Returns the ex and leaves the original
+ * incremented by 1. */
+const ex operator++(ex & lh, int)
{
- debugmsg("operator<=(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less_or_equal);
+ debugmsg("operator++(ex,int)",LOGLEVEL_OPERATOR);
+ ex tmp(lh);
+ lh = exadd(lh, _ex1());
+ return tmp;
}
-relational operator>(ex const & lh, ex const & rh)
+/** Expression Postfix decrement. Returns the ex and leaves the original
+ * decremented by 1. */
+const ex operator--(ex & lh, int)
{
- debugmsg("operator>(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::greater);
+ debugmsg("operator--(ex,int)",LOGLEVEL_OPERATOR);
+ ex tmp(lh);
+ lh = exadd(lh, _ex_1());
+ return tmp;
}
-relational operator>=(ex const & lh, ex const & rh)
-{
- debugmsg("operator>=(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::greater_or_equal);
-}
-
-/*
-
-// binary relational operators ex with numeric
-
-relational operator==(ex const & lh, numeric const & rh)
+/** Numeric prefix increment. Adds 1 and returns incremented number. */
+numeric& operator++(numeric & rh)
{
- debugmsg("operator==(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::equal);
+ debugmsg("operator++(numeric)",LOGLEVEL_OPERATOR);
+ rh = rh.add(_num1());
+ return rh;
}
-relational operator!=(ex const & lh, numeric const & rh)
+/** Numeric prefix decrement. Subtracts 1 and returns decremented number. */
+numeric& operator--(numeric & rh)
{
- debugmsg("operator!=(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::not_equal);
+ debugmsg("operator--(numeric)",LOGLEVEL_OPERATOR);
+ rh = rh.add(_num_1());
+ return rh;
}
-relational operator<(ex const & lh, numeric const & rh)
+/** Numeric postfix increment. Returns the number and leaves the original
+ * incremented by 1. */
+const numeric operator++(numeric & lh, int)
{
- debugmsg("operator<(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less);
+ debugmsg("operator++(numeric,int)",LOGLEVEL_OPERATOR);
+ numeric tmp(lh);
+ lh = lh.add(_num1());
+ return tmp;
}
-relational operator<=(ex const & lh, numeric const & rh)
+/** Numeric Postfix decrement. Returns the number and leaves the original
+ * decremented by 1. */
+const numeric operator--(numeric & lh, int)
{
- debugmsg("operator<=(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less_or_equal);
+ debugmsg("operator--(numeric,int)",LOGLEVEL_OPERATOR);
+ numeric tmp(lh);
+ lh = lh.add(_num_1());
+ return tmp;
}
-relational operator>(ex const & lh, numeric const & rh)
-{
- debugmsg("operator>(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::greater);
-}
-
-relational operator>=(ex const & lh, numeric const & rh)
-{
- debugmsg("operator>=(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::greater_or_equal);
-}
-
-// binary relational operators numeric with ex
+// binary relational operators ex with ex
-relational operator==(numeric const & lh, ex const & rh)
+relational operator==(const ex & lh, const ex & rh)
{
- debugmsg("operator==(numeric,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::equal);
+ debugmsg("operator==(ex,ex)",LOGLEVEL_OPERATOR);
+ return relational(lh,rh,relational::equal);
}
-relational operator!=(numeric const & lh, ex const & rh)
+relational operator!=(const ex & lh, const ex & rh)
{
- debugmsg("operator!=(numeric,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<(numeric const & lh, ex const & rh)
+relational operator<(const ex & lh, const ex & rh)
{
- debugmsg("operator<(numeric,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less);
+ debugmsg("operator<(ex,ex)",LOGLEVEL_OPERATOR);
+ return relational(lh,rh,relational::less);
}
-relational operator<=(numeric const & lh, ex const & rh)
+relational operator<=(const ex & lh, const ex & rh)
{
- debugmsg("operator<=(numeric,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>(numeric const & lh, ex const & rh)
+relational operator>(const ex & lh, const ex & rh)
{
- debugmsg("operator>(numeric,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::greater);
+ debugmsg("operator>(ex,ex)",LOGLEVEL_OPERATOR);
+ return relational(lh,rh,relational::greater);
}
-relational operator>=(numeric const & lh, ex const & rh)
+relational operator>=(const ex & lh, const ex & rh)
{
- debugmsg("operator>=(numeric,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, ex const & e)
+std::ostream & operator<<(std::ostream & os, const ex & e)
{
- e.print(os);
- return os;
+ e.print(print_context(os));
+ return os;
}
-istream & operator>>(istream & is, ex & e)
+std::istream & operator>>(std::istream & is, ex & e)
{
- throw(std::logic_error("input from streams not yet implemented"));
+ throw (std::logic_error("expression input from streams not implemented"));
}
+} // namespace GiNaC
git://www.ginac.de / ginac.git / blobdiff