* 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 "power.h"
#include "relational.h"
+#include "print.h"
#include "debugmsg.h"
#include "utils.h"
-#ifndef NO_GINAC_NAMESPACE
namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
// 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)
+ex operator+(const ex & lh, const ex & rh)
{
- debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exadd(rh.exmul(_ex_1()));
+ debugmsg("operator+(ex,ex)",LOGLEVEL_OPERATOR);
+ return lh.exadd(rh);
}
-ex operator*(ex const & lh, ex const & rh)
+ex operator-(const ex & lh, const ex & rh)
{
- debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exmul(rh);
+ debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
+ return lh.exadd(rh.exmul(_ex_1()));
}
-ex operator/(ex const & lh, ex const & rh)
+ex operator*(const ex & lh, const ex & rh)
{
- debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exmul(power(rh,_ex_1()));
+ debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
+ return lh.exmul(rh);
}
-ex operator%(ex const & lh, ex const & rh)
+ex operator/(const ex & lh, const ex & rh)
{
- debugmsg("operator%(ex,ex)",LOGLEVEL_OPERATOR);
- return lh.exncmul(rh);
+ debugmsg("operator/(ex,ex)",LOGLEVEL_OPERATOR);
+ return lh.exmul(power(rh,_ex_1()));
}
// binary arithmetic operators numeric with numeric
-numeric operator+(numeric const & lh, numeric const & rh)
+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)
+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)
+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)
+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);
-}
-
-ex const & operator-=(ex & lh, ex const & rh)
+const 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=lh.exadd(rh));
}
-ex const & operator*=(ex & lh, ex const & rh)
+const 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=lh.exadd(rh.exmul(_ex_1())));
}
-ex const & operator/=(ex & lh, ex const & rh)
+const 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=lh.exmul(rh));
}
-ex const & operator%=(ex & lh, ex const & rh)
+const 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=lh.exmul(power(rh,_ex_1())));
}
// binary arithmetic assignment operators with numeric
-numeric const & operator+=(numeric & lh, numeric const & rh)
+const numeric & operator+=(numeric & lh, const numeric & rh)
{
- debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.add(rh));
+ debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ return (lh=lh.add(rh));
}
-numeric const & operator-=(numeric & lh, numeric const & rh)
+const numeric & operator-=(numeric & lh, const numeric & rh)
{
- debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.sub(rh));
+ debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ return (lh=lh.sub(rh));
}
-numeric const & operator*=(numeric & lh, numeric const & rh)
+const numeric & operator*=(numeric & lh, const numeric & rh)
{
- debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.mul(rh));
+ debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ return (lh=lh.mul(rh));
}
-numeric const & operator/=(numeric & lh, numeric const & rh)
+const numeric & operator/=(numeric & lh, const numeric & rh)
{
- debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.div(rh));
+ debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ return (lh=lh.div(rh));
}
// unary operators
-ex operator+(ex const & lh)
+ex operator+(const ex & lh)
{
- return lh;
+ debugmsg("operator+(ex)",LOGLEVEL_OPERATOR);
+ return lh;
}
-ex operator-(ex const & lh)
+ex operator-(const ex & lh)
{
- return lh.exmul(_ex_1());
+ debugmsg("operator-(ex)",LOGLEVEL_OPERATOR);
+ return lh.exmul(_ex_1());
}
-numeric operator+(numeric const & lh)
+numeric operator+(const numeric & lh)
{
- return lh;
+ debugmsg("operator+(numeric)",LOGLEVEL_OPERATOR);
+ return lh;
}
-numeric operator-(numeric const & lh)
+numeric operator-(const numeric & lh)
{
- return _num_1()*lh;
+ debugmsg("operator-(numeric)",LOGLEVEL_OPERATOR);
+ return _num_1().mul(lh);
}
/** Numeric prefix increment. Adds 1 and returns incremented number. */
numeric& operator++(numeric & rh)
{
- rh = rh+_num1();
- return rh;
+ debugmsg("operator++(numeric)",LOGLEVEL_OPERATOR);
+ rh = rh.add(_num1());
+ return rh;
}
/** Numeric prefix decrement. Subtracts 1 and returns decremented number. */
numeric& operator--(numeric & rh)
{
- rh = rh-_num1();
- return rh;
+ debugmsg("operator--(numeric)",LOGLEVEL_OPERATOR);
+ 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)
{
- numeric tmp = lh;
- lh = lh+_num1();
- return tmp;
+ debugmsg("operator++(numeric,int)",LOGLEVEL_OPERATOR);
+ 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)
{
- numeric tmp = lh;
- lh = lh-_num1();
- return tmp;
+ debugmsg("operator--(numeric,int)",LOGLEVEL_OPERATOR);
+ numeric tmp(lh);
+ lh = lh.add(_num_1());
+ return tmp;
}
// 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);
-}
-
-relational operator!=(ex const & lh, ex const & rh)
-{
- debugmsg("operator!=(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::not_equal);
-}
-
-relational operator<(ex const & lh, ex const & rh)
-{
- debugmsg("operator<(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less);
-}
-
-relational operator<=(ex const & lh, ex const & rh)
-{
- debugmsg("operator<=(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less_or_equal);
-}
-
-relational operator>(ex const & lh, ex const & rh)
-{
- debugmsg("operator>(ex,ex)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::greater);
-}
-
-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)
-{
- debugmsg("operator==(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::equal);
-}
-
-relational operator!=(ex const & lh, numeric const & rh)
-{
- debugmsg("operator!=(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::not_equal);
-}
-
-relational operator<(ex const & lh, numeric const & rh)
-{
- debugmsg("operator<(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less);
-}
-
-relational operator<=(ex const & lh, numeric const & rh)
-{
- debugmsg("operator<=(ex,numeric)",LOGLEVEL_OPERATOR);
- return relational(lh,rh,relational::less_or_equal);
-}
-
-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
-
-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"));
}
-#ifndef NO_GINAC_NAMESPACE
} // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
git://www.ginac.de / ginac.git / blobdiff