X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.h;h=c174ad5f5136b10e83d8dc0dc1cf526b07b142d6;hp=c9c7f91a8a0299bfee3395903a4dcd45f42a51a3;hb=db751462877f91d8b76a0fd80d48330eddcb7095;hpb=619d77d2676f7f1a562fb9fefc0ba6754fe2d750

diff --git a/ginac/symbol.h b/ginac/symbol.h
index c9c7f91a..c174ad5f 100644
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2007 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -31,11 +31,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,16 +39,6 @@ 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
@@ -66,7 +52,7 @@ public:
 	// 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
@@ -86,8 +72,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; }
@@ -103,7 +87,6 @@ private:
 // member variables
 
 protected:
-	ptr<assigned_ex_info> 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
@@ -161,10 +144,6 @@ template<> inline bool is_exactly_a<possymbol>(const basic & obj)
 	return domain == domain::positive;
 }
 
-// wrapper functions around member functions
-inline void unassign(symbol & symarg)
-{ symarg.unassign(); }
-
 } // namespace GiNaC
 
 #endif // ndef __GINAC_SYMBOL_H__