X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.h;h=51164a972de73971d7f51b99d08f5a6800bbb626;hp=8ff63130d0f6532472b4af75760d9db2a934d051;hb=eddd1f843746065177daf1965a1ccd1a3d82a3fe;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926;ds=sidebyside

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 8ff63130..51164a97 100644
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -40,37 +40,40 @@ class symbol : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(symbol, basic)
 
+	friend class realsymbol;
+
 // 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
 	
 	// other constructors
 public:
-	explicit symbol(const std::string & initname);
-	explicit symbol(const std::string & initname, const std::string & texname);
+	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, unsigned rt, unsigned rtt, unsigned domain = domain::complex);
+	symbol(const std::string & initname, const std::string & texname, unsigned rt, unsigned rtt, unsigned domain = domain::complex);
 	
 	// 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 lst & ls, const lst & lr, unsigned options = 0) const { return subs_one_level(ls, lr, options); } // overwrites basic::subs() for performance reasons
-	ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
-	ex to_rational(lst &repl_lst) const;
-	ex to_polynomial(lst &repl_lst) 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; }
+	unsigned return_type_tinfo() const { return ret_type_tinfo; }
+	ex conjugate() const;
 protected:
 	ex derivative(const symbol & s) const;
 	bool is_equal_same_type(const basic & other) const;
@@ -82,6 +85,12 @@ public:
 	void unassign();
 	void set_name(const std::string & n) { name = n; }
 	std::string get_name() const { return name; }
+	unsigned get_domain() const { return domain; }
+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,29 +102,45 @@ 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 domain;                 ///< domain of symbol, complex (default) or real
+	unsigned ret_type;               ///< value returned by return_type()
+	unsigned ret_type_tinfo;         ///< value returned by return_type_tinfo()
 private:
 	static unsigned next_serial;
 };
 
 
+/** Specialization of symbol to real domain */
+class realsymbol : public symbol
+{
+	// constructors
+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, unsigned rtt, unsigned domain = domain::real);
+	realsymbol(const std::string & initname, const std::string & texname, unsigned rt, unsigned rtt, unsigned domain = domain::real);
+};
+
+
 // utility functions
 
 /** Specialization of is_exactly_a<symbol>(obj) for symbol objects. */
 template<> inline bool is_exactly_a<symbol>(const basic & obj)
 {
-	return obj.tinfo()==TINFO_symbol;
+	return obj.tinfo() == TINFO_symbol;
+}
+
+/** Specialization of is_exactly_a<realsymbol>(obj) for realsymbol objects. */
+template<> inline bool is_exactly_a<realsymbol>(const basic & obj)
+{
+	return (obj.tinfo() == TINFO_symbol) && (static_cast<const symbol &>(obj).get_domain() == domain::real);
 }
 
 // wrapper functions around member functions
 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__