X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=749803f00123abcc73f36fe5c73bf7f79448bde2;hp=ba8b1514ad96fe495c6aa34bc5e13617fff3a30b;hb=fa13c6831b809abdae9eb2c17b33d2eff8e4878c;hpb=0cf43f3096cbcfc7472ff9c8927c6eb74f2eeb8c

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index ba8b1514..749803f0 100644
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's constant types and some special constants. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
@@ -17,96 +17,71 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <string>
 #include <stdexcept>
+#include <iostream>
 
 #include "constant.h"
 #include "numeric.h"
 #include "ex.h"
-#include "print.h"
 #include "archive.h"
-#include "debugmsg.h"
 #include "utils.h"
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic,
+  print_func<print_context>(&constant::do_print).
+  print_func<print_latex>(&constant::do_print_latex).
+  print_func<print_tree>(&constant::do_print_tree).
+  print_func<print_python_repr>(&constant::do_print_python_repr))
 
 //////////
-// default ctor, dtor, copy ctor assignment operator and helpers
+// default constructor
 //////////
 
 // public
 
-constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++)
+constant::constant() : basic(TINFO_constant), ef(0), serial(next_serial++)
 {
-	debugmsg("constant default ctor",LOGLEVEL_CONSTRUCT);
-}
-
-// protected
-
-/** For use by copy ctor and assignment operator. */
-void constant::copy(const constant & other)
-{
-	inherited::copy(other);
-	name = other.name;
-	TeX_name = other.TeX_name;
-	serial = other.serial;
-	ef = other.ef;
-	if (other.number != 0)
-		number = new numeric(*other.number);
-	else
-		number = 0;
-}
-
-void constant::destroy(bool call_parent)
-{
-	delete number;
-	if (call_parent)
-		inherited::destroy(call_parent);
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
-// other ctors
+// other constructors
 //////////
 
 // public
 
 constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname)
-  : basic(TINFO_constant), name(initname), ef(efun), number(0), serial(next_serial++)
+  : basic(TINFO_constant), name(initname), ef(efun), serial(next_serial++)
 {
-	debugmsg("constant ctor from string, function",LOGLEVEL_CONSTRUCT);
 	if (texname.empty())
 		TeX_name = "\\mbox{" + name + "}";
 	else
 		TeX_name = texname;
-	setflag(status_flags::evaluated);
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname)
-  : basic(TINFO_constant), name(initname), ef(0), number(new numeric(initnumber)), serial(next_serial++)
+  : basic(TINFO_constant), name(initname), ef(0), number(initnumber), serial(next_serial++)
 {
-	debugmsg("constant ctor from string, numeric",LOGLEVEL_CONSTRUCT);
 	if (texname.empty())
 		TeX_name = "\\mbox{" + name + "}";
 	else
 		TeX_name = texname;
-	setflag(status_flags::evaluated);
+	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
 // archiving
 //////////
 
-constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
-{
-	debugmsg("constant ctor from archive_node", LOGLEVEL_CONSTRUCT);
-}
+constant::constant(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {}
 
-ex constant::unarchive(const archive_node &n, const lst &sym_lst)
+ex constant::unarchive(const archive_node &n, lst &sym_lst)
 {
 	// Find constant by name (!! this is bad: 'twould be better if there
 	// was a list of all global constants that we could search)
@@ -131,88 +106,81 @@ void constant::archive(archive_node &n) const
 }
 
 //////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
 //////////
 
 // public
 
-void constant::print(const print_context & c, unsigned level) const
+void constant::do_print(const print_context & c, unsigned level) const
 {
-	debugmsg("constant print", LOGLEVEL_PRINT);
-
-	if (is_a<print_tree>(c)) {
-		c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
-		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
-		    << std::endl;
-	} else if (is_a<print_latex>(c))
-		c.s << TeX_name;
-	else
-		c.s << name;
+	c.s << name;
 }
 
-int constant::degree(const ex & s) const
+void constant::do_print_tree(const print_tree & c, unsigned level) const
 {
-	return is_equal(*s.bp) ? 1 : 0;
+	c.s << std::string(level, ' ') << name << " (" << class_name() << ")" << " @" << this
+	    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+	    << std::endl;
 }
 
-int constant::ldegree(const ex & s) const
+void constant::do_print_latex(const print_latex & c, unsigned level) const
 {
-	return is_equal(*s.bp) ? 1 : 0;
+	c.s << TeX_name;
 }
 
-ex constant::coeff(const ex & s, int n) const
+void constant::do_print_python_repr(const print_python_repr & c, unsigned level) const
 {
-	if (is_equal(*s.bp))
-		return n==1 ? _ex1() : _ex0();
-	else
-		return n==0 ? *this : _ex0();
+	c.s << class_name() << "('" << name << "'";
+	if (TeX_name != "\\mbox{" + name + "}")
+		c.s << ",TeX_name='" << TeX_name << "'";
+	c.s << ')';
 }
 
 ex constant::evalf(int level) const
 {
 	if (ef!=0) {
 		return ef();
-	} else if (number != 0) {
-		return number->evalf();
+	} else {
+		return number.evalf();
 	}
 	return *this;
 }
 
 // protected
 
-/** Implementation of ex::diff() for a constant. It always returns 0.
+/** Implementation of ex::diff() for a constant always returns 0.
  *
  *  @see ex::diff */
 ex constant::derivative(const symbol & s) const
 {
-	return _ex0();
+	return _ex0;
 }
 
 int constant::compare_same_type(const basic & other) const
 {
-	GINAC_ASSERT(is_exactly_of_type(other, constant));
-	// const constant & o=static_cast<constant &>(const_cast<basic &>(other));
-	// return name.compare(o.name);
-	const constant *o = static_cast<const constant *>(&other);
-	if (serial==o->serial) return 0;
-	return serial < o->serial ? -1 : 1;
+	GINAC_ASSERT(is_exactly_a<constant>(other));
+	const constant &o = static_cast<const constant &>(other);
+
+	if (serial == o.serial)
+		return 0;
+	else
+		return serial < o.serial ? -1 : 1;
 }
 
 bool constant::is_equal_same_type(const basic & other) const
 {
-	GINAC_ASSERT(is_exactly_of_type(other, constant));
-	const constant *o = static_cast<const constant *>(&other);
-	return serial==o->serial;
+	GINAC_ASSERT(is_exactly_a<constant>(other));
+	const constant &o = static_cast<const constant &>(other);
+
+	return serial == o.serial;
 }
 
-unsigned constant::calchash(void) const
+unsigned constant::calchash() const
 {
 	hashvalue = golden_ratio_hash(tinfo() ^ serial);
-	// mask out numeric hashes:
-	hashvalue &= 0x7FFFFFFFU;
-	
+
 	setflag(status_flags::hash_calculated);
-	
+
 	return hashvalue;
 }