- Cleanups: My evil plot of making ex::bp private may finally be carried

[ginac.git] / ginac / basic.h

diff --git a/ginac/basic.h b/ginac/basic.h
index f53a4e316f25cb50db793254ba62ba2dac89cfdd..1268d0020f027a573beecccfaa3792aeab5e1752 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -96,8 +96,6 @@ protected:
        {
                /* debugmsg("basic ctor with tinfo_key", LOGLEVEL_CONSTRUCT); */
        }
-       // functions overriding virtual functions from bases classes
-       // none
        
        // new virtual functions which can be overridden by derived classes
 public: // only const functions please (may break reference counting)
@@ -112,6 +110,7 @@ public: // only const functions please (may break reference counting)
        virtual ex & let_op(int i);
        virtual ex operator[](const ex & index) const;
        virtual ex operator[](int i) const;
+       virtual ex expand(unsigned options = 0) const;
        virtual bool has(const ex & other) const;
        virtual ex map(map_function & f) const;
        virtual int degree(const ex & s) const;
@@ -130,19 +129,19 @@ public: // only const functions please (may break reference counting)
        virtual ex smod(const numeric &xi) const;
        virtual numeric max_coefficient(void) const;
        virtual exvector get_free_indices(void) const;
-       virtual ex simplify_ncmul(const exvector & v) const;
        virtual ex eval_indexed(const basic & i) const;
        virtual ex add_indexed(const ex & self, const ex & other) const;
        virtual ex scalar_mul_indexed(const ex & self, const numeric & other) const;
        virtual bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
-protected: // non-const functions should be called from class ex only
+       virtual unsigned return_type(void) const;
+       virtual unsigned return_type_tinfo(void) const;
+protected: // functions that should be called from class ex only
        virtual ex derivative(const symbol & s) const;
        virtual int compare_same_type(const basic & other) const;
        virtual bool is_equal_same_type(const basic & other) const;
-       virtual unsigned return_type(void) const;
-       virtual unsigned return_type_tinfo(void) const;
+       virtual bool match_same_type(const basic & other) const;
        virtual unsigned calchash(void) const;
-       virtual ex expand(unsigned options = 0) const;
+       virtual ex simplify_ncmul(const exvector & v) const;
        
        // non-virtual functions in this class
 public:
@@ -176,26 +175,11 @@ private:
 
 extern int max_recursion_level;
 
-// Obsolete convenience macros.  To be phased out soon!
-// Use the inlined template functions below instead of these macros.
-
-#define is_of_type(OBJ,TYPE) \
-       (dynamic_cast<const TYPE *>(&OBJ)!=0)
-
-#define is_exactly_of_type(OBJ,TYPE) \
-       ((OBJ).tinfo()==GiNaC::TINFO_##TYPE)
-
-#define is_ex_of_type(OBJ,TYPE) \
-       (dynamic_cast<const TYPE *>((OBJ).bp)!=0)
-
-#define is_ex_exactly_of_type(OBJ,TYPE) \
-       ((*(OBJ).bp).tinfo()==GiNaC::TINFO_##TYPE)
-
 // convenience type checker template functions
 
 /** Check if obj is a T, including base classes. */
 template <class T>
-inline bool is_a(const basic & obj)
+inline bool is_a(const basic &obj)
 {
        return dynamic_cast<const T *>(&obj)!=0;
 }
@@ -204,28 +188,29 @@ inline bool is_a(const basic & obj)
  *  inefficient default.  It should in all time-critical cases be overridden
  *  by template specializations that don't create a temporary. */
 template <class T>
-inline bool is_exactly_a(const class basic & obj)
+inline bool is_exactly_a(const class basic &obj)
 {
        const T foo; return foo.tinfo()==obj.tinfo();
 }
 
 /** Check if ex is a handle to a T, including base classes. */
 template <class T>
-inline bool is_a(const ex & obj)
+inline bool is_a(const ex &obj)
 {
        return is_a<T>(*obj.bp);
 }
 
 /** Check if ex is a handle to a T, not including base classes. */
 template <class T>
-inline bool is_exactly_a(const ex & obj)
+inline bool is_exactly_a(const ex &obj)
 {
        return is_exactly_a<T>(*obj.bp);
 }
 
 /** Return a reference to the basic-derived class T object embedded in an
  *  expression.  This is fast but unsafe: the result is undefined if the
- *  expression does not contain a T object at its top level.
+ *  expression does not contain a T object at its top level.  Hence, you
+ *  should generally check the type of e first.
  *
  *  @param e expression
  *  @return reference to pseries object
@@ -233,6 +218,7 @@ inline bool is_exactly_a(const ex & obj)
 template <class T>
 inline const T &ex_to(const ex &e)
 {
+       GINAC_ASSERT(is_a<T>(e));
        return static_cast<const T &>(*e.bp);
 }