* Implementation of GiNaC's overloaded operators. */
/*
- * GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2016 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
*
* 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 <iomanip>
-
#include "operators.h"
#include "numeric.h"
#include "add.h"
#include "print.h"
#include "utils.h"
+#include <iostream>
+
namespace GiNaC {
-/** Used internally by operator+() to add two ex objects together. */
+/** Used internally by operator+() to add two ex objects. */
static inline const ex exadd(const ex & lh, const ex & rh)
{
- return (new add(lh,rh))->setflag(status_flags::dynallocated);
+ return dynallocate<add>(lh, rh);
}
-/** Used internally by operator*() to multiply two ex objects together. */
+/** Used internally by operator*() to multiply two ex objects. */
static inline const ex exmul(const ex & lh, const ex & 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);
+ lh.return_type()==return_types::commutative) {
+ return dynallocate<mul>(lh, rh);
+ } else {
+ return dynallocate<ncmul>(lh, rh);
+ }
}
/** Used internally by operator-() and friends to change the sign of an argument. */
static inline const ex exminus(const ex & lh)
{
- return (new mul(lh,_ex_1))->setflag(status_flags::dynallocated);
+ return dynallocate<mul>(lh, _ex_1);
}
// binary arithmetic operators ex with ex
const numeric operator-(const numeric & lh)
{
- return _num_1.mul(lh);
+ return _num_1_p->mul(lh);
}
/** Numeric prefix increment. Adds 1 and returns incremented number. */
numeric& operator++(numeric & rh)
{
- rh = rh.add(_num1);
+ 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);
+ rh = rh.add(*_num_1_p);
return rh;
}
const numeric operator++(numeric & lh, int)
{
numeric tmp(lh);
- lh = lh.add(_num1);
+ lh = lh.add(*_num1_p);
return tmp;
}
const numeric operator--(numeric & lh, int)
{
numeric tmp(lh);
- lh = lh.add(_num_1);
+ lh = lh.add(*_num_1_p);
return tmp;
}
const relational operator==(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::equal);
+ return relational(lh, rh, relational::equal);
}
const relational operator!=(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::not_equal);
+ return relational(lh, rh, relational::not_equal);
}
const relational operator<(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::less);
+ return relational(lh, rh, relational::less);
}
const relational operator<=(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::less_or_equal);
+ return relational(lh, rh, relational::less_or_equal);
}
const relational operator>(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::greater);
+ return relational(lh, rh, relational::greater);
}
const relational operator>=(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::greater_or_equal);
+ return relational(lh, rh, relational::greater_or_equal);
}
// input/output stream operators and manipulators
print_context *p = static_cast<print_context *>(s.pword(i));
if (ev == std::ios_base::erase_event) {
delete p;
- s.pword(i) = 0;
- } else if (ev == std::ios_base::copyfmt_event && p != 0)
+ s.pword(i) = nullptr;
+ } else if (ev == std::ios_base::copyfmt_event && p != nullptr)
s.pword(i) = p->duplicate();
}
static void set_print_options(std::ostream & s, unsigned options)
{
print_context *p = get_print_context(s);
- if (p == 0)
+ if (p == nullptr)
set_print_context(s, print_dflt(s, options));
else
p->options = options;
std::ostream & operator<<(std::ostream & os, const ex & e)
{
print_context *p = get_print_context(os);
- if (p == 0)
+ if (p == nullptr)
e.print(print_dflt(os));
else
e.print(*p);
return os;
}
+std::ostream & operator<<(std::ostream & os, const exvector & e)
+{
+ print_context *p = get_print_context(os);
+ auto i = e.begin();
+ auto vend = e.end();
+
+ if (i==vend) {
+ os << "[]";
+ return os;
+ }
+
+ os << "[";
+ while (true) {
+ if (p == nullptr)
+ i -> print(print_dflt(os));
+ else
+ i -> print(*p);
+ ++i;
+ if (i==vend)
+ break;
+ os << ",";
+ }
+ os << "]";
+
+ return os;
+}
+
+std::ostream & operator<<(std::ostream & os, const exset & e)
+{
+ 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;
+}
+
+std::ostream & operator<<(std::ostream & os, const exmap & e)
+{
+ 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;
+}
+
std::istream & operator>>(std::istream & is, ex & e)
{
throw (std::logic_error("expression input from streams not implemented"));
git://www.ginac.de / ginac.git / blobdiff