X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fex.cpp;h=1fda1ebe54f1574e1d809681b5f2975543830b77;hb=aed514f534cc6b4438822c1fcf80c203a828a94c;hp=648283001d861b2547bd5b0a8a585f6102e263f4;hpb=8f283de519668b70b2e675a7055c7f1bf7ba197c;p=ginac.git

diff --git a/ginac/ex.cpp b/ginac/ex.cpp
index 64828300..1fda1ebe 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-2022 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
@@ -401,10 +401,7 @@ basic & ex::construct_from_int(int 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);
 	}
 }
 	
@@ -438,10 +435,7 @@ basic & ex::construct_from_uint(unsigned int 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);
 	}
 }
 	
@@ -499,10 +493,7 @@ basic & ex::construct_from_long(long 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);
 	}
 }
 	
@@ -536,19 +527,31 @@ basic & ex::construct_from_ulong(unsigned long 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);
 }
 
 //////////