new #define CINT_CONVERSION_WORKAROUND for ginaccint, needed

[ginac.git] / ginac / ex.h

diff --git a/ginac/ex.h b/ginac/ex.h
index b63c3726ca98f2f36d0d41a02f410bb3563a8530..40dd07e02e77043b3009bcd9d09c783a928af0c0 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -123,6 +123,14 @@ public:
 ;
 #endif // def INLINE_EX_CONSTRUCTORS
 
+#ifdef CINT_CONVERSION_WORKAROUND
+    // workaround to fix the missing automatic derived->basic->ex conversion
+    const ex & operator=(const basic & other)
+        {
+            return *this=ex(other);
+        }
+#endif // def CINT_CONVERSION_WORKAROUND 
+
     // other constructors
 public:
     ex(const basic & other)
@@ -217,18 +225,24 @@ public:
     unsigned nops() const;
     ex expand(unsigned options=0) const;
     bool has(const ex & other) const;
+#ifdef CINT_CONVERSION_WORKAROUND
+    bool has(basic const & other) const { return has(ex(other)); }
+#endif // def CINT_CONVERSION_WORKAROUND
     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)); }
-    ex numer(bool normalize = true) const;
-    ex denom(bool normalize = true) const;
+    ex numer(void) const;
+    ex denom(void) const;
     ex unit(const symbol &x) const;
     ex content(const symbol &x) const;
     numeric integer_content(void) const;
     ex primpart(const symbol &x) const;
     ex primpart(const symbol &x, const ex &cont) const;
+#ifdef CINT_CONVERSION_WORKAROUND
+    ex primpart(const symbol &x, const basic &cont) const { return primpart(x,ex(cont)); }
+#endif // def CINT_CONVERSION_WORKAROUND
     ex normal(int level = 0) const;
     ex smod(const numeric &xi) const;
     numeric max_coefficient(void) const;
@@ -237,14 +251,25 @@ public:
     ex evalf(int level = 0) const;
     ex diff(const symbol & s, unsigned nth = 1) const;
     ex series(const symbol & s, const ex & point, int order = 6) const;
+#ifdef CINT_CONVERSION_WORKAROUND
+    ex series(const symbol & s, const basic & point, int order = 6) const { return series(s,ex(point),order); }
+#endif // def CINT_CONVERSION_WORKAROUND
     ex subs(const lst & ls, const lst & lr) const;
     ex subs(const ex & e) const;
+#ifdef CINT_CONVERSION_WORKAROUND
+    ex subs(const basic & e) const { return subs(ex(e)); }
+#endif // def CINT_CONVERSION_WORKAROUND
     exvector get_indices(void) const;
     ex simplify_ncmul(const exvector & v) const;
     ex operator[](const ex & index) const;
+#ifdef CINT_CONVERSION_WORKAROUND
+    ex operator[](const basic & index) const { return operator[](ex(index)); }
+#endif // def CINT_CONVERSION_WORKAROUND
     ex operator[](int i) const;
     ex op(int i) const;
     ex & let_op(int i);
+    ex lhs(void) const;
+    ex rhs(void) const;
     int compare(const ex & other) const
 #ifdef INLINE_EX_CONSTRUCTORS
         {
@@ -259,6 +284,9 @@ public:
 #else
 ;
 #endif // def INLINE_EX_CONSTRUCTORS
+#ifdef CINT_CONVERSION_WORKAROUND
+    int compare(const basic & other) const { return compare(ex(other)); }
+#endif // def CINT_CONVERSION_WORKAROUND
     bool is_equal(const ex & other) const
 #ifdef INLINE_EX_CONSTRUCTORS
         {
@@ -273,6 +301,9 @@ public:
 #else
 ;
 #endif // def INLINE_EX_CONSTRUCTORS
+#ifdef CINT_CONVERSION_WORKAROUND
+    bool is_equal(const basic & other) const { return is_equal(ex(other)); }
+#endif // def CINT_CONVERSION_WORKAROUND
     bool is_zero(void) const {return compare(_ex0())==0;};
         
     unsigned return_type(void) const;
@@ -280,8 +311,17 @@ public:
     unsigned gethash(void) const;
 
     ex exadd(const ex & rh) const;
+#ifdef CINT_CONVERSION_WORKAROUND
+    ex exadd(const basic & rh) const { return exadd(ex(rh)); }
+#endif // def CINT_CONVERSION_WORKAROUND
     ex exmul(const ex & rh) const;
+#ifdef CINT_CONVERSION_WORKAROUND
+    ex exmul(const basic & rh) const { return exmul(ex(rh)); }
+#endif // def CINT_CONVERSION_WORKAROUND
     ex exncmul(const ex & rh) const;
+#ifdef CINT_CONVERSION_WORKAROUND
+    ex exncmul(const basic & rh) const { return exncmul(ex(rh)); }
+#endif // def CINT_CONVERSION_WORKAROUND
 private:
     void construct_from_basic(const basic & other);
     void construct_from_int(int i);
@@ -312,6 +352,7 @@ protected:
             }
             last_created_or_assigned_bp=bp;
             ++last_created_or_assigned_bp->refcount;
+            last_created_or_assigned_exp=(long)(void *)(this);
         }
 #endif // def OBSCURE_CINT_HACK
 
@@ -320,7 +361,9 @@ protected:
 public:
     basic *bp;
 #ifdef OBSCURE_CINT_HACK
-    static basic *last_created_or_assigned_bp;
+    static basic * last_created_or_assigned_bp;
+    static basic * dummy_bp;
+    static long last_created_or_assigned_exp;
 #endif // def OBSCURE_CINT_HACK
 };
 
@@ -349,11 +392,11 @@ inline int ldegree(const ex & thisex, const symbol & s)
 inline ex coeff(const ex & thisex, const symbol & s, int n=1)
 { return thisex.coeff(s, n); }
 
-inline ex numer(const ex & thisex, bool normalize = true)
-{ return thisex.numer(normalize); }
+inline ex numer(const ex & thisex)
+{ return thisex.numer(); }
 
-inline ex denom(const ex & thisex, bool normalize = true)
-{ return thisex.denom(normalize); }
+inline ex denom(const ex & thisex)
+{ return thisex.denom(); }
 
 inline ex normal(const ex & thisex, int level=0)
 { return thisex.normal(level); }
@@ -379,6 +422,18 @@ inline ex subs(const ex & thisex, const ex & e)
 inline ex subs(const ex & thisex, const lst & ls, const lst & lr)
 { return thisex.subs(ls, lr); }
 
+inline ex op(const ex & thisex, int i)
+{ return thisex.op(i); }
+
+inline ex lhs(const ex & thisex)
+{ return thisex.lhs(); }
+
+inline ex rhs(const ex & thisex)
+{ return thisex.rhs(); }
+
+inline bool is_zero(const ex & thisex)
+{ return thisex.is_zero(); }
+
 inline void swap(ex & e1, ex & e2)
 { e1.swap(e2); }