symbol: make get_domain() a virtual method, remove symbol::domain.

[ginac.git] / ginac / basic.h

diff --git a/ginac/basic.h b/ginac/basic.h
index 6b117cc9dc1b289b1cdc9cef023f696c449f2fcd..534a5915de2d6a8f7ead70952da60c9515ee3508 100644 (file)
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's ABC. */
 
 /*
- *  GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -25,7 +25,9 @@
 
 #include <cstddef> // for size_t
 #include <vector>
+#include <set>
 #include <map>
+#include <typeinfo> // for typeid
 // CINT needs <algorithm> to work properly with <vector>
 #include <algorithm>
 
@@ -45,6 +47,7 @@ class archive_node;
 class print_context;
 
 typedef std::vector<ex> exvector;
+typedef std::set<ex, ex_is_less> exset;
 typedef std::map<ex, ex, ex_is_less> exmap;
 
 // Define this to enable some statistical output for comparisons and hashing
@@ -106,7 +109,7 @@ class basic : public refcounted
        
        // default constructor, destructor, copy constructor and assignment operator
 protected:
-       basic() : tinfo_key(&tinfo_static), flags(0) {}
+       basic() : flags(0) {}
 
 public:
        /** basic destructor, virtual because class ex will delete objects of
@@ -119,10 +122,6 @@ public:
        const basic & operator=(const basic & other);
 
 protected:
-       /** Constructor with specified tinfo_key (used by derived classes instead
-        *  of the default constructor to avoid assigning tinfo_key twice). */
-       basic(tinfo_t ti) : tinfo_key(ti), flags(0) {}
-       
        // new virtual functions which can be overridden by derived classes
 public: // only const functions please (may break reference counting)
 
@@ -161,7 +160,7 @@ public:
 
        // pattern matching
        virtual bool has(const ex & other, unsigned options = 0) const;
-       virtual bool match(const ex & pattern, lst & repl_lst) const;
+       virtual bool match(const ex & pattern, exmap & repls) const;
 protected:
        virtual bool match_same_type(const basic & other) const;
 public:
@@ -213,10 +212,12 @@ public:
 
        // noncommutativity
        virtual unsigned return_type() const;
-       virtual tinfo_t return_type_tinfo() const;
+       virtual return_type_t return_type_tinfo() const;
 
-       // complex conjugation
+       // functions for complex expressions
        virtual ex conjugate() const;
+       virtual ex real_part() const;
+       virtual ex imag_part() const;
 
        // functions that should be called from class ex only
 protected:
@@ -261,8 +262,6 @@ public:
                }
        }
 
-       tinfo_t tinfo() const {return tinfo_key;}
-
        /** Set some status_flags. */
        const basic & setflag(unsigned f) const {flags |= f; return *this;}
 
@@ -278,7 +277,6 @@ protected:
        
        // member variables
 protected:
-       tinfo_t tinfo_key;                  ///< type info
        mutable unsigned flags;             ///< of type status_flags
        mutable unsigned hashvalue;         ///< hash value
 };
@@ -302,7 +300,7 @@ inline bool is_a(const basic &obj)
 template <class T>
 inline bool is_exactly_a(const basic & obj)
 {
-       return obj.tinfo() == &T::tinfo_static;
+       return typeid(T) == typeid(obj);
 }
 
 } // namespace GiNaC