* Implementation of GiNaC's light-weight expression handles. */
/*
- * GiNaC Copyright (C) 1999-2011 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2020 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
// Convert the lists to a map
exmap m;
- for (lst::const_iterator its = ls.begin(), itr = lr.begin(); its != ls.end(); ++its, ++itr) {
+ for (auto its = ls.begin(), itr = lr.begin(); its != ls.end(); ++its, ++itr) {
m.insert(std::make_pair(*its, *itr));
// Search for products and powers in the expressions to be substituted
/** Substitute objects in an expression (syntactic substitution) and return
* the result as a new expression. There are two valid types of
* replacement arguments: 1) a relational like object==ex and 2) a list of
- * relationals lst(object1==ex1,object2==ex2,...). */
+ * relationals lst{object1==ex1,object2==ex2,...}. */
ex ex::subs(const ex & e, unsigned options) const
{
if (e.info(info_flags::relation_equal)) {
// Argument is a list: convert it to a map
exmap m;
GINAC_ASSERT(is_a<lst>(e));
- for (lst::const_iterator it = ex_to<lst>(e).begin(); it != ex_to<lst>(e).end(); ++it) {
- ex r = *it;
+ for (auto & r : ex_to<lst>(e)) {
if (!r.info(info_flags::relation_equal))
throw(std::invalid_argument("basic::subs(ex): argument must be a list of equations"));
const ex & s = r.op(0);
accept(v);
}
-/** Return modifyable operand/member at position i. */
+/** Return modifiable operand/member at position i. */
ex & ex::let_op(size_t i)
{
makewriteable();
{
if (is_a<lst>(vars)) {
const lst & varlst = ex_to<lst>(vars);
- for (lst::const_iterator i=varlst.begin(); i!=varlst.end(); ++i)
- if (!bp->is_polynomial(*i))
+ for (auto & it : varlst)
+ if (!bp->is_polynomial(it))
return false;
return true;
}
// apply eval() once more. The recursion stops when eval() calls
// hold() or returns an object that already has its "evaluated"
// flag set, such as a symbol or a numeric.
- const ex & tmpex = other.eval(1);
+ const ex & tmpex = other.eval();
// Eventually, the eval() recursion goes through the "else" branch
// below, which assures that the object pointed to by tmpex.bp is
case 12:
return *const_cast<numeric *>(_num12_p);
default:
- basic *bp = new numeric(i);
- bp->setflag(status_flags::dynallocated);
- GINAC_ASSERT(bp->get_refcount() == 0);
- return *bp;
+ return dynallocate<numeric>(i);
}
}
case 12:
return *const_cast<numeric *>(_num12_p);
default:
- basic *bp = new numeric(i);
- bp->setflag(status_flags::dynallocated);
- GINAC_ASSERT(bp->get_refcount() == 0);
- return *bp;
+ return dynallocate<numeric>(i);
}
}
case 12:
return *const_cast<numeric *>(_num12_p);
default:
- basic *bp = new numeric(i);
- bp->setflag(status_flags::dynallocated);
- GINAC_ASSERT(bp->get_refcount() == 0);
- return *bp;
+ return dynallocate<numeric>(i);
}
}
case 12:
return *const_cast<numeric *>(_num12_p);
default:
- basic *bp = new numeric(i);
- bp->setflag(status_flags::dynallocated);
- GINAC_ASSERT(bp->get_refcount() == 0);
- return *bp;
+ return dynallocate<numeric>(i);
}
}
-
+
+basic & ex::construct_from_longlong(long long i)
+{
+ if (i >= -12 && i <= 12) {
+ return construct_from_int(static_cast<int>(i));
+ } else {
+ return dynallocate<numeric>(i);
+ }
+}
+
+basic & ex::construct_from_ulonglong(unsigned long long i)
+{
+ if (i <= 12) {
+ return construct_from_uint(static_cast<unsigned>(i));
+ } else {
+ return dynallocate<numeric>(i);
+ }
+}
+
basic & ex::construct_from_double(double d)
{
- basic *bp = new numeric(d);
- bp->setflag(status_flags::dynallocated);
- GINAC_ASSERT(bp->get_refcount() == 0);
- return *bp;
+ return dynallocate<numeric>(d);
}
//////////