]> www.ginac.de Git - ginac.git/blobdiff - ginac/container.pl
- dirac_trace() is twice as fast
[ginac.git] / ginac / container.pl
index 1a591ab304d50917487ea411c2c67fce5ea48853..f13c96572e2e14b4903c4a2c6cafb1588e48440b 100755 (executable)
@@ -186,10 +186,11 @@ $interface=<<END_OF_INTERFACE;
 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
@@ -204,19 +205,17 @@ public:
 ${constructors_interface}
 
 public:
-       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;
+       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;
-       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;
+       ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
 protected:
        bool is_equal_same_type(const basic & other) const;
        unsigned return_type(void) const;
@@ -226,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;
 
@@ -238,18 +237,12 @@ protected:
        ${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;
+       ${STLT} * subschildren(const lst & ls, const lst & lr, bool no_pattern = false) const;
 
 protected:
        ${STLT} seq;
-       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)
 {
@@ -306,6 +299,7 @@ $implementation=<<END_OF_IMPLEMENTATION;
 
 #include "${CONTAINER}.h"
 #include "ex.h"
+#include "print.h"
 #include "archive.h"
 #include "debugmsg.h"
 
@@ -406,38 +400,25 @@ void ${CONTAINER}::archive(archive_node &n) const
 
 // public
 
-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 << class_name() << "(";
-       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";
@@ -460,18 +441,6 @@ ex ${CONTAINER}::expand(unsigned options) const
        return this${CONTAINER}(s);
 }
 
-// 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;
-}
-
 ex ${CONTAINER}::eval(int level) const
 {
        if (level==1) {
@@ -499,13 +468,13 @@ ex ${CONTAINER}::derivative(const symbol & s) const
        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 inherited::subs(ls, lr);
-
-       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
@@ -570,23 +539,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
@@ -691,19 +663,7 @@ ${STLT} ${CONTAINER}::diffchildren(const symbol & y) const
        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
+${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
@@ -712,7 +672,7 @@ ${STLT} * ${CONTAINER}::subschildren(const lst & ls, const lst & lr) const
        ${STLT}::const_iterator last=seq.end();
        ${STLT}::const_iterator cit=seq.begin();
        while (cit!=last) {
-               const ex & subsed_ex=(*cit).subs(ls,lr);
+               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
@@ -730,7 +690,7 @@ ${STLT} * ${CONTAINER}::subschildren(const lst & ls, const lst & lr) const
                        ++cit2;
                        // copy rest
                        while (cit2!=last) {
-                               s->push_back((*cit2).subs(ls,lr));
+                               s->push_back((*cit2).subs(ls,lr,no_pattern));
                                ++cit2;
                        }
                        return s;
@@ -741,21 +701,6 @@ ${STLT} * ${CONTAINER}::subschildren(const lst & ls, const lst & lr) const
        return 0; // nothing has changed
 }
 
-//////////
-// static member variables
-//////////
-
-// protected
-
-unsigned ${CONTAINER}::precedence = 10;
-
-//////////
-// global constants
-//////////
-
-const ${CONTAINER} some_${CONTAINER};
-const std::type_info & typeid_${CONTAINER} = typeid(some_${CONTAINER});
-
 } // namespace GiNaC
 
 END_OF_IMPLEMENTATION