- Fixed an assertion-thinko in matrix::fraction_free_elimination().

[ginac.git] / ginac / symbol.h

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 7ed972ac17de39776df3122d4002d83c74c31ce0..bd37892f596bfc7d1808bffaaf6381b69b90642c 100644 (file)
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -24,12 +24,12 @@
 #define __GINAC_SYMBOL_H__
 
 #include <string>
-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** Basic CAS symbol.  It has a name because it must know how to output itself.
  *  It may be assigned an expression, but this feature is only intended for
@@ -39,7 +39,10 @@ namespace GiNaC {
  *  first place. */
 class symbol : public basic
 {
+    GINAC_DECLARE_REGISTERED_CLASS(symbol, basic)
+
 // types
+
     /** Symbols as keys to expressions. */
     class assigned_ex_info {
     public:
@@ -55,55 +58,56 @@ class symbol : public basic
 public:
     symbol();
     ~symbol();
-    symbol(symbol const & other);
+    symbol(const symbol & other);
 protected:
-    void copy(symbol const & other); 
+    void copy(const symbol & other); 
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    explicit symbol(string const & initname);
+    explicit symbol(const std::string & initname);
 
     // functions overriding virtual functions from base classes
 public:
     basic * duplicate() const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printraw(ostream & os) const;
-    void printtree(ostream & os, unsigned indent) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
+    void print(std::ostream & os, unsigned upper_precedence = 0) const;
+    void printraw(std::ostream & os) const;
+    void printtree(std::ostream & os, unsigned indent) const;
+    void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
     bool info(unsigned inf) const;
-    ex expand(unsigned options=0) const;
-    bool has(ex const & other) const;
-    int degree(symbol const & s) const;
-    int ldegree(symbol const & s) const;
-    ex coeff(symbol const & s, int const n = 1) const;
+    ex expand(unsigned options = 0) const;
+    bool has(const ex & other) const;
+    int degree(const symbol & s) const;
+    int ldegree(const symbol & s) const;
+    ex coeff(const symbol & s, int n = 1) const;
     ex eval(int level = 0) const;
-    ex diff(symbol const & s) const;
-    ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
-    ex subs(lst const & ls, lst const & lr) const;
+    ex series(const relational & s, int order, unsigned options = 0) const;
+    ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
+    ex to_rational(lst &repl_lst) const;
+    ex subs(const lst & ls, const lst & lr) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
+    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;
     unsigned return_type_tinfo(void) const;
     unsigned calchash(void) const;
     
     // non-virtual functions in this class
 public:
-    void assign(ex const & value);
+    void assign(const ex & value);
     void unassign(void);
-    ex diff(symbol const & s, unsigned nth) const;
-    void setname(string const & n) {name=n;}
-    string getname(void) const {return name;}
+    void setname(const std::string & n) { name = n; }
+    std::string getname(void) const { return name; }
 private:
-    string & autoname_prefix(void);
+    std::string & autoname_prefix(void);
 
 // member variables
 
 protected:
     assigned_ex_info * asexinfop;
     unsigned serial;  //!< unique serial number for comparision
-    string name;
+    std::string name;
 private:
     static unsigned next_serial;
 };
@@ -111,7 +115,7 @@ private:
 // global constants
 
 extern const symbol some_symbol;
-extern type_info const & typeid_symbol;
+extern const type_info & typeid_symbol;
 
 // utility functions
 inline const symbol &ex_to_symbol(const ex &e)
@@ -123,14 +127,14 @@ inline const symbol &ex_to_symbol(const ex &e)
 inline void unassign(symbol & symarg)
 { return symarg.unassign(); }
 
-inline int degree(symbol const & a, symbol const & s)
+inline int degree(const symbol & a, const symbol & s)
 { return a.degree(s); }
 
-inline int ldegree(symbol const & a, symbol const & s)
+inline int ldegree(const symbol & a, const symbol & s)
 { return a.ldegree(s); }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_SYMBOL_H__