- expressions can now be read from streams; the input expression can contain

[ginac.git] / ginac / operators.cpp

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index 9e1f2b1d038af44a60bd8d540fa4c4187a156787..6cf750cefa7005542175ee6d46f2178a18a34787 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -29,40 +29,41 @@
 #include "numeric.h"
 #include "power.h"
 #include "relational.h"
+#include "input_lexer.h"
 #include "debugmsg.h"
 #include "utils.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#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(_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,_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);
@@ -71,25 +72,25 @@ ex operator%(ex const & lh, ex const & 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);
@@ -98,31 +99,31 @@ numeric operator/(numeric const & lh, numeric const & 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);
@@ -131,25 +132,25 @@ ex const & operator%=(ex & lh, ex const & rh)
 
 // 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));
 }
 
-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));
 }
 
-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));
 }
 
-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));
@@ -157,22 +158,22 @@ numeric const & operator/=(numeric & lh, numeric const & rh)
 
 // unary operators
 
-ex operator+(ex const & lh)
+ex operator+(const ex & lh)
 {
     return lh;
 }
 
-ex operator-(ex const & lh)
+ex operator-(const ex & lh)
 {
     return lh.exmul(_ex_1());
 }
 
-numeric operator+(numeric const & lh)
+numeric operator+(const numeric & lh)
 {
     return lh;
 }
 
-numeric operator-(numeric const & lh)
+numeric operator-(const numeric & lh)
 {
     return _num_1()*lh;
 }
@@ -211,37 +212,37 @@ numeric operator--(numeric & lh, int)
 
 // 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);
@@ -251,37 +252,37 @@ relational operator>=(ex const & lh, ex const & rh)
 
 // 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);
@@ -289,37 +290,37 @@ relational operator>=(ex const & lh, numeric const & rh)
 
 // 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);
@@ -329,17 +330,29 @@ relational operator>=(numeric const & lh, ex const & rh)
 
 // 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_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC