X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fcontainer.pl;h=f13c96572e2e14b4903c4a2c6cafb1588e48440b;hp=86fda5b48d693e2f109ce896bdafb39cc7f5f844;hb=f449313a24038429447cb02a4798beb7fcf8216e;hpb=f293ecba8b6026a7754795256b2f23910bf70507

diff --git a/ginac/container.pl b/ginac/container.pl
index 86fda5b4..f13c9657 100755
--- a/ginac/container.pl
+++ b/ginac/container.pl
@@ -1,139 +1,139 @@
 if (($#ARGV!=0) and ($#ARGV!=1)) {
-    die 'usage: container.pl type [maxargs] (type=lst or exprseq)';
+	die 'usage: container.pl type [maxargs] (type=lst or exprseq)';
 }
 
 if ($ARGV[0] eq 'lst') {
-    $type='lst';
+	$type='lst';
 } elsif ($ARGV[0] eq 'exprseq') {
-    $type='exprseq';
+	$type='exprseq';
 } else {
-    die 'only lst and exprseq supported';
+	die 'only lst and exprseq supported';
 }
 
 if ($#ARGV==1) {
-    $maxargs=$ARGV[1];
+	$maxargs=$ARGV[1];
 } else {
-    $maxargs=15; # must be greater or equal than the value used in function.pl
+	$maxargs=15; # must be greater or equal than the value used in function.pl
 }
 
 if ($type eq 'exprseq') {
 
-    # settings for exprseq
-    $CONTAINER="exprseq";
-    $STLHEADER="vector";
-    $reserve=1;
-    $prepend=0;
-    $let_op=0;
-    $open_bracket='(';
-    $close_bracket=')';
-    
+	# settings for exprseq
+	$CONTAINER="exprseq";
+	$STLHEADER="vector";
+	$reserve=1;
+	$prepend=0;
+	$let_op=0;
+	$open_bracket='(';
+	$close_bracket=')';
+	
 } elsif ($type eq 'lst') {
  
-    # settings for lst
-    $CONTAINER="lst";
-    $STLHEADER="list";
-    $reserve=0;
-    $prepend=1;
-    $let_op=1;
-    $open_bracket='[';
-    $close_bracket=']';
+	# settings for lst
+	$CONTAINER="lst";
+	$STLHEADER="list";
+	$reserve=0;
+	$prepend=1;
+	$let_op=1;
+	$open_bracket='[';
+	$close_bracket=']';
 
 } else {
-    die "invalid type $type";
+	die "invalid type $type";
 }
 
 $CONTAINER_UC=uc(${CONTAINER});
 $STLT="ex".$STLHEADER;
 
 if ($reserve) {
-    $RESERVE_IMPLEMENTATION="#define RESERVE(s,size) (s).reserve(size)";
+	$RESERVE_IMPLEMENTATION="#define RESERVE(s,size) (s).reserve(size)";
 } else {
-    $RESERVE_IMPLEMENTATION="#define RESERVE(s,size) // no reserve needed for ${STLHEADER}";
+	$RESERVE_IMPLEMENTATION="#define RESERVE(s,size) // no reserve needed for ${STLHEADER}";
 }
 
 if ($prepend) {
-    $PREPEND_INTERFACE=<<END_OF_PREPEND_INTERFACE;
-    virtual ${CONTAINER} & prepend(const ex & b);
+	$PREPEND_INTERFACE=<<END_OF_PREPEND_INTERFACE;
+	virtual ${CONTAINER} & prepend(const ex & b);
 END_OF_PREPEND_INTERFACE
 
-    $PREPEND_IMPLEMENTATION=<<END_OF_PREPEND_IMPLEMENTATION;
+	$PREPEND_IMPLEMENTATION=<<END_OF_PREPEND_IMPLEMENTATION;
 ${CONTAINER} & ${CONTAINER}::prepend(const ex & b)
 {
-    ensure_if_modifiable();
-    seq.push_front(b);
-    return *this;
+	ensure_if_modifiable();
+	seq.push_front(b);
+	return *this;
 }
 END_OF_PREPEND_IMPLEMENTATION
 } else {
-    $PREPEND_INTERFACE="    // no prepend possible for ${CONTAINER}";
-    $PREPEND_IMPLEMENTATION="";
+	$PREPEND_INTERFACE="    // no prepend possible for ${CONTAINER}";
+	$PREPEND_IMPLEMENTATION="";
 }
 
 if ($let_op) {
-    $LET_OP_IMPLEMENTATION=<<END_OF_LET_OP_IMPLEMENTATION
+	$LET_OP_IMPLEMENTATION=<<END_OF_LET_OP_IMPLEMENTATION
 ex & ${CONTAINER}::let_op(int i)
 {
-    GINAC_ASSERT(i>=0);
-    GINAC_ASSERT(i<nops());
+	GINAC_ASSERT(i>=0);
+	GINAC_ASSERT(i<nops());
 
-    ${STLT}::iterator it=seq.begin();
-    for (int j=0; j<i; j++) {
-        ++it;
-    }
-    return *it;
+	${STLT}::iterator it=seq.begin();
+	for (int j=0; j<i; j++) {
+		++it;
+	}
+	return *it;
 }
 END_OF_LET_OP_IMPLEMENTATION
 } else {
-    $LET_OP_IMPLEMENTATION="// ${CONTAINER}::let_op() will be implemented by user elsewhere";
+	$LET_OP_IMPLEMENTATION="// ${CONTAINER}::let_op() will be implemented by user elsewhere";
 }
 
 sub generate_seq {
-    my ($seq_template,$n,$separator)=@_;
-    my ($res,$N);
-    
-    $res='';
-    for ($N=1; $N<=$n; $N++) {
-        $res .= eval('"' . $seq_template . '"');
-        if ($N!=$n) {
-            $res .= $separator;
-        }
-    }
-    return $res;
+	my ($seq_template,$n,$separator)=@_;
+	my ($res,$N);
+	
+	$res='';
+	for ($N=1; $N<=$n; $N++) {
+		$res .= eval('"' . $seq_template . '"');
+		if ($N!=$n) {
+			$res .= $separator;
+		}
+	}
+	return $res;
 }
 
 sub generate_from_to {
-    my ($template,$seq_template1,$seq_separator1,$seq_template2,
-        $seq_separator2,$from,$to)=@_;
-    my ($res,$N,$SEQ);
+	my ($template,$seq_template1,$seq_separator1,$seq_template2,
+	    $seq_separator2,$from,$to)=@_;
+	my ($res,$N,$SEQ);
 
-    $res='';
-    for ($N=$from; $N<=$to; $N++) {
-        $SEQ1=generate_seq($seq_template1,$N,$seq_separator1);
-        $SEQ2=generate_seq($seq_template2,$N,$seq_separator2);
-        $res .= eval('"' . $template . '"');
-        $SEQ1=''; # to avoid main::SEQ1 used only once warning
-        $SEQ2=''; # same as above
-    }
-    return $res;
+	$res='';
+	for ($N=$from; $N<=$to; $N++) {
+		$SEQ1=generate_seq($seq_template1,$N,$seq_separator1);
+		$SEQ2=generate_seq($seq_template2,$N,$seq_separator2);
+		$res .= eval('"' . $template . '"');
+		$SEQ1=''; # to avoid main::SEQ1 used only once warning
+		$SEQ2=''; # same as above
+	}
+	return $res;
 }
 
 sub generate {
-    my ($template,$seq_template1,$seq_separator1,$seq_template2,
-        $seq_separator2)=@_;
-    return generate_from_to($template,$seq_template1,$seq_separator1,
-                            $seq_template2,$seq_separator2,1,$maxargs);
+	my ($template,$seq_template1,$seq_separator1,$seq_template2,
+	    $seq_separator2)=@_;
+	return generate_from_to($template,$seq_template1,$seq_separator1,
+							$seq_template2,$seq_separator2,1,$maxargs);
 }
 
 $constructors_interface=generate(
-'    explicit ${CONTAINER}(${SEQ1});'."\n",
+'	explicit ${CONTAINER}(${SEQ1});'."\n",
 'const ex & param${N}',', ','','');
 
 $constructors_implementation=generate(
-    <<'END_OF_CONSTRUCTORS_IMPLEMENTATION','const ex & param${N}',', ','    seq.push_back(param${N});',"\n");
+	<<'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);
-    RESERVE(seq,${N});
+	debugmsg(\"${CONTAINER} ctor from ${N}*ex\",LOGLEVEL_CONSTRUCT);
+	RESERVE(seq,${N});
 ${SEQ2}
 }
 END_OF_CONSTRUCTORS_IMPLEMENTATION
@@ -155,7 +155,7 @@ $interface=<<END_OF_INTERFACE;
  *                        \$close_bracket=${close_bracket}
  *                        \$maxargs=${maxargs}
  *
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -183,94 +183,78 @@ $interface=<<END_OF_INTERFACE;
 #include "basic.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
-// typedef ${STLHEADER}<ex> ${STLT};
-typedef ${STLHEADER}<ex,malloc_alloc> ${STLT}; // CINT does not like ${STLHEADER}<...,default_alloc>
+
+// 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
 
 class ${CONTAINER} : public basic
 {
-    GINAC_DECLARE_REGISTERED_CLASS(${CONTAINER}, 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
+	${CONTAINER}(${STLT} const & s, bool discardable=0);
+	${CONTAINER}(${STLT} * vp); // vp will be deleted
 ${constructors_interface}
 
 public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printtree(ostream & os, unsigned indent) const;
-    bool info(unsigned inf) const;
-    unsigned nops() const;
-    ex & let_op(int i);
-    ex expand(unsigned options=0) const;
-    bool has(const ex & other) const;
-    ex eval(int level=0) const;
-    ex evalf(int level=0) const;
-    ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-    ex derivative(const symbol & s) const;
-    ex subs(const lst & ls, const lst & lr) const;
+	void print(const print_context & c, unsigned level = 0) const;
+	unsigned precedence(void) const {return 10;}
+	bool info(unsigned inf) const;
+	unsigned nops() const;
+	ex & let_op(int i);
+	ex expand(unsigned options=0) const;
+	ex eval(int level=0) const;
+	ex evalf(int level=0) const;
+	ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
+	ex derivative(const symbol & s) const;
+	ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
 protected:
-    int compare_same_type(const basic & other) const;
-    bool is_equal_same_type(const basic & other) const;
-    unsigned return_type(void) const;
+	bool is_equal_same_type(const basic & other) const;
+	unsigned return_type(void) const;
 
-    // new virtual functions which can be overridden by derived classes
+	// new virtual functions which can be overridden by derived classes
 public:
-    virtual ${CONTAINER} & append(const ex & b);
+	virtual ${CONTAINER} & append(const ex & b);
 ${PREPEND_INTERFACE}
 protected:
-    virtual void printseq(ostream & os, char openbracket, char delim,
-                          char closebracket, unsigned this_precedence,
-                          unsigned upper_precedence=0) const;
-    virtual ex this${CONTAINER}(${STLT} const & v) const;
-    virtual ex this${CONTAINER}(${STLT} * vp) const;
+	virtual void printseq(const print_context & c, char openbracket, char delim,
+	                      char closebracket, unsigned this_precedence,
+	                      unsigned upper_precedence = 0) const;
+	virtual ex this${CONTAINER}(${STLT} const & v) const;
+	virtual ex this${CONTAINER}(${STLT} * vp) const;
 
 protected:
-    bool is_canonical() const;
-    ${STLT} evalchildren(int level) const;
-    ${STLT} evalfchildren(int level) const;
-    ${STLT} normalchildren(int level) const;
-    ${STLT} diffchildren(const symbol & s) const;
-    ${STLT} * subschildren(const lst & ls, const lst & lr) const;
+	bool is_canonical() const;
+	${STLT} evalchildren(int level) const;
+	${STLT} evalfchildren(int level) const;
+	${STLT} normalchildren(int level) const;
+	${STLT} diffchildren(const symbol & s) const;
+	${STLT} * subschildren(const lst & ls, const lst & lr, bool no_pattern = false) const;
 
 protected:
-    ${STLT} seq;
-    static unsigned precedence;
+	${STLT} seq;
 };
 
-// global constants
-
-extern const ${CONTAINER} some_${CONTAINER};
-extern const type_info & typeid_${CONTAINER};
-
 // utility functions
 inline const ${CONTAINER} &ex_to_${CONTAINER}(const ex &e)
 {
-    return static_cast<const ${CONTAINER} &>(*e.bp);
+	return static_cast<const ${CONTAINER} &>(*e.bp);
 }
 
 inline ${CONTAINER} &ex_to_nonconst_${CONTAINER}(const ex &e)
 {
-    return static_cast<${CONTAINER} &>(*e.bp);
+	return static_cast<${CONTAINER} &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_${CONTAINER_UC}_H__
 
@@ -293,7 +277,7 @@ $implementation=<<END_OF_IMPLEMENTATION;
  *                        \$close_bracket=${close_bracket}
  *                        \$maxargs=${maxargs}
  *
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -315,87 +299,63 @@ $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(0);
-}
-
-${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(1);
-        copy(other);
-    }
-    return *this;
+	debugmsg("${CONTAINER} default ctor",LOGLEVEL_CONSTRUCT);
 }
 
 // protected
 
 void ${CONTAINER}::copy(${CONTAINER} const & other)
 {
-    inherited::copy(other);
-    seq=other.seq;
+	inherited::copy(other);
+	seq=other.seq;
 }
 
 void ${CONTAINER}::destroy(bool call_parent)
 {
-    seq.clear();
-    if (call_parent) inherited::destroy(call_parent);
+	seq.clear();
+	if (call_parent) inherited::destroy(call_parent);
 }
 
 //////////
-// other constructors
+// other ctors
 //////////
 
 // public
 
 ${CONTAINER}::${CONTAINER}(${STLT} const & s, bool discardable) :  basic(TINFO_${CONTAINER})
 {
-    debugmsg("${CONTAINER} constructor from ${STLT}",
-             LOGLEVEL_CONSTRUCT);
-    if (discardable) {
-        seq.swap(const_cast<${STLT} &>(s));
-    } else {
-        seq=s;
-    }
+	debugmsg("${CONTAINER} ctor from ${STLT}", LOGLEVEL_CONSTRUCT);
+	if (discardable) {
+		seq.swap(const_cast<${STLT} &>(s));
+	} else {
+		seq=s;
+	}
 }
 
 ${CONTAINER}::${CONTAINER}(${STLT} * vp) : basic(TINFO_${CONTAINER})
 {
-    debugmsg("${CONTAINER} constructor from ${STLT} *",LOGLEVEL_CONSTRUCT);
-    GINAC_ASSERT(vp!=0);
-    seq.swap(*vp);
-    delete vp;
+	debugmsg("${CONTAINER} ctor from ${STLT} *",LOGLEVEL_CONSTRUCT);
+	GINAC_ASSERT(vp!=0);
+	seq.swap(*vp);
+	delete vp;
 }
 
 ${constructors_implementation}
@@ -407,31 +367,31 @@ ${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);
-    for (unsigned int i=0; true; i++) {
-        ex e;
-        if (n.find_ex("seq", e, sym_lst, i))
-            seq.push_back(e);
-        else
-            break;
-    }
+	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))
+			seq.push_back(e);
+		else
+			break;
+	}
 }
 
 /** Unarchive the object. */
 ex ${CONTAINER}::unarchive(const archive_node &n, const lst &sym_lst)
 {
-    return (new ${CONTAINER}(n, sym_lst))->setflag(status_flags::dynallocated);
+	return (new ${CONTAINER}(n, sym_lst))->setflag(status_flags::dynallocated);
 }
 
 /** Archive the object. */
 void ${CONTAINER}::archive(archive_node &n) const
 {
-    inherited::archive(n);
-    ${STLT}::const_iterator i = seq.begin(), iend = seq.end();
-    while (i != iend) {
-        n.add_ex("seq", *i);
-        i++;
-    }
+	inherited::archive(n);
+	${STLT}::const_iterator i = seq.begin(), iend = seq.end();
+	while (i != iend) {
+		n.add_ex("seq", *i);
+		i++;
+	}
 }
 
 //////////
