- Fix the evalf(2^Pi) bug reported by Pearu.

[ginac.git] / ginac / expairseq.h

diff --git a/ginac/expairseq.h b/ginac/expairseq.h
index 9865586c4e906b3df3f26e0fb4436602d8b85fdc..9fe72d579a5fb59b33e1f733710dcf30602d6a1c 100644 (file)
--- a/ginac/expairseq.h
+++ b/ginac/expairseq.h
@@ -44,7 +44,6 @@ namespace GiNaC {
 #define EXPAIRSEQ_USE_HASHTAB 0
 
 typedef std::vector<expair> epvector;       ///< expair-vector
-typedef epvector::iterator epviter;         ///< expair-vector iterator
 typedef epvector::iterator epp;             ///< expair-vector pointer
 typedef std::list<epp> epplist;             ///< list of expair-vector pointers
 typedef std::vector<epplist> epplistvector; ///< vector of epplist
@@ -84,7 +83,7 @@ public:
        expairseq(const epvector & v, const ex & oc);
        expairseq(epvector * vp, const ex & oc); // vp will be deleted
        
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
        basic * duplicate() const;
        void print(const print_context & c, unsigned level = 0) const;
@@ -95,13 +94,10 @@ public:
        ex & let_op(int i);
        ex map(map_function & f) const;
        ex eval(int level=0) const;
-       ex evalf(int level=0) const;
-       ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
        ex to_rational(lst &repl_lst) const;
        bool match(const ex & pattern, lst & repl_lst) const;
        ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
 protected:
-       ex derivative(const symbol & s) const;
        int compare_same_type(const basic & other) const;
        bool is_equal_same_type(const basic & other) const;
        unsigned return_type(void) const;
@@ -151,7 +147,7 @@ protected:
        void remove_hashtab_entry(epvector::const_iterator element);
        void move_hashtab_entry(epvector::const_iterator oldpos,
                                epvector::iterator newpos);
-       void sorted_insert(epplist & eppl, epp elem);
+       void sorted_insert(epplist & eppl, epvector::const_iterator elem);
        void build_hashtab_and_combine(epvector::iterator & first_numeric,
                                       epvector::iterator & last_non_zero,
                                       vector<bool> & touched,
@@ -167,9 +163,6 @@ protected:
        bool is_canonical() const;
        epvector * expandchildren(unsigned options) const;
        epvector * evalchildren(int level) const;
-       epvector evalfchildren(int level) const;
-       epvector normalchildren(int level) const;
-       epvector diffchildren(const symbol & s) const;
        epvector * subschildren(const lst & ls, const lst & lr, bool no_pattern = false) const;
        
 // member variables
@@ -189,7 +182,7 @@ protected:
 
 // utility functions
 
-/** Return the expairseq object handled by an ex.
+/** Return the expairseq object handled by an ex.  Deprecated: use ex_to<expairseq>().
  *  This is unsafe: you need to check the type first. */
 inline const expairseq &ex_to_expairseq(const ex &e)
 {