X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fex.cpp;h=ac31fcc2b11f9062596904269d7b41212f5cfddb;hp=7bd8410b6d4f50dc2751557bb41dcb3471efa51c;hb=08c190937df7e802393b588d3cc82d2bdf00b128;hpb=65f2693a0948d1db0bc68d7656c64e1fed91c158

diff --git a/ginac/ex.cpp b/ginac/ex.cpp
index 7bd8410b..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-2015 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
@@ -123,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
@@ -306,7 +306,7 @@ ptr<basic> 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
@@ -530,7 +530,25 @@ basic & ex::construct_from_ulong(unsigned long i)
 		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)
 {
 	return dynallocate<numeric>(d);