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

[ginac.git] / ginac / ex.h

diff --git a/ginac/ex.h b/ginac/ex.h
index f2feba7338446cd0ab9257ac4955b5fab957d65d..accac216e8d36e779db5168d3024636faa3ed780 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -39,7 +39,8 @@ class scalar_products;
 
 /** Lightweight wrapper for GiNaC's symbolic objects.  Basically all it does is
  *  to hold a pointer to the other objects, manage the reference counting and
- *  provide methods for manipulation of these objects. */
+ *  provide methods for manipulation of these objects.  (Some people call such
+ *  a thing a proxy class.) */
 class ex
 {
        friend class basic;
@@ -75,21 +76,19 @@ public:
        // non-virtual functions in this class
 public:
        void swap(ex & other);
-       void printraw(std::ostream & os) const;
-       void printtree(std::ostream & os, unsigned indent=0) const;
-       void print(std::ostream & os, unsigned upper_precedence=0) const;
-       void printcsrc(std::ostream & os, unsigned type, const char *var_name) const;
+       void print(const print_context & c, unsigned level = 0) const;
+       void printtree(std::ostream & os) const;
        void dbgprint(void) const;
        void dbgprinttree(void) const;
        bool info(unsigned inf) const;
        unsigned nops() const;
        ex expand(unsigned options=0) const;
        bool has(const ex & other) const;
-       int degree(const symbol & s) const;
-       int ldegree(const symbol & s) const;
-       ex coeff(const symbol & s, int n=1) const;
-       ex lcoeff(const symbol & s) const { return coeff(s, degree(s)); }
-       ex tcoeff(const symbol & s) const { return coeff(s, ldegree(s)); }
+       int degree(const ex & s) const;
+       int ldegree(const ex & s) const;
+       ex coeff(const ex & s, int n=1) const;
+       ex lcoeff(const ex & s) const { return coeff(s, degree(s)); }
+       ex tcoeff(const ex & s) const { return coeff(s, ldegree(s)); }
        ex numer(void) const;
        ex denom(void) const;
        ex unit(const symbol &x) const;
@@ -101,7 +100,7 @@ public:
        ex to_rational(lst &repl_lst) const;
        ex smod(const numeric &xi) const;
        numeric max_coefficient(void) const;
-       ex collect(const symbol & s) const;
+       ex collect(const ex & s) const;
        ex eval(int level = 0) const;
        ex evalf(int level = 0) const;
        ex diff(const symbol & s, unsigned nth = 1) const;
@@ -128,7 +127,6 @@ public:
        
        ex exadd(const ex & rh) const;
        ex exmul(const ex & rh) const;
-       ex exncmul(const ex & rh) const;
 private:
        void construct_from_basic(const basic & other);
        void construct_from_int(int i);
@@ -338,13 +336,13 @@ inline ex expand(const ex & thisex, unsigned options = 0)
 inline bool has(const ex & thisex, const ex & other)
 { return thisex.has(other); }
 
-inline int degree(const ex & thisex, const symbol & s)
+inline int degree(const ex & thisex, const ex & s)
 { return thisex.degree(s); }
 
-inline int ldegree(const ex & thisex, const symbol & s)
+inline int ldegree(const ex & thisex, const ex & s)
 { return thisex.ldegree(s); }
 
-inline ex coeff(const ex & thisex, const symbol & s, int n=1)
+inline ex coeff(const ex & thisex, const ex & s, int n=1)
 { return thisex.coeff(s, n); }
 
 inline ex numer(const ex & thisex)
@@ -359,7 +357,7 @@ inline ex normal(const ex & thisex, int level=0)
 inline ex to_rational(const ex & thisex, lst & repl_lst)
 { return thisex.to_rational(repl_lst); }
 
-inline ex collect(const ex & thisex, const symbol & s)
+inline ex collect(const ex & thisex, const ex & s)
 { return thisex.collect(s); }
 
 inline ex eval(const ex & thisex, int level = 0)