* Supplement some (now deprecated) macros by inlined template functions:

[ginac.git] / ginac / ncmul.h

diff --git a/ginac/ncmul.h b/ginac/ncmul.h
index cc186a0a36a37325fec314ce01b00cb12444c3bc..b0fbbee9e8f00b09d929bec2986aa527b18103e6 100644 (file)
--- a/ginac/ncmul.h
+++ b/ginac/ncmul.h
@@ -53,17 +53,16 @@ public:
 
        // functions overriding virtual functions from bases classes
 public:
-       void print(std::ostream & os, unsigned upper_precedence) 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 50;}
        bool info(unsigned inf) const;
-       int degree(const symbol & s) const;
-       int ldegree(const symbol & s) const;
+       int degree(const ex & s) const;
+       int ldegree(const ex & s) const;
        ex expand(unsigned options=0) const;
-       ex coeff(const symbol & s, int n=1) const;
+       ex coeff(const ex & s, int n=1) const;
        ex eval(int level=0) const;
-       ex subs(const lst & ls, const lst & lr) const;
-       exvector get_indices(void) const;
+       ex evalm(void) const;
+       exvector get_free_indices(void) const;
        ex thisexprseq(const exvector & v) const;
        ex thisexprseq(exvector * vp) const;
 protected:
@@ -81,11 +80,6 @@ protected:
        exvector expandchildren(unsigned options) const;
 public:
        const exvector & get_factors(void) const;
-
-// member variables
-
-protected:
-       static unsigned precedence;
 };
 
 // friend funtions 
@@ -94,11 +88,20 @@ ex nonsimplified_ncmul(const exvector & v);
 ex simplified_ncmul(const exvector & v);
 
 // utility functions
+
+/** Return the ncmul object handled by an ex.  Deprecated: use ex_to<ncmul>().
+ *  This is unsafe: you need to check the type first. */
 inline const ncmul &ex_to_ncmul(const ex &e)
 {
        return static_cast <const ncmul &>(*e.bp);
 }
 
+/** Specialization of is_exactly_a<ncmul>(obj) for ncmul objects. */
+template<> inline bool is_exactly_a<ncmul>(const basic & obj)
+{
+       return obj.tinfo()==TINFO_ncmul;
+}
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_NCMUL_H__