X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.h;h=42c6ae3203a421dad3d78dc6d34c8cb07b491626;hp=e38ed6763bbde01c7750099eaaf31ba9b8c09b2b;hb=94e5076a9ad0d142ee4604e9b078a10083efd24c;hpb=83a7ee99a947cbbf331018b803ad6be43a9ccd45 diff --git a/ginac/symbol.h b/ginac/symbol.h index e38ed676..42c6ae32 100644 --- a/ginac/symbol.h +++ b/ginac/symbol.h @@ -24,6 +24,7 @@ #define __GINAC_SYMBOL_H__ #include +#include #include "basic.h" #include "ex.h" #include "ptr.h" @@ -31,11 +32,7 @@ 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 - * programs like 'ginsh' that want to associate symbols with expressions. - * If you want to replace symbols by expressions in your code, you should - * use ex::subs() or use objects of class ex instead of class symbol in the - * first place. */ + */ class symbol : public basic { GINAC_DECLARE_REGISTERED_CLASS(symbol, basic) @@ -43,38 +40,23 @@ class symbol : public basic friend class realsymbol; friend class possymbol; -// types - - /** Symbols as keys to expressions - only for ginsh. */ - class assigned_ex_info : public refcounted { - public: - assigned_ex_info() throw(); ///< Default ctor - bool is_assigned; ///< True if there is an expression assigned - ex assigned_expression; ///< The actual expression - }; - // member functions // other constructors public: explicit symbol(const std::string & initname, unsigned domain = domain::complex); symbol(const std::string & initname, const std::string & texname, unsigned domain = domain::complex); - symbol(const std::string & initname, const std::string & texname, unsigned rt, unsigned domain); - symbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain = domain::complex); - symbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain = domain::complex); // functions overriding virtual functions from base classes public: bool info(unsigned inf) const; - ex eval(int level = 0) const; + ex eval(int level = 0) const { return *this; } // for performance reasons ex evalf(int level = 0) const { return *this; } // overwrites basic::evalf() for performance reasons ex series(const relational & s, int order, unsigned options = 0) const; ex subs(const exmap & m, unsigned options = 0) const { return subs_one_level(m, options); } // overwrites basic::subs() for performance reasons ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const; ex to_rational(exmap & repl) const; ex to_polynomial(exmap & repl) const; - unsigned return_type() const { return ret_type; } - tinfo_t return_type_tinfo() const { return ret_type_tinfo; } ex conjugate() const; ex real_part() const; ex imag_part() const; @@ -86,8 +68,6 @@ protected: // non-virtual functions in this class public: - void assign(const ex & value); - void unassign(); void set_name(const std::string & n) { name = n; } std::string get_name() const { return name; } unsigned get_domain() const { return domain; } @@ -96,20 +76,14 @@ protected: void do_print_latex(const print_latex & c, unsigned level) const; void do_print_tree(const print_tree & c, unsigned level) const; void do_print_python_repr(const print_python_repr & c, unsigned level) const; -private: - std::string & autoname_prefix(); - std::string default_TeX_name() const; // member variables protected: - ptr asexinfop; ///< assigned expression, only for private use by ginsh unsigned serial; ///< unique serial number for comparison std::string name; ///< printname of this symbol std::string TeX_name; ///< LaTeX name of this symbol unsigned domain; ///< domain of symbol, complex (default) or real - unsigned ret_type; ///< value returned by return_type() - tinfo_t ret_type_tinfo; ///< value returned by return_type_tinfo() private: static unsigned next_serial; }; @@ -123,8 +97,6 @@ public: realsymbol(); explicit realsymbol(const std::string & initname, unsigned domain = domain::real); realsymbol(const std::string & initname, const std::string & texname, unsigned domain = domain::real); - realsymbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain = domain::real); - realsymbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain = domain::real); }; @@ -136,8 +108,6 @@ public: possymbol(); explicit possymbol(const std::string & initname, unsigned domain = domain::positive); possymbol(const std::string & initname, const std::string & texname, unsigned domain = domain::positive); - possymbol(const std::string & initname, unsigned rt, tinfo_t rtt, unsigned domain = domain::positive); - possymbol(const std::string & initname, const std::string & texname, unsigned rt, tinfo_t rtt, unsigned domain = domain::positive); }; @@ -146,7 +116,7 @@ public: /** Specialization of is_exactly_a(obj) for realsymbol objects. */ template<> inline bool is_exactly_a(const basic & obj) { - if (obj.tinfo() != &symbol::tinfo_static) + if (!is_a(obj)) return false; unsigned domain = static_cast(obj).get_domain(); return domain==domain::real || domain==domain::positive; @@ -155,16 +125,12 @@ template<> inline bool is_exactly_a(const basic & obj) /** Specialization of is_exactly_a(obj) for possymbol objects. */ template<> inline bool is_exactly_a(const basic & obj) { - if (obj.tinfo() != &symbol::tinfo_static) + if (!is_a(obj)) return false; unsigned domain = static_cast(obj).get_domain(); return domain == domain::positive; } -// wrapper functions around member functions -inline void unassign(symbol & symarg) -{ symarg.unassign(); } - } // namespace GiNaC #endif // ndef __GINAC_SYMBOL_H__