X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;ds=sidebyside;f=ginac%2Fconstant.h;h=9cf9d74d41dcf2013d24b6343392b745c8b064f8;hb=b87f623d787279a123c8db77cef2c84bc5874239;hp=e0242d970d060b98df09fbe63ca96a49cf31bfe5;hpb=dbd9c306a74f1cb258c0d15a346b973b39deaad2;p=ginac.git

diff --git a/ginac/constant.h b/ginac/constant.h
index e0242d97..9cf9d74d 100644
--- a/ginac/constant.h
+++ b/ginac/constant.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's constant types and some special constants. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 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,7 +17,7 @@
  *
  *  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
  */
 
 #ifndef __GINAC_CONSTANT_H__
@@ -29,7 +29,7 @@
 
 namespace GiNaC {
 
-typedef ex (*evalffunctype)(void);
+typedef ex (*evalffunctype)();
 	
 /** This class holds constants, symbols with specific numerical value. Each
  *  object of this class must either provide their own function to evaluate it
@@ -41,33 +41,32 @@ class constant : public basic
 	
 // member functions
 	
-	// other ctors
+	// other constructors
 public:
 	constant(const std::string & initname, evalffunctype efun = 0, const std::string & texname = std::string());
 	constant(const std::string & initname, const numeric & initnumber, const std::string & texname = std::string());
 	
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
 	ex evalf(int level = 0) const;
 protected:
 	ex derivative(const symbol & s) const;
 	bool is_equal_same_type(const basic & other) const;
-	unsigned calchash(void) const;
-	
-	// new virtual functions which can be overridden by derived classes
-	// none
+	unsigned calchash() const;
 	
 	// non-virtual functions in this class
-	// none
-	
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
+	void do_print_latex(const print_latex & c, unsigned level) const;
+	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+
 // member variables
-	
 private:
 	std::string name;     ///< printname of this constant
 	std::string TeX_name; ///< LaTeX name
 	evalffunctype ef;
-	numeric *number;      ///< numerical value this constant evalf()s to
+	ex number;            ///< numerical value this constant evalf()s to
 	unsigned serial;      ///< unique serial number for comparison
 	static unsigned next_serial;
 };