moved ToString() here from utils.h

[ginac.git] / ginac / idx.h

diff --git a/ginac/idx.h b/ginac/idx.h
index 92c685c4ea1d53c9ea466e1351c6f35ec3fc67fb..c2ac972108ecf1c22e4402259a9ff5af4d783327 100644 (file)
--- a/ginac/idx.h
+++ b/ginac/idx.h
@@ -45,15 +45,19 @@ public:
         *  @return newly constructed index */
        explicit idx(const ex & v, const ex & dim);
 
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
        void print(const print_context & c, unsigned level = 0) const;
        bool info(unsigned inf) const;
        unsigned nops() const;
        ex & let_op(int i);
-       bool match(const ex & pattern, lst & repl_lst) const;
+       ex evalf(int level = 0) const;
        ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
 
+protected:
+       ex derivative(const symbol & s) const;
+       bool match_same_type(const basic & other) const;
+
        // new virtual functions in this class
 public:
        /** Check whether the index forms a dummy index pair with another index
@@ -102,12 +106,14 @@ public:
         *  @return newly constructed index */
        varidx(const ex & v, const ex & dim, bool covariant = false);
 
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
        void print(const print_context & c, unsigned level = 0) const;
-       bool match(const ex & pattern, lst & repl_lst) const;
        bool is_dummy_pair_same_type(const basic & other) const;
 
+protected:
+       bool match_same_type(const basic & other) const;
+
        // non-virtual functions in this class
 public:
        /** Check whether the index is covariant. */
@@ -145,12 +151,14 @@ public:
         *  @return newly constructed index */
        spinidx(const ex & v, const ex & dim = 2, bool covariant = false, bool dotted = false);
 
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
        void print(const print_context & c, unsigned level = 0) const;
-       bool match(const ex & pattern, lst & repl_lst) const;
        bool is_dummy_pair_same_type(const basic & other) const;
 
+protected:
+       bool match_same_type(const basic & other) const;
+
        // non-virtual functions in this class
 public:
        /** Check whether the index is dotted. */
@@ -175,21 +183,21 @@ protected:
 
 // utility functions
 
-/** Return the idx object handled by an ex.
+/** Return the idx object handled by an ex.  Deprecated: use ex_to<idx>().
  *  This is unsafe: you need to check the type first. */
 inline const idx &ex_to_idx(const ex & e)
 {
        return static_cast<const idx &>(*e.bp);
 }
 
-/** Return the varidx object handled by an ex.
+/** Return the varidx object handled by an ex.  Deprecated: use ex_to<varidx>().
  *  This is unsafe: you need to check the type first. */
 inline const varidx &ex_to_varidx(const ex & e)
 {
        return static_cast<const varidx &>(*e.bp);
 }
 
-/** Return the spinidx object handled by an ex.
+/** Return the spinidx object handled by an ex.  Deprecated: use ex_to<spinidx>().
  *  This is unsafe: you need to check the type first. */
 inline const spinidx &ex_to_spinidx(const ex & e)
 {