* Forward declare simplify indexed for GCC 4.1 [Sheplyakov Alexei].

[ginac.git] / ginac / ex.h

diff --git a/ginac/ex.h b/ginac/ex.h
index b274b49ee2c72fb05d5c3747a20a88fc3f33a248..05b6c5b71ae89bbc94671fffb07950eaa850354e 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's light-weight expression handles. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __GINAC_EX_H__
@@ -73,10 +73,6 @@ class ex {
        // default constructor, copy constructor and assignment operator
 public:
        ex() throw();
-#ifdef OBSCURE_CINT_HACK
-       ex(const ex & other);
-       ex & operator=(const ex & other);
-#endif
 
        // other constructors
 public:
@@ -117,6 +113,7 @@ public:
        ex evalf(int level = 0) const { return bp->evalf(level); }
        ex evalm() const { return bp->evalm(); }
        ex eval_ncmul(const exvector & v) const { return bp->eval_ncmul(v); }
+       ex eval_integ() const { return bp->eval_integ(); }
 
        // printing
        void print(const print_context & c, unsigned level = 0) const;
@@ -231,36 +228,10 @@ private:
        void makewriteable();
        void share(const ex & other) const;
 
-#ifdef OBSCURE_CINT_HACK
-public:
-       static bool last_created_or_assigned_bp_can_be_converted_to_ex()
-       {
-               if (last_created_or_assigned_bp==0) return false;
-               if ((last_created_or_assigned_bp->flags &
-                        status_flags::dynallocated)==0) return false;
-               if ((last_created_or_assigned_bp->flags &
-                        status_flags::evaluated)==0) return false;
-               return true;
-       }
-protected:
-       void update_last_created_or_assigned_bp()
-       {
-               last_created_or_assigned_bp = bp;
-               last_created_or_assigned_exp = (long)(void *)(this);
-       }
-#endif // def OBSCURE_CINT_HACK
-
 // member variables
 
 private:
        mutable ptr<basic> bp;  ///< pointer to basic object managed by this
-
-#ifdef OBSCURE_CINT_HACK
-public:
-       static ptr<basic> last_created_or_assigned_bp;
-       static basic * dummy_bp;
-       static long last_created_or_assigned_exp;
-#endif // def OBSCURE_CINT_HACK
 };
 
 
@@ -274,91 +245,48 @@ inline
 ex::ex() throw() : bp(*const_cast<basic *>(_num0_bp))
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-#ifdef OBSCURE_CINT_HACK
-       update_last_created_or_assigned_bp();
-#endif // def OBSCURE_CINT_HACK
 }
 
-#ifdef OBSCURE_CINT_HACK
-inline
-ex::ex(const ex & other) : bp(other.bp)
-{
-       GINAC_ASSERT((bp->flags) & status_flags::dynallocated);
-       update_last_created_or_assigned_bp();
-}
-
-inline
-ex & ex::operator=(const ex & other)
-{
-       GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-       GINAC_ASSERT(other.bp->flags & status_flags::dynallocated);
-       bp = other.bp;
-       update_last_created_or_assigned_bp();
-       return *this;
-}
-#endif // def OBSCURE_CINT_HACK
-
 inline
 ex::ex(const basic & other) : bp(construct_from_basic(other))
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-#ifdef OBSCURE_CINT_HACK
-       update_last_created_or_assigned_bp();
-#endif // def OBSCURE_CINT_HACK
 }
 
 inline
 ex::ex(int i) : bp(construct_from_int(i))
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-#ifdef OBSCURE_CINT_HACK
-       update_last_created_or_assigned_bp();
-#endif // def OBSCURE_CINT_HACK
 }
 
 inline
 ex::ex(unsigned int i) : bp(construct_from_uint(i))
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-#ifdef OBSCURE_CINT_HACK
-       update_last_created_or_assigned_bp();
-#endif // def OBSCURE_CINT_HACK
 }
 
 inline
 ex::ex(long i) : bp(construct_from_long(i))
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-#ifdef OBSCURE_CINT_HACK
-       update_last_created_or_assigned_bp();
-#endif // def OBSCURE_CINT_HACK
 }
 
 inline
 ex::ex(unsigned long i) : bp(construct_from_ulong(i))
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-#ifdef OBSCURE_CINT_HACK
-       update_last_created_or_assigned_bp();
-#endif // def OBSCURE_CINT_HACK
 }
 
 inline
 ex::ex(double const d) : bp(construct_from_double(d))
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-#ifdef OBSCURE_CINT_HACK
-       update_last_created_or_assigned_bp();
-#endif // def OBSCURE_CINT_HACK
 }
 
 inline
 ex::ex(const std::string &s, const ex &l) : bp(construct_from_string_and_lst(s, l))
 {
        GINAC_ASSERT(bp->flags & status_flags::dynallocated);
-#ifdef OBSCURE_CINT_HACK
-       update_last_created_or_assigned_bp();
-#endif // def OBSCURE_CINT_HACK
 }
 
 inline
@@ -395,7 +323,7 @@ bool ex::is_equal(const ex & other) const
 #ifdef GINAC_COMPARE_STATISTICS
        compare_statistics.nontrivial_is_equals++;
 #endif
-    const bool equal = bp->is_equal(*other.bp);
+       const bool equal = bp->is_equal(*other.bp);
 #if 0
        if (equal) {
                // Expressions point to different, but equal, trees: conserve
@@ -807,6 +735,9 @@ inline ex evalf(const ex & thisex, int level = 0)
 inline ex evalm(const ex & thisex)
 { return thisex.evalm(); }
 
+inline ex eval_integ(const ex & thisex)
+{ return thisex.eval_integ(); }
+
 inline ex diff(const ex & thisex, const symbol & s, unsigned nth = 1)
 { return thisex.diff(s, nth); }