X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fsymbol.cpp;h=480c25c453fc8f648548cbded62cabeece80703a;hp=48579ccf65ae658fc571413cf9a22f6f711069c8;hb=e8c9b4a51a1c8f1230b023b0af6a708881ef23d3;hpb=dbd9c306a74f1cb258c0d15a346b973b39deaad2

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 48579ccf..480c25c4 100644
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -25,66 +25,55 @@
 
 #include "symbol.h"
 #include "lst.h"
-#include "print.h"
 #include "archive.h"
 #include "tostring.h"
 #include "utils.h"
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(symbol, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(symbol, basic,
+  print_func<print_context>(&symbol::do_print).
+  print_func<print_latex>(&symbol::do_print_latex).
+  print_func<print_tree>(&symbol::do_print_tree).
+  print_func<print_python_repr>(&symbol::do_print_python_repr))
 
 //////////
-// default ctor, dtor, copy ctor, assignment operator and helpers
+// default constructor
 //////////
 
-symbol::symbol() : inherited(TINFO_symbol), serial(next_serial++)
+symbol::symbol()
+ : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(autoname_prefix() + ToString(serial)), TeX_name(name), ret_type(return_types::commutative), ret_type_tinfo(TINFO_symbol)
 {
-	name = TeX_name = autoname_prefix()+ToString(serial);
-	asexinfop = new assigned_ex_info;
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-/** For use by copy ctor and assignment operator. */
-void symbol::copy(const symbol & other)
+//////////
+// other constructors
+//////////
+
+// public
+
+symbol::symbol(const std::string & initname)
+ : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), ret_type(return_types::commutative), ret_type_tinfo(TINFO_symbol)
 {
-	inherited::copy(other);
-	name = other.name;
-	TeX_name = other.TeX_name;
-	serial = other.serial;
-	asexinfop = other.asexinfop;
-	++(asexinfop->refcount);
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-void symbol::destroy(bool call_parent)
+symbol::symbol(const std::string & initname, const std::string & texname)
+ : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(texname), ret_type(return_types::commutative), ret_type_tinfo(TINFO_symbol)
 {
-	if (--asexinfop->refcount == 0)
-		delete asexinfop;
-	if (call_parent)
-		inherited::destroy(call_parent);
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-//////////
-// other ctors
-//////////
-
-// public
-
-symbol::symbol(const std::string & initname) : inherited(TINFO_symbol)
+symbol::symbol(const std::string & initname, unsigned rt, unsigned rtt)
+ : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(default_TeX_name()), ret_type(rt), ret_type_tinfo(rtt)
 {
-	name = initname;
-	TeX_name = default_TeX_name();
-	serial = next_serial++;
-	asexinfop = new assigned_ex_info;
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
-symbol::symbol(const std::string & initname, const std::string & texname) : inherited(TINFO_symbol)
+symbol::symbol(const std::string & initname, const std::string & texname, unsigned rt, unsigned rtt)
+ : inherited(TINFO_symbol), asexinfop(new assigned_ex_info), serial(next_serial++), name(initname), TeX_name(texname), ret_type(rt), ret_type_tinfo(rtt)
 {
-	name = initname;
-	TeX_name = texname;
-	serial = next_serial++;
-	asexinfop = new assigned_ex_info;
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
@@ -93,27 +82,33 @@ symbol::symbol(const std::string & initname, const std::string & texname) : inhe
 //////////
 
 /** Construct object from archive_node. */
-symbol::symbol(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+symbol::symbol(const archive_node &n, lst &sym_lst)
+ : inherited(n, sym_lst), asexinfop(new assigned_ex_info), serial(next_serial++), ret_type(return_types::commutative), ret_type_tinfo(TINFO_symbol)
 {
-	serial = next_serial++;
 	if (!(n.find_string("name", name)))
 		name = autoname_prefix() + ToString(serial);
 	if (!(n.find_string("TeXname", TeX_name)))
 		TeX_name = default_TeX_name();
-	asexinfop = new assigned_ex_info;
-	setflag(status_flags::evaluated);
+	if (!n.find_unsigned("return_type", ret_type))
+		ret_type = return_types::commutative;
+	if (!n.find_unsigned("return_type_tinfo", ret_type_tinfo))
+		ret_type_tinfo = TINFO_symbol;
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 /** Unarchive the object. */
-ex symbol::unarchive(const archive_node &n, const lst &sym_lst)
+ex symbol::unarchive(const archive_node &n, lst &sym_lst)
 {
 	ex s = (new symbol(n, sym_lst))->setflag(status_flags::dynallocated);
-	
+
 	// If symbol is in sym_lst, return the existing symbol
-	for (unsigned i=0; i<sym_lst.nops(); i++) {
-		if (is_ex_of_type(sym_lst.op(i), symbol) && (ex_to<symbol>(sym_lst.op(i)).name == ex_to<symbol>(s).name))
-			return sym_lst.op(i);
+	for (lst::const_iterator it = sym_lst.begin(); it != sym_lst.end(); ++it) {
+		if (is_a<symbol>(*it) && (ex_to<symbol>(*it).name == ex_to<symbol>(s).name))
+			return *it;
 	}
+
+	// Otherwise add new symbol to list and return it
+	sym_lst.append(s);
 	return s;
 }
 
@@ -124,6 +119,10 @@ void symbol::archive(archive_node &n) const
 	n.add_string("name", name);
 	if (TeX_name != default_TeX_name())
 		n.add_string("TeX_name", TeX_name);
+	if (ret_type != return_types::commutative)
+		n.add_unsigned("return_type", ret_type);
+	if (ret_type_tinfo != TINFO_symbol)
+		n.add_unsigned("return_type_tinfo", ret_type_tinfo);
 }
 
 //////////
@@ -132,24 +131,30 @@ void symbol::archive(archive_node &n) const
 
 // public
 
-void symbol::print(const print_context & c, unsigned level) const
+void symbol::do_print(const print_context & c, unsigned level) const
 {
-	if (is_a<print_tree>(c)) {
-
-		c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
-		    << ", serial=" << serial
-		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
-		    << std::endl;
-
-	} else if (is_a<print_latex>(c)) {
-		c.s << TeX_name;
-	} else if (is_a<print_python_repr>(c)) {
-		c.s << class_name() << "('" << name;
-		if (TeX_name != default_TeX_name())
-			c.s << "','" << TeX_name;
-		c.s << "')";
-	} else
-		c.s << name;
+	c.s << name;
+}
+
+void symbol::do_print_latex(const print_latex & c, unsigned level) const
+{
+	c.s << TeX_name;
+}
+
+void symbol::do_print_tree(const print_tree & c, unsigned level) const
+{
+	c.s << std::string(level, ' ') << name << " (" << class_name() << ")" << " @" << this
+	    << ", serial=" << serial
+	    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+	    << std::endl;
+}
+
+void symbol::do_print_python_repr(const print_python_repr & c, unsigned level) const
+{
+	c.s << class_name() << "('" << name;
+	if (TeX_name != default_TeX_name())
+		c.s << "','" << TeX_name;
+	c.s << "')";
 }
 
 bool symbol::info(unsigned inf) const
@@ -211,12 +216,9 @@ bool symbol::is_equal_same_type(const basic & other) const
 	return serial==o->serial;
 }
 
-unsigned symbol::calchash(void) const
+unsigned symbol::calchash() const
 {
-	// this is where the schoolbook method
-	// (golden_ratio_hash(tinfo()) ^ serial)
-	// is not good enough yet...
-	hashvalue = golden_ratio_hash(golden_ratio_hash(tinfo()) ^ serial);
+	hashvalue = golden_ratio_hash(tinfo() ^ serial);
 	setflag(status_flags::hash_calculated);
 	return hashvalue;
 }
@@ -235,15 +237,15 @@ unsigned symbol::calchash(void) const
 
 void symbol::assign(const ex & value)
 {
-	asexinfop->is_assigned = 1;
+	asexinfop->is_assigned = true;
 	asexinfop->assigned_expression = value;
 	clearflag(status_flags::evaluated | status_flags::expanded);
 }
 
-void symbol::unassign(void)
+void symbol::unassign()
 {
 	if (asexinfop->is_assigned) {
-		asexinfop->is_assigned = 0;
+		asexinfop->is_assigned = false;
 		asexinfop->assigned_expression = _ex0;
 	}
 	setflag(status_flags::evaluated | status_flags::expanded);
@@ -253,14 +255,14 @@ void symbol::unassign(void)
 
 /** Symbols not constructed with a string get one assigned using this
  *  prefix and a number. */
-std::string & symbol::autoname_prefix(void)
+std::string & symbol::autoname_prefix()
 {
 	static std::string *s = new std::string("symbol");
 	return *s;
 }
 
 /** Return default TeX name for symbol. This recognizes some greek letters. */
-std::string symbol::default_TeX_name(void) const
+std::string symbol::default_TeX_name() const
 {
 	if (name=="alpha"        || name=="beta"         || name=="gamma"
 	 || name=="delta"        || name=="epsilon"      || name=="varepsilon"
@@ -294,7 +296,7 @@ unsigned symbol::next_serial = 0;
 //////////
 
 /** Default ctor.  Defaults to unassigned. */
-symbol::assigned_ex_info::assigned_ex_info(void) : is_assigned(0), refcount(1)
+symbol::assigned_ex_info::assigned_ex_info() throw() : is_assigned(false)
 {
 }