#include "print.h"
#include "utils.h"
-#include <iomanip>
#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
// 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);
+ return dynallocate<mul>(lh, rh);
} else {
- return (new ncmul(lh,rh))->setflag(status_flags::dynallocated);
+ 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 relational operator==(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::equal);
+ return dynallocate<relational>(lh, rh, relational::equal);
}
const relational operator!=(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::not_equal);
+ return dynallocate<relational>(lh, rh, relational::not_equal);
}
const relational operator<(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::less);
+ return dynallocate<relational>(lh, rh, relational::less);
}
const relational operator<=(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::less_or_equal);
+ return dynallocate<relational>(lh, rh, relational::less_or_equal);
}
const relational operator>(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::greater);
+ return dynallocate<relational>(lh, rh, relational::greater);
}
const relational operator>=(const ex & lh, const ex & rh)
{
- return relational(lh,rh,relational::greater_or_equal);
+ return dynallocate<relational>(lh, rh, relational::greater_or_equal);
}
// input/output stream operators and manipulators
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);
os << "[";
while (true) {
- if (p == 0)
+ if (p == nullptr)
i -> print(print_dflt(os));
else
i -> print(*p);
os << "<";
while (true) {
- if (p == 0)
+ if (p == nullptr)
i->print(print_dflt(os));
else
i->print(*p);
os << "{";
while (true) {
- if (p == 0)
+ if (p == nullptr)
i->first.print(print_dflt(os));
else
i->first.print(*p);
os << "==";
- if (p == 0)
+ if (p == nullptr)
i->second.print(print_dflt(os));
else
i->second.print(*p);