X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fconstant.h;h=cff0e42f028d069d0df886660fe4613ce1bbef02;hp=bf85b382d6c5b38dc2e4ddc5ab89544c2209420d;hb=547db2f0380c03c7d013aa8bda36aa33ff5559e1;hpb=f7a07ae7330a3543bb00aa7b659e2624d6c440c7

diff --git a/ginac/constant.h b/ginac/constant.h
index bf85b382..cff0e42f 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-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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
@@ -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,36 +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 bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
-	int degree(const ex & s) const;
-	int ldegree(const ex & s) const;
-	ex coeff(const ex & s, int n = 1) 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;
 };
@@ -80,9 +76,11 @@ extern const constant Catalan;
 extern const constant Euler;
 
 // utility functions
-inline const constant &ex_to_constant(const ex &e)
+
+/** Specialization of is_exactly_a<constant>(obj) for constant objects. */
+template<> inline bool is_exactly_a<constant>(const basic & obj)
 {
-	return static_cast<const constant &>(*e.bp);
+	return obj.tinfo()==TINFO_constant;
 }
 
 } // namespace GiNaC