added example for namespace bracing

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index 0ec57202e975d1382e7fce6aeaec602bed4c5ee3..25c48f4f71beb6de3e08f0b41707afe5f7827725 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -42,12 +42,11 @@ public:
        mul(const exvector & v);
        mul(const epvector & v);
        mul(const epvector & v, const ex & oc);
-       mul(epvector * vp, const ex & oc);
+       mul(std::auto_ptr<epvector> vp, const ex & oc);
        mul(const ex & lh, const ex & mh, const ex & rh);
        
        // functions overriding virtual functions from base classes
 public:
-       void print(const print_context & c, unsigned level = 0) const;
        unsigned precedence() const {return 50;}
        bool info(unsigned inf) const;
        int degree(const ex & s) const;
@@ -57,7 +56,7 @@ public:
        ex evalf(int level=0) const;
        ex evalm() const;
        ex series(const relational & s, int order, unsigned options = 0) const;
-       ex normal(exmap & repl, int level = 0) const;
+       ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const;
        numeric integer_content() const;
        ex smod(const numeric &xi) const;
        numeric max_coefficient() const;
@@ -68,7 +67,7 @@ protected:
        unsigned return_type() const;
        unsigned return_type_tinfo() const;
        ex thisexpairseq(const epvector & v, const ex & oc) const;
-       ex thisexpairseq(epvector * vp, const ex & oc) const;
+       ex thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const;
        expair split_ex_to_pair(const ex & e) const;
        expair combine_ex_with_coeff_to_pair(const ex & e, const ex & c) const;
        expair combine_pair_with_coeff_to_pair(const expair & p, const ex & c) const;
@@ -87,7 +86,12 @@ protected:
 public:
        ex algebraic_subs_mul(const exmap & m, unsigned options) const;
 protected:
-       epvector * expandchildren(unsigned options) const;
+       void print_overall_coeff(const print_context & c, const char *mul_sym) const;
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_latex(const print_latex & c, unsigned level) const;
+       void do_print_csrc(const print_csrc & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+       std::auto_ptr<epvector> expandchildren(unsigned options) const;
 };
 
 // utility functions