- more indentation fixes

[ginac.git] / ginac / constant.h

diff --git a/ginac/constant.h b/ginac/constant.h
index 89cb7ebae83576c0d1e02cf0c33666e9ddbf30ab..47f2a9d610d24101be1cec94d4f33d61c4dd6bfe 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 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -24,72 +24,80 @@
 #define __GINAC_CONSTANT_H__
 
 #include <string>
-#include <ginac/basic.h>
+#include "basic.h"
 
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
+#endif // ndef NO_NAMESPACE_GINAC
 
+typedef ex (*evalffunctype)(void);
+       
 /** This class holds constants, symbols with specific numerical value. Each
  *  object of this class must either provide their own function to evaluate it
  *  to class numeric or provide the constant as a numeric (if it's an exact
  *  number). */
 class constant : public basic
 {
+       GINAC_DECLARE_REGISTERED_CLASS(constant, basic)
 
 // member functions
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+       // default constructor, destructor, copy constructor assignment operator and helpers
 public:
-    ~constant();
-    constant(constant const & other);
-    // constant const & operator=(constant const & other); /* it's pervert! */
+       constant();
+       ~constant();
+       constant(const constant & other);
+       // const constant & operator=(const constant & other); /* it's pervert! */
 protected:
-    void copy(constant const & other);
-    void destroy(bool call_parent);
+       void copy(const constant & other);
+       void destroy(bool call_parent);
 
-    // other constructors
+       // other constructors
 public:
-    constant(string const & initname, ex (*efun)()=0);
-    constant(string const & initname, numeric const & initnumber);
+       constant(const std::string & initname, evalffunctype efun=0);
+       constant(const std::string & initname, const numeric & initnumber);
 
-    // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from bases classes
 public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
-    ex evalf(int level=0) const;
-    ex diff(symbol const & s) const;
+       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;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
-    
-    // new virtual functions which can be overridden by derived classes
-    // none
+       ex derivative(const symbol & s) const;
+       int compare_same_type(const basic & other) const;
+       bool is_equal_same_type(const basic & other) const;
+       
+       // new virtual functions which can be overridden by derived classes
+       // none
 
-    // non-virtual functions in this class
-    // none
+       // non-virtual functions in this class
+       // none
 
 // member variables
 
 private:
-    string name;
-    ex (*ef)();
-    numeric * number;
-    bool fct_assigned;
-    unsigned serial;  //!< unique serial number for comparision
-    static unsigned next_serial;
+       std::string name;
+       evalffunctype ef;
+       numeric * number;
+       // bool fct_assigned;
+       unsigned serial;  //!< unique serial number for comparision
+       static unsigned next_serial;
 };
 
 // global constants
 
 extern const constant some_constant;
-extern type_info const & typeid_constant;
+extern const type_info & typeid_constant;
 
-// extern const numeric I;
 extern const constant Pi;
 extern const constant Catalan;
-extern const constant EulerGamma;
+extern const constant Euler;
 
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_CONSTANT_H__