X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Foperators.cpp;h=1f1f1b06aeb618ed3c396defa34a16b93b2dfdd0;hp=d9882c0e235f5ba5c36e22461c7dc4e1c27e2c38;hb=8cffcdf13d817a47f217f1a1043317d95969e070;hpb=9eab44408b9213d8909b7a9e525f404ad06064dd

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index d9882c0e..1f1f1b06 100644
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's overloaded operators. */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -17,393 +17,494 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  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 "debugmsg.h"
+#include "print.h"
+#include "utils.h"
 
-namespace GiNaC {
+#include <iostream>
 
-// binary arithmetic operators ex with ex
+namespace GiNaC {
 
-ex operator+(ex const & lh, ex const & rh)
+/** Used internally by operator+() to add two ex objects. */
+static inline const ex exadd(const ex & lh, const ex & rh)
 {
-    debugmsg("operator+(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exadd(rh);
+	return dynallocate<add>(lh, rh);
 }
 
-ex operator-(ex const & lh, ex const & rh)
+/** Used internally by operator*() to multiply two ex objects. */
+static inline const ex exmul(const ex & lh, const ex & rh)
 {
-    debugmsg("operator-(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exadd(rh.exmul(exMINUSONE()));
+	// 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 dynallocate<mul>(lh, rh);
+	} else {
+		return dynallocate<ncmul>(lh, rh);
+	}
 }
 
-ex operator*(ex const & lh, ex 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,ex)",LOGLEVEL_OPERATOR);
-    return lh.exmul(rh);
+	return dynallocate<mul>(lh, _ex_1);
 }
 
-ex operator/(ex const & lh, ex const & rh)
+// binary arithmetic operators ex with ex
+
+const ex operator+(const ex & lh, const ex & rh)
 {
-    debugmsg("operator*(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exmul(power(rh,exMINUSONE()));
+	return exadd(lh, rh);
 }
 
-ex operator%(ex const & lh, ex const & rh)
+const ex operator-(const ex & lh, const ex & rh)
 {
-    debugmsg("operator%(ex,ex)",LOGLEVEL_OPERATOR);
-    return lh.exncmul(rh);
+	return exadd(lh, exminus(rh));
 }
 
-/*
-
-// binary arithmetic operators ex with numeric
-
-ex operator+(ex const & lh, numeric const & rh)
+const ex operator*(const ex & lh, const ex & rh)
 {
-    debugmsg("operator+(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh+ex(rh);
+	return exmul(lh, rh);
 }
 
-ex operator-(ex const & lh, numeric const & rh)
+const ex operator/(const ex & lh, const ex & rh)
 {
-    debugmsg("operator-(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh-ex(rh);
+	return exmul(lh, power(rh,_ex_1));
 }
 
-ex operator*(ex const & lh, numeric const & rh)
+
+// binary arithmetic operators numeric with numeric
+
+const numeric operator+(const numeric & lh, const numeric & rh)
 {
-    debugmsg("operator*(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh*ex(rh);
+	return lh.add(rh);
 }
 
-ex operator/(ex const & lh, numeric const & rh)
+const numeric operator-(const numeric & lh, const numeric & rh)
 {
-    debugmsg("operator/(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh/ex(rh);
+	return lh.sub(rh);
 }
 
-ex operator%(ex const & lh, numeric const & rh)
+const numeric operator*(const numeric & lh, const numeric & rh)
 {
-    debugmsg("operator%(ex,numeric)",LOGLEVEL_OPERATOR);
-    return lh%ex(rh);
+	return lh.mul(rh);
 }
 
-// binary arithmetic operators numeric with ex
-
-ex operator+(numeric const & lh, ex const & rh)
+const numeric operator/(const numeric & lh, const numeric & rh)
 {
-    debugmsg("operator+(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)+rh;
+	return lh.div(rh);
 }
 
-ex operator-(numeric const & lh, ex const & rh)
+
+// binary arithmetic assignment operators with ex
+
+ex & operator+=(ex & lh, const ex & rh)
 {
-    debugmsg("operator-(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)-rh;
+	return lh = exadd(lh, rh);
 }
 
-ex operator*(numeric const & lh, ex const & rh)
+ex & operator-=(ex & lh, const ex & rh)
 {
-    debugmsg("operator*(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)*rh;
+	return lh = exadd(lh, exminus(rh));
 }
 
-ex operator/(numeric const & lh, ex const & rh)
+ex & operator*=(ex & lh, const ex & rh)
 {
-    debugmsg("operator/(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)/rh;
+	return lh = exmul(lh, rh);
 }
 
-ex operator%(numeric const & lh, ex const & rh)
+ex & operator/=(ex & lh, const ex & rh)
 {
-    debugmsg("operator%(numeric,ex)",LOGLEVEL_OPERATOR);
-    return ex(lh)%rh;
+	return lh = exmul(lh, power(rh,_ex_1));
 }
 
-*/
 
-// binary arithmetic operators numeric with numeric
+// binary arithmetic assignment operators with numeric
 
-numeric operator+(numeric const & lh, numeric const & rh)
+numeric & operator+=(numeric & lh, const numeric & rh)
 {
-    debugmsg("operator+(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return lh.add(rh);
+	lh = lh.add(rh);
+	return lh;
 }
 
-numeric operator-(numeric const & lh, numeric const & rh)
+numeric & operator-=(numeric & lh, const numeric & rh)
 {
-    debugmsg("operator-(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return lh.sub(rh);
+	lh = lh.sub(rh);
+	return lh;
 }
 
-numeric operator*(numeric const & lh, numeric const & rh)
+numeric & operator*=(numeric & lh, const numeric & rh)
 {
-    debugmsg("operator*(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return lh.mul(rh);
+	lh = lh.mul(rh);
+	return lh;
 }
 
-numeric operator/(numeric const & lh, numeric const & rh)
+numeric & operator/=(numeric & lh, const numeric & rh)
 {
-    debugmsg("operator/(numeric,ex)",LOGLEVEL_OPERATOR);
-    return lh.div(rh);
+	lh = lh.div(rh);
+	return lh;
 }
 
-// binary arithmetic assignment operators with ex
 
-ex const & operator+=(ex & lh, ex const & rh)
-{
-    debugmsg("operator+=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh+rh);
-}
+// unary operators
 
-ex const & operator-=(ex & lh, ex const & rh)
+const ex operator+(const ex & lh)
 {
-    debugmsg("operator-=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh-rh);
+	return lh;
 }
 
-ex const & operator*=(ex & lh, ex const & rh)
+const ex operator-(const ex & lh)
 {
-    debugmsg("operator*=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh*rh);
+	return exminus(lh);
 }
 
-ex const & operator/=(ex & lh, ex const & rh)
+const numeric operator+(const numeric & lh)
 {
-    debugmsg("operator/=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh/rh);
+	return lh;
 }
 
-ex const & operator%=(ex & lh, ex const & rh)
+const numeric operator-(const numeric & lh)
 {
-    debugmsg("operator%=(ex,ex)",LOGLEVEL_OPERATOR);
-    return (lh=lh%rh);
+	return _num_1_p->mul(lh);
 }
 
-/*
 
-// binary arithmetic assignment operators with numeric
+// increment / decrement operators
 
-ex const & operator+=(ex & lh, numeric const & rh)
+/** Expression prefix increment.  Adds 1 and returns incremented ex. */
+ex & operator++(ex & rh)
 {
-    debugmsg("operator+=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh+ex(rh));
+	return rh = exadd(rh, _ex1);
 }
 
-ex const & operator-=(ex & lh, numeric const & rh)
+/** Expression prefix decrement.  Subtracts 1 and returns decremented ex. */
+ex & operator--(ex & rh)
 {
-    debugmsg("operator-=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh-ex(rh));
+	return rh = exadd(rh, _ex_1);
 }
 
-ex const & operator*=(ex & lh, numeric const & rh)
+/** Expression postfix increment.  Returns the ex and leaves the original
+ *  incremented by 1. */
+const ex operator++(ex & lh, int)
 {
-    debugmsg("operator*=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh*ex(rh));
+	ex tmp(lh);
+	lh = exadd(lh, _ex1);
+	return tmp;
 }
 
-ex const & operator/=(ex & lh, numeric const & rh)
+/** Expression postfix decrement.  Returns the ex and leaves the original
+ *  decremented by 1. */
+const ex operator--(ex & lh, int)
 {
-    debugmsg("operator/=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh/ex(rh));
+	ex tmp(lh);
+	lh = exadd(lh, _ex_1);
+	return tmp;
 }
 
-ex const & operator%=(ex & lh, numeric const & rh)
+/** Numeric prefix increment.  Adds 1 and returns incremented number. */
+numeric& operator++(numeric & rh)
 {
-    debugmsg("operator%=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh%ex(rh));
+	rh = rh.add(*_num1_p);
+	return rh;
 }
 
-*/
+/** Numeric prefix decrement.  Subtracts 1 and returns decremented number. */
+numeric& operator--(numeric & rh)
+{
+	rh = rh.add(*_num_1_p);
+	return rh;
+}
 
-// binary arithmetic assignment operators with numeric
+/** Numeric postfix increment.  Returns the number and leaves the original
+ *  incremented by 1. */
+const numeric operator++(numeric & lh, int)
+{
+	numeric tmp(lh);
+	lh = lh.add(*_num1_p);
+	return tmp;
+}
 
-numeric const & operator+=(numeric & 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+=(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh.add(rh));
+	numeric tmp(lh);
+	lh = lh.add(*_num_1_p);
+	return tmp;
 }
 
-numeric const & operator-=(numeric & lh, numeric const & rh)
+// binary relational operators ex with ex
+
+const relational operator==(const ex & lh, const ex & rh)
 {
-    debugmsg("operator-=(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh.sub(rh));
+	return relational(lh, rh, relational::equal);
 }
 
-numeric const & operator*=(numeric & lh, numeric const & rh)
+const relational operator!=(const ex & lh, const ex & rh)
 {
-    debugmsg("operator*=(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh.mul(rh));
+	return relational(lh, rh, relational::not_equal);
 }
 
-numeric const & operator/=(numeric & lh, numeric const & rh)
+const relational operator<(const ex & lh, const ex & rh)
 {
-    debugmsg("operator/=(numeric,numeric)",LOGLEVEL_OPERATOR);
-    return (lh=lh.div(rh));
+	return relational(lh, rh, relational::less);
 }
 
-// unary operators
+const relational operator<=(const ex & lh, const ex & rh)
+{
+	return relational(lh, rh, relational::less_or_equal);
+}
 
-ex operator+(ex const & lh)
+const relational operator>(const ex & lh, const ex & rh)
 {
-    return lh;
+	return relational(lh, rh, relational::greater);
 }
 
-ex operator-(ex const & lh)
+const relational operator>=(const ex & lh, const ex & rh)
 {
-    return exMINUSONE()*lh;
+	return relational(lh, rh, relational::greater_or_equal);
 }
 
-numeric operator+(numeric const & lh)
+// input/output stream operators and manipulators
+
+static int my_ios_index()
 {
-    return lh;
+	static int i = std::ios_base::xalloc();
+	return i;
 }
 
-numeric operator-(numeric const & lh)
+// Stream format gets copied or destroyed
+static void my_ios_callback(std::ios_base::event ev, std::ios_base & s, int i)
 {
-    return (numeric(-1)*lh);
+	print_context *p = static_cast<print_context *>(s.pword(i));
+	if (ev == std::ios_base::erase_event) {
+		delete p;
+		s.pword(i) = nullptr;
+	} else if (ev == std::ios_base::copyfmt_event && p != nullptr)
+		s.pword(i) = p->duplicate();
 }
 
-// binary relational operators ex with ex
+enum {
+	callback_registered = 1
+};
 
-relational operator==(ex const & lh, ex const & rh)
+// Get print_context associated with stream, may return 0 if no context has
+// been associated yet
+static inline print_context *get_print_context(std::ios_base & s)
 {
-    debugmsg("operator==(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::equal);
+	return static_cast<print_context *>(s.pword(my_ios_index()));
 }
 
-relational operator!=(ex const & lh, ex const & rh)
+// Set print_context associated with stream, retain options
+static void set_print_context(std::ios_base & s, const print_context & c)
 {
-    debugmsg("operator!=(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::not_equal);
+	int i = my_ios_index();
+	long flags = s.iword(i);
+	if (!(flags & callback_registered)) {
+		s.register_callback(my_ios_callback, i);
+		s.iword(i) = flags | callback_registered;
+	}
+	print_context *p = static_cast<print_context *>(s.pword(i));
+	unsigned options = p ? p->options : c.options;
+	delete p;
+	p = c.duplicate();
+	p->options = options;
+	s.pword(i) = p;
 }
 
-relational operator<(ex const & lh, ex const & rh)
+// Get options for print_context associated with stream
+static inline unsigned get_print_options(std::ios_base & s)
 {
-    debugmsg("operator<(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less);
+	print_context *p = get_print_context(s);
+	return p ? p->options : 0;
 }
 
-relational operator<=(ex const & lh, ex const & rh)
+// Set options for print_context associated with stream
+static void set_print_options(std::ostream & s, unsigned options)
 {
-    debugmsg("operator<=(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less_or_equal);
+	print_context *p = get_print_context(s);
+	if (p == nullptr)
+		set_print_context(s, print_dflt(s, options));
+	else
+		p->options = options;
 }
 
-relational operator>(ex const & lh, ex const & rh)
+std::ostream & operator<<(std::ostream & os, const ex & e)
 {
-    debugmsg("operator>(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater);
+	print_context *p = get_print_context(os);
+	if (p == nullptr)
+		e.print(print_dflt(os));
+	else
+		e.print(*p);
+	return os;
 }
 
-relational operator>=(ex const & lh, ex const & rh)
+std::ostream & operator<<(std::ostream & os, const exvector & e)
 {
-    debugmsg("operator>=(ex,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater_or_equal);
-}
+	print_context *p = get_print_context(os);
+	auto i = e.begin();
+	auto vend = e.end();
 
-/*
+	if (i==vend) {
+		os << "[]";
+		return os;
+	}
 
-// binary relational operators ex with numeric
+	os << "[";
+	while (true) {
+		if (p == nullptr)
+			i -> print(print_dflt(os));
+		else
+			i -> print(*p);
+		++i;
+		if (i==vend)
+			break;
+		os << ",";
+	}
+	os << "]";
 
-relational operator==(ex const & lh, numeric const & rh)
-{
-    debugmsg("operator==(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::equal);
+	return os;
 }
 
-relational operator!=(ex const & lh, numeric const & rh)
+std::ostream & operator<<(std::ostream & os, const exset & e)
 {
-    debugmsg("operator!=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::not_equal);
+	print_context *p = get_print_context(os);
+	auto i = e.begin();
+	auto send = e.end();
+
+	if (i==send) {
+		os << "<>";
+		return os;
+	}
+
+	os << "<";
+	while (true) {
+		if (p == nullptr)
+			i->print(print_dflt(os));
+		else
+			i->print(*p);
+		++i;
+		if (i == send)
+			break;
+		os << ",";
+	}
+	os << ">";
+
+	return os;
 }
 
-relational operator<(ex const & lh, numeric const & rh)
+std::ostream & operator<<(std::ostream & os, const exmap & e)
 {
-    debugmsg("operator<(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less);
+	print_context *p = get_print_context(os);
+	auto i = e.begin();
+	auto mend = e.end();
+
+	if (i==mend) {
+		os << "{}";
+		return os;
+	}
+
+	os << "{";
+	while (true) {
+		if (p == nullptr)
+			i->first.print(print_dflt(os));
+		else
+			i->first.print(*p);
+		os << "==";
+		if (p == nullptr)
+			i->second.print(print_dflt(os));
+		else
+			i->second.print(*p);
+		++i;
+		if( i==mend )
+			break;
+		os << ",";
+	}
+	os << "}";
+
+	return os;
 }
 
-relational operator<=(ex const & lh, numeric const & rh)
+std::istream & operator>>(std::istream & is, ex & e)
 {
-    debugmsg("operator<=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less_or_equal);
+	throw (std::logic_error("expression input from streams not implemented"));
 }
 
-relational operator>(ex const & lh, numeric const & rh)
+std::ostream & dflt(std::ostream & os)
 {
-    debugmsg("operator>(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater);
+	set_print_context(os, print_dflt(os));
+	set_print_options(os, 0);
+	return os;
 }
 
-relational operator>=(ex const & lh, numeric const & rh)
+std::ostream & latex(std::ostream & os)
 {
-    debugmsg("operator>=(ex,numeric)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater_or_equal);
+	set_print_context(os, print_latex(os));
+	return os;
 }
 
-// binary relational operators numeric with ex
-
-relational operator==(numeric const & lh, ex const & rh)
+std::ostream & python(std::ostream & os)
 {
-    debugmsg("operator==(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::equal);
+	set_print_context(os, print_python(os));
+	return os;
 }
 
-relational operator!=(numeric const & lh, ex const & rh)
+std::ostream & python_repr(std::ostream & os)
 {
-    debugmsg("operator!=(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::not_equal);
+	set_print_context(os, print_python_repr(os));
+	return os;
 }
 
-relational operator<(numeric const & lh, ex const & rh)
+std::ostream & tree(std::ostream & os)
 {
-    debugmsg("operator<(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less);
+	set_print_context(os, print_tree(os));
+	return os;
 }
 
-relational operator<=(numeric const & lh, ex const & rh)
+std::ostream & csrc(std::ostream & os)
 {
-    debugmsg("operator<=(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::less_or_equal);
+	set_print_context(os, print_csrc_double(os));
+	return os;
 }
 
-relational operator>(numeric const & lh, ex const & rh)
+std::ostream & csrc_float(std::ostream & os)
 {
-    debugmsg("operator>(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater);
+	set_print_context(os, print_csrc_float(os));
+	return os;
 }
 
-relational operator>=(numeric const & lh, ex const & rh)
+std::ostream & csrc_double(std::ostream & os)
 {
-    debugmsg("operator>=(numeric,ex)",LOGLEVEL_OPERATOR);
-    return relational(lh,rh,relational::greater_or_equal);
+	set_print_context(os, print_csrc_double(os));
+	return os;
 }
 
-*/
-
-// input/output stream operators
+std::ostream & csrc_cl_N(std::ostream & os)
+{
+	set_print_context(os, print_csrc_cl_N(os));
+	return os;
+}
 
-ostream & operator<<(ostream & os, ex const & e)
+std::ostream & index_dimensions(std::ostream & os)
 {
-    e.print(os);
-    return os;
+	set_print_options(os, get_print_options(os) | print_options::print_index_dimensions);
+	return os;
 }
 
-istream & operator>>(istream & is, ex & e)
+std::ostream & no_index_dimensions(std::ostream & os)
 {
-    throw(std::logic_error("input from streams not yet implemented"));
+	set_print_options(os, get_print_options(os) & ~print_options::print_index_dimensions);
+	return os;
 }
 
 } // namespace GiNaC