@@ -440,88 +400,58 @@ void ${CONTAINER}::archive(archive_node &n) const
 
 // public
 
-basic * ${CONTAINER}::duplicate() const
+void ${CONTAINER}::print(const print_context & c, unsigned level) const
 {
-    debugmsg("${CONTAINER} duplicate",LOGLEVEL_DUPLICATE);
-    return new ${CONTAINER}(*this);
-}
-
-void ${CONTAINER}::printraw(ostream & os) const
-{
-    debugmsg("${CONTAINER} printraw",LOGLEVEL_PRINT);
-
-    os << "${CONTAINER}(";
-    for (${STLT}::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
-        (*cit).bp->printraw(os);
-        os << ",";
-    }
-    os << ")";
-}
+	debugmsg("${CONTAINER} print", LOGLEVEL_PRINT);
 
-void ${CONTAINER}::print(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);
-}
+	if (is_of_type(c, print_tree)) {
 
-void ${CONTAINER}::printtree(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 << string(indent,' ') << "type=" << typeid(*this).name()
-       << ", hash=" << hashvalue << " (0x" << hex << hashvalue << dec << ")"
-       << ", flags=" << flags
-       << ", nops=" << nops() << endl;
-    for (${STLT}::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
-        (*cit).printtree(os,indent+delta_indent);
-    }
-    os << string(indent+delta_indent,' ') << "=====" << endl;
+	} else {
+		// always print brackets around seq, ignore upper_precedence
+		printseq(c, '${open_bracket}', ',', '${close_bracket}', precedence(), precedence()+1);
+	}
 }
 
 // ${CONTAINER}::info() will be implemented by user elsewhere";
 
 unsigned ${CONTAINER}::nops() const
 {
-    return seq.size();
+	return seq.size();
 }
 
 ${LET_OP_IMPLEMENTATION}
 
 ex ${CONTAINER}::expand(unsigned options) const
 {
-    ${STLT} s;
-    RESERVE(s,seq.size());
-    for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
-        s.push_back((*it).expand(options));
-    }
-
-    return this${CONTAINER}(s);
-}
+	${STLT} s;
+	RESERVE(s,seq.size());
+	for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
+		s.push_back((*it).expand(options));
+	}
 
