- renamed

[ginac.git] / ginac / symbol.h

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 20c5468b0b19c6becb5b568d29075590bb743aa2..1f494cf2c5ceb4f8ea2fe1d3630df82564c75ec0 100644 (file)
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -27,9 +27,7 @@
 #include "basic.h"
 #include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#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,52 +37,52 @@ namespace GiNaC {
  *  first place. */
 class symbol : public basic
 {
-       GINAC_DECLARE_REGISTERED_CLASS(symbol, basic)
-
+       GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(symbol, basic)
+       
 // types
-
-       /** Symbols as keys to expressions. */
+       
+       /** Symbols as keys to expressions - this is deprecated. */
        class assigned_ex_info {
        public:
-               assigned_ex_info();     //!< Default ctor
-               bool is_assigned;       //!< True if there is an expression assigned
-               ex assigned_expression; //!< The actual expression
-               unsigned refcount;      //!< Yet another refcounter. PLEASE EXPLAIN!
+               assigned_ex_info();     ///< Default ctor
+               bool is_assigned;       ///< True if there is an expression assigned
+               ex assigned_expression; ///< The actual expression
+               unsigned refcount;      ///< Reference counter
        };
        
 // member functions
-
-       // default constructor, destructor, copy constructor assignment operator and helpers
+       
+       // default ctor, dtor, copy ctor assignment operator and helpers
 public:
        symbol();
-       ~symbol();
+       ~symbol()
+       {
+               /*debugmsg("symbol dtor", LOGLEVEL_DESTRUCT);*/
+               destroy(false);
+       }
        symbol(const symbol & other);
 protected:
        void copy(const symbol & other); 
        void destroy(bool call_parent);
-
-       // other constructors
+       
+       // other ctors
 public:
        explicit symbol(const std::string & initname);
-
+       
        // functions overriding virtual functions from base classes
 public:
        basic * duplicate() 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;
+       void print(const print_context & c, unsigned level = 0) const;
        bool info(unsigned inf) 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;
+       int degree(const ex & s) const;
+       int ldegree(const ex & s) const;
+       ex coeff(const ex & s, int n = 1) const;
        ex eval(int level = 0) 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:
        ex derivative(const symbol & s) const;
        int compare_same_type(const basic & other) const;
@@ -97,39 +95,39 @@ protected:
 public:
        void assign(const ex & value);
        void unassign(void);
-       void setname(const std::string & n) { name = n; }
-       std::string getname(void) const { return name; }
+       void set_name(const std::string & n) { name = n; }
+       std::string get_name(void) const { return name; }
 private:
        std::string & autoname_prefix(void);
 
 // member variables
 
 protected:
-       assigned_ex_info * asexinfop;
-       unsigned serial;  //!< unique serial number for comparision
-       std::string name;
+       assigned_ex_info * asexinfop;   ///< ptr to assigned expression, deprecated
+       unsigned serial;    ///< unique serial number for comparison
+       std::string name;   ///< printname of this symbol
 private:
        static unsigned next_serial;
 };
 
+
 // utility functions
 inline const symbol &ex_to_symbol(const ex &e)
 {
        return static_cast<const symbol &>(*e.bp);
 }
 
+
 // wrapper functions around member functions
 inline void unassign(symbol & symarg)
 { symarg.unassign(); }
 
-inline int degree(const symbol & a, const symbol & s)
+inline int degree(const symbol & a, const ex & s)
 { return a.degree(s); }
 
-inline int ldegree(const symbol & a, const symbol & s)
+inline int ldegree(const symbol & a, const ex & s)
 { return a.ldegree(s); }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_SYMBOL_H__