- (l)degree(s), coeff(s, n) and collect(s) were extended to accept expressions

[ginac.git] / ginac / constant.h

diff --git a/ginac/constant.h b/ginac/constant.h
index fdf06615fcf6a067b2cddaba35556303019c9a01..6f3aa0fa1786bc4e924a46f3782d034a9bafa65a 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-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 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
@@ -43,15 +43,12 @@ class constant : public basic
        
        // other ctors
 public:
-       constant(const std::string & initname, evalffunctype efun = 0);
-       constant(const std::string & initname, const numeric & initnumber);
+       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;
@@ -67,10 +64,11 @@ protected:
 // member variables
        
 private:
-       std::string name;   ///< printname of this constant
+       std::string name;     ///< printname of this constant
+       std::string TeX_name; ///< LaTeX name
        evalffunctype ef;
-       numeric *number;    ///< numerical value this constant evalf()s to
-       unsigned serial;    ///< unique serial number for comparison
+       numeric *number;      ///< numerical value this constant evalf()s to
+       unsigned serial;      ///< unique serial number for comparison
        static unsigned next_serial;
 };
 
@@ -79,9 +77,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