synced to 1.1

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 6fc37366eae6b399b7a9e8d0d2234d7f10498b31..0b6eec27d8cefd1c3c60f2f4a26f59115a8671c7 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -41,7 +41,10 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic)
 
 // public
 
-constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++) {}
+constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++)
+{
+       setflag(status_flags::evaluated | status_flags::expanded);
+}
 
 // protected
 

diff --git a/ginac/tensor.cpp b/ginac/tensor.cpp
index 5e95a414fad3378d6913274319ecac620ea8d2f0..98f5995823971f49b66e662184f162a270d29237 100644 (file)
--- a/ginac/tensor.cpp
+++ b/ginac/tensor.cpp
@@ -50,7 +50,14 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(tensepsilon, tensor)
 // default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
-DEFAULT_CTORS(tensor)
+tensor::tensor() : inherited(TINFO_tensor)
+{
+       setflag(status_flags::evaluated | status_flags::expanded);
+}
+
+DEFAULT_COPY(tensor)
+DEFAULT_DESTROY(tensor)
+
 DEFAULT_CTORS(tensdelta)
 DEFAULT_CTORS(tensmetric)
 DEFAULT_COPY(spinmetric)

diff --git a/ginac/wildcard.cpp b/ginac/wildcard.cpp
index 22ab5f0729777575369e1a878c7b36a47c2bd515..765b87c7d01072e6b2363358961bc5267435a410 100644 (file)
--- a/ginac/wildcard.cpp
+++ b/ginac/wildcard.cpp
@@ -35,9 +35,9 @@ GINAC_IMPLEMENT_REGISTERED_CLASS(wildcard, basic)
 // default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
-wildcard::wildcard() : label(0)
+wildcard::wildcard() : inherited(TINFO_wildcard), label(0)
 {
-       tinfo_key = TINFO_wildcard;
+       setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 void wildcard::copy(const wildcard & other)
@@ -52,9 +52,9 @@ DEFAULT_DESTROY(wildcard)
 // other constructors
 //////////
 
-wildcard::wildcard(unsigned l) : label(l)
+wildcard::wildcard(unsigned l) : inherited(TINFO_wildcard), label(l)
 {
-       tinfo_key = TINFO_wildcard;
+       setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////