implemented operator-> for the iterators

[ginac.git] / ginac / constant.h

diff --git a/ginac/constant.h b/ginac/constant.h
index 5ffe6200b2dfae88d9548501e1414885135226b6..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-2002 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
@@ -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 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;
 };