X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fsymbol.h;h=0b6844a65d700a98706b104b5ce519a18a456797;hb=be295fb5e60d42767db0dde2a3c693ce86f95e42;hp=55f2826ccc8073c2749b9cee6db1e6a18770c20a;hpb=0f7b8280ad89fa88a0cbaab7785a4b7cb06e6a63;p=ginac.git

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 55f2826c..0b6844a6 100644
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -43,14 +43,11 @@ class symbol : public basic
 // types
 	
 	/** Symbols as keys to expressions - only for ginsh. */
-	class assigned_ex_info {
-		friend class ptr<assigned_ex_info>;
+	class assigned_ex_info : public refcounted {
 	public:
-		assigned_ex_info();     ///< Default ctor
-		bool is_assigned;       ///< True if there is an expression assigned
-		ex assigned_expression; ///< The actual expression
-	private:
-		size_t refcount;        ///< Reference counter, managed by ptr<assigned_ex_info>
+		assigned_ex_info() throw();  ///< Default ctor
+		bool is_assigned;            ///< True if there is an expression assigned
+		ex assigned_expression;      ///< The actual expression
 	};
 
 // member functions
@@ -58,19 +55,22 @@ class symbol : public basic
 	// other constructors
 public:
 	explicit symbol(const std::string & initname);
-	explicit symbol(const std::string & initname, const std::string & texname);
+	symbol(const std::string & initname, const std::string & texname);
+	symbol(const std::string & initname, unsigned rt, unsigned rtt);
+	symbol(const std::string & initname, const std::string & texname, unsigned rt, unsigned rtt);
 	
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	bool info(unsigned inf) const;
 	ex eval(int level = 0) const;
 	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(lst &repl_lst) const;
-	ex to_polynomial(lst &repl_lst) const;
+	ex to_rational(exmap & repl) const;
+	ex to_polynomial(exmap & repl) const;
+	unsigned return_type() const { return ret_type; }
+	unsigned return_type_tinfo() const { return ret_type_tinfo; }
 protected:
 	ex derivative(const symbol & s) const;
 	bool is_equal_same_type(const basic & other) const;
@@ -82,6 +82,11 @@ public:
 	void unassign();
 	void set_name(const std::string & n) { name = n; }
 	std::string get_name() const { return name; }
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	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;
@@ -93,6 +98,8 @@ protected:
 	unsigned serial;                 ///< unique serial number for comparison
 	std::string name;                ///< printname of this symbol
 	std::string TeX_name;            ///< LaTeX name of this symbol
+	unsigned ret_type;               ///< value returned by return_type()
+	unsigned ret_type_tinfo;         ///< value returned by return_type_tinfo()
 private:
 	static unsigned next_serial;
 };
@@ -110,12 +117,6 @@ template<> inline bool is_exactly_a<symbol>(const basic & obj)
 inline void unassign(symbol & symarg)
 { symarg.unassign(); }
 
-inline int degree(const symbol & a, const ex & s)
-{ return a.degree(s); }
-
-inline int ldegree(const symbol & a, const ex & s)
-{ return a.ldegree(s); }
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_SYMBOL_H__