X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcontainer.pl;h=af9d5372ba4616cb441ed5c399a090c776fd490c;hp=bbeb3b4a0f5de0a251b1a56a31791c6e719f5e8b;hb=d508ca04e9c2f4ee103c9f21f33a98c87116df13;hpb=383d5eb3b0f0506810d9105a268f939125bfc347

diff --git a/ginac/container.pl b/ginac/container.pl
index bbeb3b4a..af9d5372 100755
--- a/ginac/container.pl
+++ b/ginac/container.pl
@@ -132,7 +132,7 @@ $constructors_implementation=generate(
 	<<'END_OF_CONSTRUCTORS_IMPLEMENTATION','const ex & param${N}',', ','	seq.push_back(param${N});',"\n");
 ${CONTAINER}::${CONTAINER}(${SEQ1}) : basic(TINFO_${CONTAINER})
 {
-	debugmsg(\"${CONTAINER} constructor from ${N}*ex\",LOGLEVEL_CONSTRUCT);
+	debugmsg(\"${CONTAINER} ctor from ${N}*ex\",LOGLEVEL_CONSTRUCT);
 	RESERVE(seq,${N});
 ${SEQ2}
 }
@@ -183,15 +183,14 @@ $interface=<<END_OF_INTERFACE;
 #include "basic.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 
-// Cint does not like ${STLHEADER}<..,default_alloc> but malloc_alloc is
-// unstandardized and not supported by newer GCCs.
-#if defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ < 97))
-typedef std::${STLHEADER}<ex,malloc_alloc> ${STLT};
+// Cint currently does not like ${STLHEADER}<..,default_alloc> but malloc_alloc is
+// unstandardized and not supported by newer GCCs.  This ugly hack will go
+// away soon!
+#if (defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 97)) || (defined(G__GNUC) && (G__GNUC == 2) && (G__GNUC_MINOR < 97))
+typedef std::${STLHEADER}<GiNaC::ex,malloc_alloc> ${STLT};
 #else
 typedef std::${STLHEADER}<ex> ${STLT};
 #endif
@@ -200,25 +199,13 @@ class ${CONTAINER} : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(${CONTAINER}, basic)
 
-public:
-	${CONTAINER}();
-	~${CONTAINER}();
-	${CONTAINER}(${CONTAINER} const & other);
-	${CONTAINER} const & operator=(${CONTAINER} const & other);
-protected:
-	void copy(${CONTAINER} const & other);
-	void destroy(bool call_parent);
-
 public:
 	${CONTAINER}(${STLT} const & s, bool discardable=0);
 	${CONTAINER}(${STLT} * vp); // vp will be deleted
 ${constructors_interface}
 
 public:
-	basic * duplicate() const;
-	void printraw(std::ostream & os) const;
-	void print(std::ostream & os, unsigned upper_precedence=0) const;
-	void printtree(std::ostream & os, unsigned indent) const;
+	void print(const print_context & c, unsigned level = 0) const;
 	bool info(unsigned inf) const;
 	unsigned nops() const;
 	ex & let_op(int i);
@@ -230,7 +217,6 @@ public:
 	ex derivative(const symbol & s) const;
 	ex subs(const lst & ls, const lst & lr) const;
 protected:
-	int compare_same_type(const basic & other) const;
 	bool is_equal_same_type(const basic & other) const;
 	unsigned return_type(void) const;
 
@@ -239,9 +225,9 @@ public:
 	virtual ${CONTAINER} & append(const ex & b);
 ${PREPEND_INTERFACE}
 protected:
-	virtual void printseq(std::ostream & os, char openbracket, char delim,
+	virtual void printseq(const print_context & c, char openbracket, char delim,
 	                      char closebracket, unsigned this_precedence,
-	                      unsigned upper_precedence=0) const;
+	                      unsigned upper_precedence = 0) const;
 	virtual ex this${CONTAINER}(${STLT} const & v) const;
 	virtual ex this${CONTAINER}(${STLT} * vp) const;
 
@@ -258,11 +244,6 @@ protected:
 	static unsigned precedence;
 };
 
-// global constants
-
-extern const ${CONTAINER} some_${CONTAINER};
-extern const std::type_info & typeid_${CONTAINER};
-
 // utility functions
 inline const ${CONTAINER} &ex_to_${CONTAINER}(const ex &e)
 {
@@ -274,9 +255,7 @@ inline ${CONTAINER} &ex_to_nonconst_${CONTAINER}(const ex &e)
 	return static_cast<${CONTAINER} &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_${CONTAINER_UC}_H__
 
@@ -321,48 +300,25 @@ $implementation=<<END_OF_IMPLEMENTATION;
 
 #include "${CONTAINER}.h"
 #include "ex.h"
+#include "print.h"
 #include "archive.h"
 #include "debugmsg.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 GINAC_IMPLEMENT_REGISTERED_CLASS(${CONTAINER}, basic)
 
 ${RESERVE_IMPLEMENTATION}
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor assignment operator and helpers
 //////////
 
 // public
 
 ${CONTAINER}::${CONTAINER}() : basic(TINFO_${CONTAINER})
 {
-	debugmsg("${CONTAINER} default constructor",LOGLEVEL_CONSTRUCT);
-}
-
-${CONTAINER}::~${CONTAINER}()
-{
-	debugmsg("${CONTAINER} destructor",LOGLEVEL_DESTRUCT);
-	destroy(false);
-}
-
-${CONTAINER}::${CONTAINER}(${CONTAINER} const & other)
-{
-	debugmsg("${CONTAINER} copy constructor",LOGLEVEL_CONSTRUCT);
-	copy(other);
-}
-
-${CONTAINER} const & ${CONTAINER}::operator=(${CONTAINER} const & other)
-{
-	debugmsg("${CONTAINER} operator=",LOGLEVEL_ASSIGNMENT);
-	if (this != &other) {
-		destroy(true);
-		copy(other);
-	}
-	return *this;
+	debugmsg("${CONTAINER} default ctor",LOGLEVEL_CONSTRUCT);
 }
 
 // protected
@@ -380,14 +336,14 @@ void ${CONTAINER}::destroy(bool call_parent)
 }
 
 //////////
-// other constructors
+// other ctors
 //////////
 
 // public
 
 ${CONTAINER}::${CONTAINER}(${STLT} const & s, bool discardable) :  basic(TINFO_${CONTAINER})
 {
-	debugmsg("${CONTAINER} constructor from ${STLT}", LOGLEVEL_CONSTRUCT);
+	debugmsg("${CONTAINER} ctor from ${STLT}", LOGLEVEL_CONSTRUCT);
 	if (discardable) {
 		seq.swap(const_cast<${STLT} &>(s));
 	} else {
@@ -397,7 +353,7 @@ ${CONTAINER}::${CONTAINER}(${STLT} const & s, bool discardable) :  basic(TINFO_$
 
 ${CONTAINER}::${CONTAINER}(${STLT} * vp) : basic(TINFO_${CONTAINER})
 {
-	debugmsg("${CONTAINER} constructor from ${STLT} *",LOGLEVEL_CONSTRUCT);
+	debugmsg("${CONTAINER} ctor from ${STLT} *",LOGLEVEL_CONSTRUCT);
 	GINAC_ASSERT(vp!=0);
 	seq.swap(*vp);
 	delete vp;
@@ -412,7 +368,7 @@ ${constructors_implementation}
 /** Construct object from archive_node. */
 ${CONTAINER}::${CONTAINER}(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-	debugmsg("${CONTAINER} constructor from archive_node", LOGLEVEL_CONSTRUCT);
+	debugmsg("${CONTAINER} ctor from archive_node", LOGLEVEL_CONSTRUCT);
 	for (unsigned int i=0; true; i++) {
 		ex e;
 		if (n.find_ex("seq", e, sym_lst, i))
@@ -445,44 +401,25 @@ void ${CONTAINER}::archive(archive_node &n) const
 
 // public
 
-basic * ${CONTAINER}::duplicate() const
-{
-	debugmsg("${CONTAINER} duplicate",LOGLEVEL_DUPLICATE);
-	return new ${CONTAINER}(*this);
-}
-
-void ${CONTAINER}::printraw(std::ostream & os) const
+void ${CONTAINER}::print(const print_context & c, unsigned level) const
 {
-	debugmsg("${CONTAINER} printraw",LOGLEVEL_PRINT);
+	debugmsg("${CONTAINER} print", LOGLEVEL_PRINT);
 
-	os << "${CONTAINER}(";
-	for (${STLT}::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
-		(*cit).bp->printraw(os);
-		os << ",";
-	}
-	os << ")";
-}
+	if (is_of_type(c, print_tree)) {
 
-void ${CONTAINER}::print(std::ostream & os, unsigned upper_precedence) const
-{
-	debugmsg("${CONTAINER} print",LOGLEVEL_PRINT);
-	// always print brackets around seq, ignore upper_precedence
-	printseq(os,'${open_bracket}',',','${close_bracket}',precedence,precedence+1);
-}
-
-void ${CONTAINER}::printtree(std::ostream & os, unsigned indent) const
-{
-	debugmsg("${CONTAINER} printtree",LOGLEVEL_PRINT);
+		c.s << std::string(level, ' ') << class_name()
+		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+		    << ", nops=" << nops()
+		    << std::endl;
+		unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
+		for (${STLT}::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit)
+			cit->print(c, level + delta_indent);
+		c.s << std::string(level + delta_indent,' ') << "=====" << std::endl;
 
-	os << std::string(indent,' ') << "type=" << class_name()
-	   << ", hash=" << hashvalue 
-	   << " (0x" << std::hex << hashvalue << std::dec << ")"
-	   << ", flags=" << flags
-	   << ", nops=" << nops() << std::endl;
-	for (${STLT}::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
-		(*cit).printtree(os,indent+delta_indent);
+	} else {
+		// always print brackets around seq, ignore upper_precedence
+		printseq(c, '${open_bracket}', ',', '${close_bracket}', precedence, precedence+1);
 	}
-	os << std::string(indent+delta_indent,' ') << "=====" << std::endl;
 }
 
 // ${CONTAINER}::info() will be implemented by user elsewhere";
@@ -547,9 +484,9 @@ ex ${CONTAINER}::derivative(const symbol & s) const
 ex ${CONTAINER}::subs(const lst & ls, const lst & lr) const
 {
 	${STLT} * vp=subschildren(ls,lr);
-	if (vp==0) {
-		return *this;
-	}
+	if (vp==0)
+		return inherited::subs(ls, lr);
+
 	return this${CONTAINER}(vp);
 }
 
@@ -615,23 +552,26 @@ ${PREPEND_IMPLEMENTATION}
 
 // protected
 
-void ${CONTAINER}::printseq(std::ostream & os, char openbracket, char delim,
+void ${CONTAINER}::printseq(const print_context & c, char openbracket, char delim,
                             char closebracket, unsigned this_precedence,
                             unsigned upper_precedence) const
 {
-	if (this_precedence<=upper_precedence) os << openbracket;
-	if (seq.size()!=0) {
-		${STLT}::const_iterator it,it_last;
-		it=seq.begin();
-		it_last=seq.end();
-		--it_last;
-		for (; it!=it_last; ++it) {
-			(*it).bp->print(os,this_precedence);
-			os << delim;
+	if (this_precedence <= upper_precedence)
+		c.s << openbracket;
+
+	if (seq.size() != 0) {
+		${STLT}::const_iterator it = seq.begin(), itend = seq.end();
+		--itend;
+		while (it != itend) {
+			it->print(c, this_precedence);
+			c.s << delim;
+			it++;
 		}
-		(*it).bp->print(os,this_precedence);
+		it->print(c, this_precedence);
 	}
-	if (this_precedence<=upper_precedence) os << closebracket;
+
+	if (this_precedence <= upper_precedence)
+		c.s << closebracket;
 }
 
 ex ${CONTAINER}::this${CONTAINER}(${STLT} const & v) const
@@ -792,18 +732,9 @@ ${STLT} * ${CONTAINER}::subschildren(const lst & ls, const lst & lr) const
 
 // protected
 
-unsigned ${CONTAINER}::precedence=10;
-
-//////////
-// global constants
-//////////
-
-const ${CONTAINER} some_${CONTAINER};
-const std::type_info & typeid_${CONTAINER} = typeid(some_${CONTAINER});
+unsigned ${CONTAINER}::precedence = 10;
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 END_OF_IMPLEMENTATION