-// a ${CONTAINER} 'has' an expression if it is this expression itself or a child 'has' it
-
-bool ${CONTAINER}::has(const ex & other) const
-{
-    GINAC_ASSERT(other.bp!=0);
-    if (is_equal(*other.bp)) return true;
-    for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
-        if ((*it).has(other)) return true;
-    }
-    return false;
+	return this${CONTAINER}(s);
 }
 
 ex ${CONTAINER}::eval(int level) const
 {
-    if (level==1) {
-        return this->hold();
-    }
-    return this${CONTAINER}(evalchildren(level));
+	if (level==1) {
+		return this->hold();
+	}
+	return this${CONTAINER}(evalchildren(level));
 }
 
 ex ${CONTAINER}::evalf(int level) const
 {
-    return this${CONTAINER}(evalfchildren(level));
+	return this${CONTAINER}(evalfchildren(level));
 }
 
 /** Implementation of ex::normal() for ${CONTAINER}s. It normalizes the arguments
@@ -529,67 +459,67 @@ ex ${CONTAINER}::evalf(int level) const
  *  \@see ex::normal */
 ex ${CONTAINER}::normal(lst &sym_lst, lst &repl_lst, int level) const
 {
-    ex n=this${CONTAINER}(normalchildren(level));
-    return n.bp->basic::normal(sym_lst,repl_lst,level);
+	ex n=this${CONTAINER}(normalchildren(level));
+	return n.bp->basic::normal(sym_lst,repl_lst,level);
 }
 
 ex ${CONTAINER}::derivative(const symbol & s) const
 {
-    return this${CONTAINER}(diffchildren(s));
+	return this${CONTAINER}(diffchildren(s));
 }
 
