X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fex.cpp;h=ac31fcc2b11f9062596904269d7b41212f5cfddb;hp=377b15b411745057cc61fb187468aee19eab9e5d;hb=f1a824bb5b7535c26c75ef03615179680c0f9753;hpb=4f596b14ac1cdb03163c74e210cab493358ababf diff --git a/ginac/ex.cpp b/ginac/ex.cpp index 377b15b4..ac31fcc2 100644 --- a/ginac/ex.cpp +++ b/ginac/ex.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's light-weight expression handles. */ /* - * GiNaC Copyright (C) 1999-2008 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 @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include - #include "ex.h" #include "add.h" #include "mul.h" @@ -32,9 +29,11 @@ #include "power.h" #include "lst.h" #include "relational.h" -#include "input_lexer.h" #include "utils.h" +#include +#include + namespace GiNaC { ////////// @@ -124,7 +123,7 @@ ex ex::subs(const lst & ls, const lst & lr, unsigned options) const // 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 @@ -141,7 +140,7 @@ ex ex::subs(const lst & ls, const lst & lr, unsigned options) const /** 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)) { @@ -163,8 +162,7 @@ ex ex::subs(const ex & e, unsigned options) const // Argument is a list: convert it to a map exmap m; GINAC_ASSERT(is_a(e)); - for (lst::const_iterator it = ex_to(e).begin(); it != ex_to(e).end(); ++it) { - ex r = *it; + for (auto & r : ex_to(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); @@ -204,7 +202,7 @@ void ex::traverse_postorder(visitor & v) const accept(v); } -/** Return modifyable operand/member at position i. */ +/** Return modifiable operand/member at position i. */ ex & ex::let_op(size_t i) { makewriteable(); @@ -244,8 +242,8 @@ bool ex::is_polynomial(const ex & vars) const { if (is_a(vars)) { const lst & varlst = ex_to(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; } @@ -308,7 +306,7 @@ ptr ex::construct_from_basic(const basic & other) // 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 @@ -403,10 +401,7 @@ basic & ex::construct_from_int(int i) case 12: return *const_cast(_num12_p); default: - basic *bp = new numeric(i); - bp->setflag(status_flags::dynallocated); - GINAC_ASSERT(bp->get_refcount() == 0); - return *bp; + return dynallocate(i); } } @@ -440,10 +435,7 @@ basic & ex::construct_from_uint(unsigned int i) case 12: return *const_cast(_num12_p); default: - basic *bp = new numeric(i); - bp->setflag(status_flags::dynallocated); - GINAC_ASSERT(bp->get_refcount() == 0); - return *bp; + return dynallocate(i); } } @@ -501,10 +493,7 @@ basic & ex::construct_from_long(long i) case 12: return *const_cast(_num12_p); default: - basic *bp = new numeric(i); - bp->setflag(status_flags::dynallocated); - GINAC_ASSERT(bp->get_refcount() == 0); - return *bp; + return dynallocate(i); } } @@ -538,32 +527,33 @@ basic & ex::construct_from_ulong(unsigned long i) case 12: return *const_cast(_num12_p); default: - basic *bp = new numeric(i); - bp->setflag(status_flags::dynallocated); - GINAC_ASSERT(bp->get_refcount() == 0); - return *bp; + return dynallocate(i); } } - -basic & ex::construct_from_double(double d) + +basic & ex::construct_from_longlong(long long i) +{ + if (i >= -12 && i <= 12) { + return construct_from_int(static_cast(i)); + } else { + return dynallocate(i); + } +} + +basic & ex::construct_from_ulonglong(unsigned long long i) { - basic *bp = new numeric(d); - bp->setflag(status_flags::dynallocated); - GINAC_ASSERT(bp->get_refcount() == 0); - return *bp; + if (i <= 12) { + return construct_from_uint(static_cast(i)); + } else { + return dynallocate(i); + } } -ptr ex::construct_from_string_and_lst(const std::string &s, const ex &l) +basic & ex::construct_from_double(double d) { - set_lexer_string(s); - set_lexer_symbols(l); - ginac_yyrestart(NULL); - if (ginac_yyparse()) - throw (std::runtime_error(get_parser_error())); - else - return parsed_ex.bp; + return dynallocate(d); } - + ////////// // static member variables //////////