if ($#ARGV==1) {
$maxargs=$ARGV[1];
} else {
- $maxargs=15; # must be greater or equal than the value used in function.pl
+ $maxargs=16; # must be greater or equal than the value used in function.pl
}
if ($type eq 'exprseq') {
$reserve=0;
$prepend=1;
$let_op=1;
- $open_bracket='[';
- $close_bracket=']';
+ $open_bracket='{';
+ $close_bracket='}';
} else {
die "invalid type $type";
if ($prepend) {
$PREPEND_INTERFACE=<<END_OF_PREPEND_INTERFACE;
virtual ${CONTAINER} & prepend(const ex & b);
+ virtual ${CONTAINER} & remove_first(void);
END_OF_PREPEND_INTERFACE
$PREPEND_IMPLEMENTATION=<<END_OF_PREPEND_IMPLEMENTATION;
seq.push_front(b);
return *this;
}
+${CONTAINER} & ${CONTAINER}::remove_first(void)
+{
+ ensure_if_modifiable();
+ seq.pop_front();
+ return *this;
+}
END_OF_PREPEND_IMPLEMENTATION
} else {
$PREPEND_INTERFACE=" // no prepend possible for ${CONTAINER}";
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};
-#else
typedef std::${STLHEADER}<ex> ${STLT};
-#endif
class ${CONTAINER} : public basic
{
${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 map(map_func f) const;
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;
// new virtual functions which can be overridden by derived classes
public:
virtual ${CONTAINER} & append(const ex & b);
+ virtual ${CONTAINER} & remove_last(void);
${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;
${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)
{
#include "${CONTAINER}.h"
#include "ex.h"
+#include "print.h"
#include "archive.h"
#include "debugmsg.h"
// 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 << "${CONTAINER}(";
- for (${STLT}::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) {
- (*cit).bp->printraw(os);
- os << ",";
- }
- os << ")";
-}
-
-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);
-}
+ if (is_of_type(c, print_tree)) {
-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";
${LET_OP_IMPLEMENTATION}
-ex ${CONTAINER}::expand(unsigned options) const
+ex ${CONTAINER}::map(map_func f) const
{
${STLT} s;
RESERVE(s,seq.size());
for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- s.push_back((*it).expand(options));
+ s.push_back(f(*it));
}
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
+ex ${CONTAINER}::expand(unsigned options) const
{
- GINAC_ASSERT(other.bp!=0);
- if (is_equal(*other.bp)) return true;
+ ${STLT} s;
+ RESERVE(s,seq.size());
for (${STLT}::const_iterator it=seq.begin(); it!=seq.end(); ++it) {
- if ((*it).has(other)) return true;
+ s.push_back((*it).expand(options));
}
- return false;
+
+ return this${CONTAINER}(s);
}
ex ${CONTAINER}::eval(int level) 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 *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
return *this;
}
+${CONTAINER} & ${CONTAINER}::remove_last(void)
+{
+ ensure_if_modifiable();
+ seq.pop_back();
+ return *this;
+}
+
${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
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
${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
++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;
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
git://www.ginac.de / ginac.git / blobdiff