-ex ${CONTAINER}::subs(const lst & ls, const lst & lr) const
+ex ${CONTAINER}::subs(const lst & ls, const lst & lr, bool no_pattern) const
 {
-    ${STLT} * vp=subschildren(ls,lr);
-    if (vp==0) {
-        return *this;
-    }
-    return this${CONTAINER}(vp);
+	${STLT} *vp = subschildren(ls, lr, no_pattern);
+	if (vp)
+		return this${CONTAINER}(vp).bp->basic::subs(ls, lr, no_pattern);
+	else
+		return basic::subs(ls, lr, no_pattern);
 }
 
 // protected
 
 int ${CONTAINER}::compare_same_type(const basic & other) const
 {
-    GINAC_ASSERT(is_of_type(other,${CONTAINER}));
-    ${CONTAINER} const & o=static_cast<${CONTAINER} const &>
-                                    (const_cast<basic &>(other));
-    int cmpval;
-    ${STLT}::const_iterator it1=seq.begin();
-    ${STLT}::const_iterator it2=o.seq.begin();
+	GINAC_ASSERT(is_of_type(other,${CONTAINER}));
+	${CONTAINER} const & o=static_cast<${CONTAINER} const &>
+									(const_cast<basic &>(other));
+	int cmpval;
+	${STLT}::const_iterator it1=seq.begin();
+	${STLT}::const_iterator it2=o.seq.begin();
 
-    for (; (it1!=seq.end())&&(it2!=o.seq.end()); ++it1, ++it2) {
-        cmpval=(*it1).compare(*it2);
-        if (cmpval!=0) return cmpval;
-    }
+	for (; (it1!=seq.end())&&(it2!=o.seq.end()); ++it1, ++it2) {
+		cmpval=(*it1).compare(*it2);
+		if (cmpval!=0) return cmpval;
+	}
 
-    if (it1==seq.end()) {
-        return (it2==o.seq.end() ? 0 : -1);
-    }
+	if (it1==seq.end()) {
+		return (it2==o.seq.end() ? 0 : -1);
+	}
 
-    return 1;
+	return 1;
 }
 
 bool ${CONTAINER}::is_equal_same_type(const basic & other) const
 {
-    GINAC_ASSERT(is_of_type(other,${CONTAINER}));
-    ${CONTAINER} const & o=static_cast<${CONTAINER} const &>
-                                    (const_cast<basic &>(other));
-    if (seq.size()!=o.seq.size()) return false;
+	GINAC_ASSERT(is_of_type(other,${CONTAINER}));
+	${CONTAINER} const & o=static_cast<${CONTAINER} const &>
+									(const_cast<basic &>(other));
+	if (seq.size()!=o.seq.size()) return false;
 
-    ${STLT}::const_iterator it1=seq.begin();
-    ${STLT}::const_iterator it2=o.seq.begin();
+	${STLT}::const_iterator it1=seq.begin();
+	${STLT}::const_iterator it2=o.seq.begin();
 
-    for (; it1!=seq.end(); ++it1, ++it2) {
-	if (!(*it1).is_equal(*it2)) return false;
-    }
+	for (; it1!=seq.end(); ++it1, ++it2) {
+		if (!(*it1).is_equal(*it2)) return false;
+	}
 
-    return true;
+	return true;
 }
 
 unsigned ${CONTAINER}::return_type(void) const
 {
-    return return_types::noncommutative_composite;
+	return return_types::noncommutative_composite;
 }
 
 //////////
