From: Christian Bauer <Christian.Bauer@uni-mainz.de>
Date: Mon, 24 Mar 2003 17:50:06 +0000 (+0000)
Subject: simplified_ncmul() -> hold_ncmul()
X-Git-Tag: release_1-1-0~8
X-Git-Url: https://www.ginac.de/ginac.git/tutorial/ginac.git?a=commitdiff_plain;h=a38a763436183e582ed07068ed8139588f64daec;p=ginac.git

simplified_ncmul() -> hold_ncmul()
nonsimplified_ncmul() -> reeval_ncmul()
---

diff --git a/ginac/basic.cpp b/ginac/basic.cpp
index d2b624a6..a79ac065 100644
--- a/ginac/basic.cpp
+++ b/ginac/basic.cpp
@@ -576,7 +576,7 @@ exvector basic::get_free_indices(void) const
 
 ex basic::eval_ncmul(const exvector & v) const
 {
-	return simplified_ncmul(v);
+	return hold_ncmul(v);
 }
 
 // protected
diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp
index 9a1330e4..1ab5eef5 100644
--- a/ginac/clifford.cpp
+++ b/ginac/clifford.cpp
@@ -454,9 +454,9 @@ ex clifford::eval_ncmul(const exvector & v) const
 	if (s.empty())
 		return clifford(diracone(), representation_label) * sign;
 	if (something_changed)
-		return nonsimplified_ncmul(s) * sign;
+		return reeval_ncmul(s) * sign;
 	else
-		return simplified_ncmul(s) * sign;
+		return hold_ncmul(s) * sign;
 }
 
 ex clifford::thisexprseq(const exvector & v) const
diff --git a/ginac/color.cpp b/ginac/color.cpp
index 94f1871b..9600065d 100644
--- a/ginac/color.cpp
+++ b/ginac/color.cpp
@@ -171,7 +171,7 @@ ex color::eval_ncmul(const exvector & v) const
 	if (s.empty())
 		return color(su3one(), representation_label);
 	else
-		return simplified_ncmul(s);
+		return hold_ncmul(s);
 }
 
 ex color::thisexprseq(const exvector & v) const
diff --git a/ginac/ncmul.cpp b/ginac/ncmul.cpp
index dc328818..b0fbb93d 100644
--- a/ginac/ncmul.cpp
+++ b/ginac/ncmul.cpp
@@ -574,12 +574,12 @@ const exvector & ncmul::get_factors(void) const
 // friend functions
 //////////
 
-ex nonsimplified_ncmul(const exvector & v)
+ex reeval_ncmul(const exvector & v)
 {
 	return (new ncmul(v))->setflag(status_flags::dynallocated);
 }
 
-ex simplified_ncmul(const exvector & v)
+ex hold_ncmul(const exvector & v)
 {
 	if (v.empty())
 		return _ex1;
diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index b2ea9ca2..3db9d178 100644
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -33,8 +33,8 @@ class ncmul : public exprseq
 	GINAC_DECLARE_REGISTERED_CLASS(ncmul, exprseq)
 
 	friend class power;
-	friend ex nonsimplified_ncmul(const exvector & v);
-	friend ex simplified_ncmul(const exvector & v);
+	friend ex reeval_ncmul(const exvector & v);
+	friend ex hold_ncmul(const exvector & v);
 
 // member functions
 
@@ -84,8 +84,8 @@ public:
 
 // friend funtions 
 
-ex nonsimplified_ncmul(const exvector & v);
-ex simplified_ncmul(const exvector & v);
+ex reeval_ncmul(const exvector & v);
+ex hold_ncmul(const exvector & v);
 
 // utility functions