implemented operator-> for the iterators

[ginac.git] / ginac / constant.h

diff --git a/ginac/constant.h b/ginac/constant.h
index 47f2a9d610d24101be1cec94d4f33d61c4dd6bfe..f44ec9dcf08b30d356bf7d01e7198e53ca8fe2b3 100644 (file)
--- 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-2003 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,12 +25,11 @@
 
 #include <string>
 #include "basic.h"
+#include "ex.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_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
@@ -39,65 +38,51 @@ 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
 public:
-       constant(const std::string & initname, evalffunctype efun=0);
-       constant(const std::string & initname, const numeric & initnumber);
-
-       // functions overriding virtual functions from bases classes
+       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:
-       basic * duplicate() 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;
+       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() const;
        
-       // new virtual functions which can be overridden by derived classes
-       // none
-
        // 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;
+       std::string name;     ///< printname of this constant
+       std::string TeX_name; ///< LaTeX name
        evalffunctype ef;
-       numeric * number;
-       // bool fct_assigned;
-       unsigned serial;  //!< unique serial number for comparision
+       ex 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 type_info & typeid_constant;
-
 extern const constant Pi;
 extern const constant Catalan;
 extern const constant Euler;
 
-#ifndef NO_NAMESPACE_GINAC
+// utility functions
+
+/** Specialization of is_exactly_a<constant>(obj) for constant objects. */
+template<> inline bool is_exactly_a<constant>(const basic & obj)
+{
+       return obj.tinfo()==TINFO_constant;
+}
+
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_CONSTANT_H__