mentioned ncpow()

[ginac.git] / ginac / basic.h

diff --git a/ginac/basic.h b/ginac/basic.h
index ee2bef237d0aeb569efaa55f6362def40078d216..446d6d100b0ced4cab01ede4fe0bbfdf2e17d392 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -24,7 +24,6 @@
 #define __GINAC_BASIC_H__
 
 #include <iostream>
-#include <typeinfo>
 #include <vector>
 
 // CINT needs <algorithm> to work properly with <vector>
@@ -44,11 +43,13 @@ class lst;
 class numeric;
 class relational;
 class archive_node;
+class print_context;
 
-// Cint doesn't like vector<..,default_alloc> but malloc_alloc is
-// unstandardized and not supported by newer GCCs.
-#if defined(__GNUC__) && ((__GNUC__ == 2) && (__GNUC_MINOR__ < 97))
-  typedef std::vector<ex,malloc_alloc> exvector;
+// Cint currently doesn't like vector<..,default_alloc> but malloc_alloc is
+// unstandardized and not supported by newer GCCs.  This ugly hack will go
+// away soon!
+#if (defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 97)) || (defined(G__GNUC) && (G__GNUC == 2) && (G__GNUC_MINOR < 97))
+  typedef std::vector<GiNaC::ex,malloc_alloc> exvector;
 #else
   typedef std::vector<ex> exvector;
 #endif
@@ -61,8 +62,6 @@ class basic
        
        friend class ex;
        
-// member functions
-       
        // default ctor, dtor, copy ctor assignment operator and helpers
 public:
        basic() : tinfo_key(TINFO_basic), flags(0), refcount(0)
@@ -101,12 +100,10 @@ protected:
        // new virtual functions which can be overridden by derived classes
 public: // only const functions please (may break reference counting)
        virtual basic * duplicate() const;
-       virtual void print(std::ostream & os,unsigned upper_precedence = 0) const;
-       virtual void printraw(std::ostream & os) const;
-       virtual void printtree(std::ostream & os, unsigned indent) const;
-       virtual void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
+       virtual void print(const print_context & c, unsigned level = 0) const;
        virtual void dbgprint(void) const;
        virtual void dbgprinttree(void) const;
+       virtual unsigned precedence(void) const;
        virtual bool info(unsigned inf) const;
        virtual unsigned nops() const;
        virtual ex op(int i) const;
@@ -114,14 +111,15 @@ public: // only const functions please (may break reference counting)
        virtual ex operator[](const ex & index) const;
        virtual ex operator[](int i) const;
        virtual bool has(const ex & other) const;
-       virtual int degree(const symbol & s) const;
-       virtual int ldegree(const symbol & s) const;
-       virtual ex coeff(const symbol & s, int n = 1) const;
-       virtual ex collect(const symbol & s) const;
+       virtual int degree(const ex & s) const;
+       virtual int ldegree(const ex & s) const;
+       virtual ex coeff(const ex & s, int n = 1) const;
+       virtual ex collect(const ex & s, bool distributed = false) const;
        virtual ex eval(int level = 0) const;
        virtual ex evalf(int level = 0) const;
        virtual ex series(const relational & r, int order, unsigned options = 0) const;
-       virtual ex subs(const lst & ls, const lst & lr) const;
+       virtual bool match(const ex & pattern, lst & repl_lst) const;
+       virtual ex subs(const lst & ls, const lst & lr, bool no_pattern = false) const;
        virtual ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
        virtual ex to_rational(lst &repl_lst) const;
        virtual numeric integer_content(void) const;
@@ -130,6 +128,8 @@ public: // only const functions please (may break reference counting)
        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 ex derivative(const symbol & s) const;
@@ -142,28 +142,28 @@ protected: // non-const functions should be called from class ex only
        
        // non-virtual functions in this class
 public:
-       ex subs(const ex & e) const;
+       ex subs(const ex & e, bool no_pattern = false) const;
        ex diff(const symbol & s, unsigned nth=1) const;
        int compare(const basic & other) const;
        bool is_equal(const basic & other) const;
        const basic & hold(void) const;
        unsigned gethash(void) const { if (flags & status_flags::hash_calculated) return hashvalue; else return calchash(); }
        unsigned tinfo(void) const {return tinfo_key;}
+
        /** Set some status_flags. */
        const basic & setflag(unsigned f) const {flags |= f; return *this;}
+
        /** Clear some status_flags. */
        const basic & clearflag(unsigned f) const {flags &= ~f; return *this;}
+
 protected:
        void ensure_if_modifiable(void) const;
        
-// member variables
-       
+       // member variables
 protected:
        unsigned tinfo_key;                 ///< typeinfo
        mutable unsigned flags;             ///< of type status_flags
        mutable unsigned hashvalue;         ///< hash value
-       static unsigned precedence;         ///< precedence for printing parens
-       static unsigned delta_indent;       ///< precedence for printtree
 private:
        unsigned refcount;                  ///< Number of reference counts
 };