- adjust for 0.9.2, close open bugreports.

[ginac.git] / ginac / add.h

diff --git a/ginac/add.h b/ginac/add.h
index 8a93186b700cfa5b8b923c823f215b08facaea78..fe8d20b7c93f165d9d4cfc346c0ebc060e6dadf2 100644 (file)
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -44,22 +44,22 @@ public:
        add(const epvector & v, const ex & oc);
        add(epvector * vp, const ex & oc);
        
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
-       void print(std::ostream & os, unsigned upper_precedence=0) const;
-       void printraw(std::ostream & os) const;
-       void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
+       void print(const print_context & c, unsigned level = 0) const;
+       unsigned precedence(void) const {return 40;}
        bool info(unsigned inf) const;
-       int degree(const symbol & s) const;
-       int ldegree(const symbol & s) const;
-       ex coeff(const symbol & s, int n=1) const;
+       int degree(const ex & s) const;
+       int ldegree(const ex & s) const;
+       ex coeff(const ex & s, int n=1) const;
        ex eval(int level=0) const;
+       ex evalm(void) const;
        ex series(const relational & r, int order, unsigned options = 0) const;
        ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
        numeric integer_content(void) const;
        ex smod(const numeric &xi) const;
        numeric max_coefficient(void) const;
-       exvector get_indices(void) const;
+       exvector get_free_indices(void) const;
        ex simplify_ncmul(const exvector & v) const;
 protected:
        ex derivative(const symbol & s) const;
@@ -75,25 +75,23 @@ protected:
                                               const ex & c) const;
        ex recombine_pair_to_ex(const expair & p) const;
        ex expand(unsigned options=0) const;
-       
-       // new virtual functions which can be overridden by derived classes
-       // none
-       
-       // non-virtual functions in this class
-       // none
-
-// member variables
-
-protected:
-       static unsigned precedence;
 };
 
 // utility functions
+
+/** Return the add object handled by an ex.  Deprecated: use ex_to<add>().
+ *  This is unsafe: you need to check the type first. */
 inline const add &ex_to_add(const ex &e)
 {
        return static_cast<const add &>(*e.bp);
 }
 
+/** Specialization of is_exactly_a<add>(obj) for add objects. */
+template<> inline bool is_exactly_a<add>(const basic & obj)
+{
+       return obj.tinfo()==TINFO_add;
+}
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_ADD_H__