* 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
#include "numeric.h"
#include "power.h"
#include "relational.h"
+#include "input_lexer.h"
+#include "debugmsg.h"
+#include "utils.h"
+
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
// binary arithmetic operators ex with ex
-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);
}
-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(exMINUSONE()));
+ 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(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(power(rh,exMINUSONE()));
+ return lh.exmul(power(rh,_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.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
-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);
}
-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);
}
-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);
}
-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);
}
+
// binary arithmetic assignment operators with ex
-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);
}
-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);
}
-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);
}
-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);
}
-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);
}
-/*
// binary arithmetic assignment operators with numeric
-ex const & operator+=(ex & lh, numeric const & rh)
+const numeric & operator+=(numeric & lh, const numeric & 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));
+ debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ return (lh=lh.add(rh));
}
-ex const & operator*=(ex & lh, numeric const & rh)
+const numeric & operator-=(numeric & lh, const numeric & rh)
{
- debugmsg("operator*=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh*ex(rh));
+ debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ return (lh=lh.sub(rh));
}
-ex const & operator/=(ex & lh, numeric const & rh)
+const numeric & operator*=(numeric & lh, const numeric & rh)
{
- debugmsg("operator/=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh/ex(rh));
+ debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ return (lh=lh.mul(rh));
}
-ex const & operator%=(ex & lh, numeric const & rh)
+const numeric & operator/=(numeric & lh, const numeric & rh)
{
- debugmsg("operator%=(ex,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh%ex(rh));
+ debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
+ return (lh=lh.div(rh));
}
-*/
-
-// binary arithmetic assignment operators with numeric
+// unary operators
-numeric const & operator+=(numeric & lh, numeric const & rh)
+ex operator+(const ex & lh)
{
- debugmsg("operator+=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.add(rh));
+ return lh;
}
-numeric const & operator-=(numeric & lh, numeric const & rh)
+ex operator-(const ex & lh)
{
- debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.sub(rh));
+ return lh.exmul(_ex_1());
}
-numeric const & operator*=(numeric & lh, numeric const & rh)
+numeric operator+(const numeric & lh)
{
- debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.mul(rh));
+ return lh;
}
-numeric const & operator/=(numeric & lh, numeric const & rh)
+numeric operator-(const numeric & lh)
{
- debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
- return (lh=lh.div(rh));
+ return _num_1()*lh;
}
-// unary operators
-
-ex operator+(ex const & lh)
+/** Numeric prefix increment. Adds 1 and returns incremented number. */
+numeric& operator++(numeric & rh)
{
- return lh;
+ rh = rh+_num1();
+ return rh;
}
-ex operator-(ex const & lh)
+/** Numeric prefix decrement. Subtracts 1 and returns decremented number. */
+numeric& operator--(numeric & rh)
{
- return exMINUSONE()*lh;
+ rh = rh-_num1();
+ return rh;
}
-numeric operator+(numeric const & lh)
+/** Numeric postfix increment. Returns the number and leaves the original
+ * incremented by 1. */
+numeric operator++(numeric & lh, int)
{
- return lh;
+ numeric tmp = lh;
+ lh = lh+_num1();
+ return tmp;
}
-numeric operator-(numeric const & lh)
+/** Numeric Postfix decrement. Returns the number and leaves the original
+ * decremented by 1. */
+numeric operator--(numeric & lh, int)
{
- return (numeric(-1)*lh);
+ numeric tmp = lh;
+ lh = lh-_num1();
+ return tmp;
}
// binary relational operators ex with ex
-relational operator==(ex const & lh, ex const & rh)
+relational operator==(const ex & lh, const ex & rh)
{
debugmsg("operator==(ex,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::equal);
}
-relational operator!=(ex const & lh, ex const & rh)
+relational operator!=(const ex & lh, const ex & rh)
{
debugmsg("operator!=(ex,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::not_equal);
}
-relational operator<(ex const & lh, ex const & rh)
+relational operator<(const ex & lh, const ex & rh)
{
debugmsg("operator<(ex,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::less);
}
-relational operator<=(ex const & lh, ex const & rh)
+relational operator<=(const ex & lh, const ex & rh)
{
debugmsg("operator<=(ex,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::less_or_equal);
}
-relational operator>(ex const & lh, ex const & rh)
+relational operator>(const ex & lh, const ex & rh)
{
debugmsg("operator>(ex,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::greater);
}
-relational operator>=(ex const & lh, ex const & rh)
+relational operator>=(const ex & lh, const ex & 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)
+relational operator==(const ex & lh, const numeric & rh)
{
debugmsg("operator==(ex,numeric)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::equal);
}
-relational operator!=(ex const & lh, numeric const & rh)
+relational operator!=(const ex & lh, const numeric & rh)
{
debugmsg("operator!=(ex,numeric)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::not_equal);
}
-relational operator<(ex const & lh, numeric const & rh)
+relational operator<(const ex & lh, const numeric & rh)
{
debugmsg("operator<(ex,numeric)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::less);
}
-relational operator<=(ex const & lh, numeric const & rh)
+relational operator<=(const ex & lh, const numeric & rh)
{
debugmsg("operator<=(ex,numeric)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::less_or_equal);
}
-relational operator>(ex const & lh, numeric const & rh)
+relational operator>(const ex & lh, const numeric & rh)
{
debugmsg("operator>(ex,numeric)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::greater);
}
-relational operator>=(ex const & lh, numeric const & rh)
+relational operator>=(const ex & lh, const numeric & 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 numeric & lh, const ex & rh)
{
debugmsg("operator==(numeric,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::equal);
}
-relational operator!=(numeric const & lh, ex const & rh)
+relational operator!=(const numeric & lh, const ex & rh)
{
debugmsg("operator!=(numeric,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::not_equal);
}
-relational operator<(numeric const & lh, ex const & rh)
+relational operator<(const numeric & lh, const ex & rh)
{
debugmsg("operator<(numeric,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::less);
}
-relational operator<=(numeric const & lh, ex const & rh)
+relational operator<=(const numeric & lh, const ex & rh)
{
debugmsg("operator<=(numeric,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::less_or_equal);
}
-relational operator>(numeric const & lh, ex const & rh)
+relational operator>(const numeric & lh, const ex & rh)
{
debugmsg("operator>(numeric,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::greater);
}
-relational operator>=(numeric const & lh, ex const & rh)
+relational operator>=(const numeric & lh, const ex & rh)
{
debugmsg("operator>=(numeric,ex)",LOGLEVEL_OPERATOR);
return relational(lh,rh,relational::greater_or_equal);
// input/output stream operators
-ostream & operator<<(ostream & os, ex const & e)
+ostream & operator<<(ostream & os, const ex & e)
{
e.print(os);
return os;
}
+/** Input (parse) expression from stream. The input grammar is similar to the
+ * GiNaC output format. If 'e' contains a list of symbols upon entry, these
+ * symbols are used in the parsed expression in all places where symbols with
+ * the same names appear. All other encountered symbols will be newly created. */
istream & operator>>(istream & is, ex & e)
{
- throw(std::logic_error("input from streams not yet implemented"));
+ string s;
+ getline(is, s);
+ set_lexer_string(s);
+ set_lexer_symbols(e);
+ ginac_yyrestart(NULL);
+ if (yyparse())
+ throw (std::runtime_error(get_parser_error()));
+ else
+ e = parsed_ex;
}
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
git://www.ginac.de / ginac.git / blobdiff