X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fconstant.h;h=b30fc26257a24b72e14b4faa0b8b931d3e8dfc2d;hb=b8e4e8958d3884ea3c91ac9a8b99fb912ea44626;hp=f8c5633d7b563e7cff46a6181c5552ce74f24a42;hpb=9e2d60e206395fc9908e1f9025e50c76b3d7c182;p=ginac.git

diff --git a/ginac/constant.h b/ginac/constant.h
index f8c5633d..b30fc262 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-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -25,10 +25,9 @@
 
 #include <string>
 #include "basic.h"
+#include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 typedef ex (*evalffunctype)(void);
 	
@@ -39,65 +38,52 @@ typedef ex (*evalffunctype)(void);
 class constant : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
-
+	
 // member functions
-
-	// default constructor, destructor, copy constructor assignment operator and helpers
-public:
-	constant();
-	~constant();
-	constant(const constant & other);
-	// const constant & operator=(const constant & other); /* it's pervert! */
-protected:
-	void copy(const constant & other);
-	void destroy(bool call_parent);
-
-	// other constructors
+	
+	// other ctors
 public:
-	constant(const std::string & initname, evalffunctype efun=0);
+	constant(const std::string & initname, evalffunctype efun = 0);
 	constant(const std::string & initname, const numeric & initnumber);
-
+	
 	// functions overriding virtual functions from bases classes
 public:
-	basic * duplicate() const;
-	void print(std::ostream & os, unsigned upper_precedence=0) const;
+	void print(std::ostream & os, unsigned upper_precedence = 0) const;
 	void printraw(std::ostream & os) const;
 	void printtree(std::ostream & os, unsigned indent) const;
-	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
-	ex evalf(int level=0) const;
+	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence = 0) const;
+	ex evalf(int level = 0) const;
 protected:
 	ex derivative(const symbol & s) const;
-	int compare_same_type(const basic & other) 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
-
+	
 	// non-virtual functions in this class
 	// none
-
+	
 // member variables
-
+	
 private:
-	std::string name;
+	std::string name;   ///< printname of this constant
 	evalffunctype ef;
-	numeric * number;
-	// bool fct_assigned;
-	unsigned serial;  //!< unique serial number for comparision
+	numeric *number;    ///< numerical value this constant evalf()s to
+	unsigned serial;    ///< unique serial number for comparison
 	static unsigned next_serial;
 };
 
-// global constants
-
-extern const constant some_constant;
-extern const std::type_info & typeid_constant;
-
 extern const constant Pi;
 extern const constant Catalan;
 extern const constant Euler;
 
-#ifndef NO_NAMESPACE_GINAC
+// utility functions
+inline const constant &ex_to_constant(const ex &e)
+{
+	return static_cast<const constant &>(*e.bp);
+}
+
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_CONSTANT_H__