@@ -600,42 +530,45 @@ unsigned ${CONTAINER}::return_type(void) const
 
 ${CONTAINER} & ${CONTAINER}::append(const ex & b)
 {
-    ensure_if_modifiable();
-    seq.push_back(b);
-    return *this;
+	ensure_if_modifiable();
+	seq.push_back(b);
+	return *this;
 }
 
 ${PREPEND_IMPLEMENTATION}
 
 // protected
 
-void ${CONTAINER}::printseq(ostream & os, 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;
-        }
-        (*it).bp->print(os,this_precedence);
-    }
-    if (this_precedence<=upper_precedence) os << closebracket;
+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)
+		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->print(c, this_precedence);
+	}
+
+	if (this_precedence <= upper_precedence)
+		c.s << closebracket;
 }
 
 ex ${CONTAINER}::this${CONTAINER}(${STLT} const & v) const
 {
-    return ${CONTAINER}(v);
+	return ${CONTAINER}(v);
 }
 
 ex ${CONTAINER}::this${CONTAINER}(${STLT} * vp) const
 {
-    return ${CONTAINER}(vp);
+	return ${CONTAINER}(vp);
 }
 
 //////////
@@ -650,154 +583,125 @@ ex ${CONTAINER}::this${CONTAINER}(${STLT} * vp) const
 
 bool ${CONTAINER}::is_canonical() const
 {
-    if (seq.size()<=1) { return 1; }
+	if (seq.size()<=1) { return 1; }
 
-    ${STLT}::const_iterator it=seq.begin();
-    ${STLT}::const_iterator it_last=it;
-    for (++it; it!=seq.end(); it_last=it, ++it) {
-        if ((*it_last).compare(*it)>0) {
-            if ((*it_last).compare(*it)>0) {
-                cout << *it_last << ">" << *it << "\\n";
-                return 0;
-	        }
-        }
-    }
-    return 1;
+	${STLT}::const_iterator it=seq.begin();
+	${STLT}::const_iterator it_last=it;
+	for (++it; it!=seq.end(); it_last=it, ++it) {
+		if ((*it_last).compare(*it)>0) {
+			if ((*it_last).compare(*it)>0) {
+				std::cout << *it_last << ">" << *it << "\\n";
+				return 0;
+			}
+		}
+	}
+	return 1;
 }
 
 
 ${STLT} ${CONTAINER}::evalchildren(int level) const
 {
-    ${STLT} s;
-    RESERVE(s,seq.size());
+	${STLT} s;
+	RESERVE(s,seq.size());
 
-    if (level==1) {
-        return seq;
-    }
-    if (level == -max_recursion_level) {
-        throw(std::runtime_error("max recursion level reached"));
-    }
-    --level;
-    for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
-        s.push_back((*it).eval(level));
-    }
-    return s;
+	if (level==1) {
+		return seq;
+	}
+	if (level == -max_recursion_level) {
+		throw(std::runtime_error("max recursion level reached"));
+	}
+	--level;
+	for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
+		s.push_back((*it).eval(level));
+	}
+	return s;
 }
 
 ${STLT} ${CONTAINER}::evalfchildren(int level) const
 {
-    ${STLT} s;
-    RESERVE(s,seq.size());
+	${STLT} s;
+	RESERVE(s,seq.size());
 
-    if (level==1) {
-        return seq;
-    }
-    if (level == -max_recursion_level) {
-        throw(std::runtime_error("max recursion level reached"));
-    }
-    --level;
-    for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
-        s.push_back((*it).evalf(level));
-    }
-    return s;
+	if (level==1) {
+		return seq;
+	}
+	if (level == -max_recursion_level) {
+		throw(std::runtime_error("max recursion level reached"));
+	}
+	--level;
+	for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
+		s.push_back((*it).evalf(level));
+	}
+	return s;
 }
 
 ${STLT} ${CONTAINER}::normalchildren(int level) const
 {
-    ${STLT} s;
-    RESERVE(s,seq.size());
+	${STLT} s;
+	RESERVE(s,seq.size());
 
-    if (level==1) {
-        return seq;
-    }
-    if (level == -max_recursion_level) {
-        throw(std::runtime_error("max recursion level reached"));
-    }
-    --level;
-    for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
-        s.push_back((*it).normal(level));
-    }
-    return s;
+	if (level==1) {
+		return seq;
+	}
+	if (level == -max_recursion_level) {
+		throw(std::runtime_error("max recursion level reached"));
+	}
+	--level;
+	for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
+		s.push_back((*it).normal(level));
+	}
+	return s;
 }
 
 ${STLT} ${CONTAINER}::diffchildren(const symbol & y) const
 {
-    ${STLT} s;
-    RESERVE(s,seq.size());
-    for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
-        s.push_back((*it).diff(y));
-    }
-    return s;
-}
-
-/* obsolete subschildren
-${STLT} ${CONTAINER}::subschildren(const lst & ls, const lst & lr) const
-{
-    ${STLT} s;
-    RESERVE(s,seq.size());
-    for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
-        s.push_back((*it).subs(ls,lr));
-    }
-    return s;
-}
-*/
-
-${STLT} * ${CONTAINER}::subschildren(const lst & ls, const lst & lr) const
-{
-    // returns a NULL pointer if nothing had to be substituted
-    // returns a pointer to a newly created epvector otherwise
-    // (which has to be deleted somewhere else)
-
-    ${STLT}::const_iterator last=seq.end();
-    ${STLT}::const_iterator cit=seq.begin();
-    while (cit!=last) {
-        const ex & subsed_ex=(*cit).subs(ls,lr);
-        if (!are_ex_trivially_equal(*cit,subsed_ex)) {
-
-            // something changed, copy seq, subs and return it
-            ${STLT} *s=new ${STLT};
-            RESERVE(*s,seq.size());
-
-            // copy parts of seq which are known not to have changed
-            ${STLT}::const_iterator cit2=seq.begin();
-            while (cit2!=cit) {
-                s->push_back(*cit2);
-                ++cit2;
-            }
-            // copy first changed element
-            s->push_back(subsed_ex);
-            ++cit2;
-            // copy rest
-            while (cit2!=last) {
-                s->push_back((*cit2).subs(ls,lr));
-                ++cit2;
-	    }
-            return s;
-        }
-        ++cit;
-    }
-    
-    return 0; // nothing has changed
+	${STLT} s;
+	RESERVE(s,seq.size());
+	for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
+		s.push_back((*it).diff(y));
+	}
+	return s;
+}
+
+${STLT} * ${CONTAINER}::subschildren(const lst & ls, const lst & lr, bool no_pattern) const
+{
+	// returns a NULL pointer if nothing had to be substituted
+	// returns a pointer to a newly created epvector otherwise
+	// (which has to be deleted somewhere else)
+
+	${STLT}::const_iterator last=seq.end();
+	${STLT}::const_iterator cit=seq.begin();
+	while (cit!=last) {
+		const ex & subsed_ex=(*cit).subs(ls,lr,no_pattern);
+		if (!are_ex_trivially_equal(*cit,subsed_ex)) {
+
+			// something changed, copy seq, subs and return it
+			${STLT} *s=new ${STLT};
+			RESERVE(*s,seq.size());
+
+			// copy parts of seq which are known not to have changed
+			${STLT}::const_iterator cit2=seq.begin();
+			while (cit2!=cit) {
+				s->push_back(*cit2);
+				++cit2;
+			}
+			// copy first changed element
+			s->push_back(subsed_ex);
+			++cit2;
+			// copy rest
+			while (cit2!=last) {
+				s->push_back((*cit2).subs(ls,lr,no_pattern));
+				++cit2;
+			}
+			return s;
+		}
+		++cit;
+	}
+	
+	return 0; // nothing has changed
 }
 
-//////////
-// static member variables
-//////////
-
-// protected
-
-unsigned ${CONTAINER}::precedence=10;
-
-//////////
-// global constants
-//////////
-
-const ${CONTAINER} some_${CONTAINER};
-const type_info & typeid_${CONTAINER}=typeid(some_${CONTAINER});
-
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 END_OF_IMPLEMENTATION