X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.cpp;h=902caa2f9e1f182f39f651cd3080b3b6b1d57255;hp=9247ac20ac8a6575d314eda01d64ec572f423bf2;hb=38129d5d3880156f6f217f94855553bf4549a960;hpb=def26469ff96228c66e877bb5594e7d9a24b638f

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 9247ac20..902caa2f 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-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2021 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
@@ -20,10 +20,6 @@
  *  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"
@@ -31,6 +27,10 @@
 #include "utils.h"
 #include "inifcns.h"
 
+#include <iostream>
+#include <stdexcept>
+#include <string>
+
 namespace GiNaC {
 
 GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic,
@@ -45,7 +45,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic,
 
 // public
 
-constant::constant() : ef(0), serial(next_serial++), domain(domain::complex)
+constant::constant() : ef(nullptr), serial(next_serial++), domain(domain::complex)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -60,17 +60,17 @@ constant::constant(const std::string & initname, evalffunctype efun, const std::
   : name(initname), ef(efun), serial(next_serial++), domain(dm)
 {
 	if (texname.empty())
-		TeX_name = "\\mbox{" + name + "}";
+		TeX_name = "\\mathrm{" + name + "}";
 	else
 		TeX_name = texname;
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname, unsigned dm)
-  : name(initname), ef(0), number(initnumber), serial(next_serial++), domain(dm)
+  : name(initname), ef(nullptr), number(initnumber), serial(next_serial++), domain(dm)
 {
 	if (texname.empty())
-		TeX_name = "\\mbox{" + name + "}";
+		TeX_name = "\\mathrm{" + name + "}";
 	else
 		TeX_name = texname;
 	setflag(status_flags::evaluated | status_flags::expanded);
@@ -80,25 +80,24 @@ constant::constant(const std::string & initname, const numeric & initnumber, con
 // archiving
 //////////
 
-constant::constant(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {}
-
-ex constant::unarchive(const archive_node &n, lst &sym_lst)
+void constant::read_archive(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)
 	std::string s;
 	if (n.find_string("name", s)) {
 		if (s == Pi.name)
-			return Pi;
+			*this = Pi;
 		else if (s == Catalan.name)
-			return Catalan;
+			*this = Catalan;
 		else if (s == Euler.name)
-			return Euler;
+			*this = Euler;
 		else
 			throw (std::runtime_error("unknown constant '" + s + "' in archive"));
 	} else
 		throw (std::runtime_error("unnamed constant in archive"));
 }
+GINAC_BIND_UNARCHIVER(constant);
 
 void constant::archive(archive_node &n) const
 {
@@ -132,7 +131,7 @@ void constant::do_print_latex(const print_latex & c, unsigned level) const
 void constant::do_print_python_repr(const print_python_repr & c, unsigned level) const
 {
 	c.s << class_name() << "('" << name << "'";
-	if (TeX_name != "\\mbox{" + name + "}")
+	if (TeX_name != "\\mathrm{" + name + "}")
 		c.s << ",TeX_name='" << TeX_name << "'";
 	c.s << ')';
 }
@@ -149,9 +148,9 @@ bool constant::info(unsigned inf) const
 		return inherited::info(inf);
 }
 
-ex constant::evalf(int level) const
+ex constant::evalf() const
 {
-	if (ef!=0) {
+	if (ef!=nullptr) {
 		return ef();
 	} else {
 		return number.evalf();
@@ -217,7 +216,7 @@ bool constant::is_equal_same_type(const basic & other) const
 unsigned constant::calchash() const
 {
 	const void* typeid_this = (const void*)typeid(*this).name();
-	hashvalue = golden_ratio_hash((p_int)typeid_this ^ serial);
+	hashvalue = golden_ratio_hash((uintptr_t)typeid_this ^ serial);
 
 	setflag(status_flags::hash_calculated);