- replaced the various print*() member functions by a single print() that

[ginac.git] / ginac / mul.h

diff --git a/ginac/mul.h b/ginac/mul.h
index af6826f9c0b1af7eeef466156090101a90137aae..affef3ba0c7ba5f024af2d51b418c8c1de8aef52 100644 (file)
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -25,32 +25,18 @@
 
 #include "expairseq.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 /** Product of expressions. */
 class mul : public expairseq
 {
        GINAC_DECLARE_REGISTERED_CLASS(mul, expairseq)
-
+       
        friend class add;
        friend class ncmul;
        friend class power;
-
-// member functions
-
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       mul();
-       ~mul();
-       mul(const mul & other);
-       const mul & operator=(const mul & other);
-protected:
-       void copy(const mul & other);
-       void destroy(bool call_parent);
-
-       // other constructors
+       
+       // other ctors
 public:
        mul(const ex & lh, const ex & rh);
        mul(const exvector & v);
@@ -58,17 +44,14 @@ public:
        mul(const epvector & v, const ex & oc);
        mul(epvector * vp, const ex & oc);
        mul(const ex & lh, const ex & mh, const ex & rh);
-
+       
        // functions overriding virtual functions from bases classes
 public:
-       basic * duplicate() const;
-       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) const;
+       void print(const print_context & c, unsigned level) const;
        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 evalf(int level=0) const;
        ex series(const relational & s, int order, unsigned options = 0) const;
@@ -76,11 +59,10 @@ public:
        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;
-       int compare_same_type(const basic & other) const;
        bool is_equal_same_type(const basic & other) const;
        unsigned return_type(void) const;
        unsigned return_type_tinfo(void) const;
@@ -101,30 +83,23 @@ protected:
        
        // new virtual functions which can be overridden by derived classes
        // none
-
+       
        // non-virtual functions in this class
 protected:
        epvector * expandchildren(unsigned options) const;
-
+       
 // member variables
-
+       
 protected:
        static unsigned precedence;
 };
 
-// global constants
-
-extern const mul some_mul;
-extern const std::type_info & typeid_mul;
-
 // utility functions
 inline const mul &ex_to_mul(const ex &e)
 {
        return static_cast<const mul &>(*e.bp);
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_MUL_H__