From 4aaa6006a9408999aa4fe336a14180035aa8c791 Mon Sep 17 00:00:00 2001
From: Christian Bauer <Christian.Bauer@uni-mainz.de>
Date: Wed, 27 Aug 2003 19:42:29 +0000
Subject: [PATCH] lsts are not shareable by default

---
 ginac/container.h | 36 +++++++++++++++++++++++++++++++++---
 ginac/ex.cpp      |  2 +-
 ginac/lst.h       |  3 +++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/ginac/container.h b/ginac/container.h
index e3465c46..4b6d0552 100644
--- a/ginac/container.h
+++ b/ginac/container.h
@@ -81,6 +81,7 @@ public:
 protected:
 	// helpers
 	static unsigned get_tinfo() { return TINFO_fail; }
+	static unsigned get_default_flags() { return 0; }
 	static char get_open_delim() { return '('; }
 	static char get_close_delim() { return ')'; }
 
@@ -88,6 +89,8 @@ protected:
 public:
 	container(STLT const & s, bool discardable = false) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
+
 		if (discardable)
 			this->seq.swap(const_cast<STLT &>(s));
 		else
@@ -96,23 +99,32 @@ public:
 
 	explicit container(std::auto_ptr<STLT> vp) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		this->seq.swap(*vp);
 	}
 
 	container(exvector::const_iterator b, exvector::const_iterator e)
-	 : inherited(get_tinfo()), container_storage<C>(b, e) {}
+	 : inherited(get_tinfo()), container_storage<C>(b, e)
+	{
+		setflag(get_default_flags());
+	}
 
 	explicit container(const ex & p1)
-	 : inherited(get_tinfo()), container_storage<C>(1, p1) {}
+	 : inherited(get_tinfo()), container_storage<C>(1, p1)
+	{
+		setflag(get_default_flags());
+	}
 
 	container(const ex & p1, const ex & p2) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 2);
 		this->seq.push_back(p1); this->seq.push_back(p2);
 	}
 
 	container(const ex & p1, const ex & p2, const ex & p3) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 3);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 	}
@@ -120,6 +132,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	                   const ex & p4) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 4);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4);
@@ -128,6 +141,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 5);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5);
@@ -136,6 +150,7 @@ public:
 	container(const ex & p1, const ex & p2, const ex & p3,
 	          const ex & p4, const ex & p5, const ex & p6) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 6);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -145,6 +160,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 7);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -155,6 +171,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 8);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -165,6 +182,7 @@ public:
 	          const ex & p4, const ex & p5, const ex & p6,
 	          const ex & p7, const ex & p8, const ex & p9) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 9);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -176,6 +194,7 @@ public:
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 10);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -188,6 +207,7 @@ public:
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 11);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -200,6 +220,7 @@ public:
 	          const ex & p7, const ex & p8, const ex & p9,
 	          const ex & p10, const ex & p11, const ex & p12) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 12);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -213,6 +234,7 @@ public:
 	          const ex & p10, const ex & p11, const ex & p12,
 	          const ex & p13) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 13);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -227,6 +249,7 @@ public:
 	          const ex & p10, const ex & p11, const ex & p12,
 	          const ex & p13, const ex & p14) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 14);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -241,6 +264,7 @@ public:
 	          const ex & p10, const ex & p11, const ex & p12,
 	          const ex & p13, const ex & p14, const ex & p15) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 15);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -256,6 +280,7 @@ public:
 	          const ex & p13, const ex & p14, const ex & p15,
 	          const ex & p16) : inherited(get_tinfo())
 	{
+		setflag(get_default_flags());
 		reserve(this->seq, 16);
 		this->seq.push_back(p1); this->seq.push_back(p2); this->seq.push_back(p3);
 		this->seq.push_back(p4); this->seq.push_back(p5); this->seq.push_back(p6);
@@ -335,12 +360,17 @@ protected:
 
 /** Default constructor */
 template <template <class> class C>
-container<C>::container() : inherited(get_tinfo()) {}
+container<C>::container() : inherited(get_tinfo())
+{
+	setflag(get_default_flags());
+}
 
 /** Construct object from archive_node. */
 template <template <class> class C>
 container<C>::container(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
+	setflag(get_default_flags());
+
 	for (unsigned int i=0; true; i++) {
 		ex e;
 		if (n.find_ex("seq", e, sym_lst, i))
diff --git a/ginac/ex.cpp b/ginac/ex.cpp
index 1af7f214..4a41ea8f 100644
--- a/ginac/ex.cpp
+++ b/ginac/ex.cpp
@@ -246,7 +246,7 @@ void ex::makewriteable()
  *  @see ex::compare(const basic &) */
 void ex::share(const ex & other) const
 {
-	if ((bp->flags & status_flags::not_shareable) || (other.bp->flags & status_flags::not_shareable))
+	if ((bp->flags | other.bp->flags) & status_flags::not_shareable)
 		return;
 
 	if (bp->refcount <= other.bp->refcount)
diff --git a/ginac/lst.h b/ginac/lst.h
index d4e8091e..a9de75d3 100644
--- a/ginac/lst.h
+++ b/ginac/lst.h
@@ -34,6 +34,9 @@ typedef container<std::list> lst;
 /** Specialization of container::get_tinfo() for lst. */
 inline unsigned lst::get_tinfo() { return TINFO_lst; }
 
+/** Specialization of container::get_default_flags() for lst. */
+inline unsigned lst::get_default_flags() { return status_flags::not_shareable; }
+
 /** Specialization of container::get_open_delim() for lst. */
 inline char lst::get_open_delim() { return '{'; }
 
-- 
2.44.0