- made nops() return unsigned instead of int

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 30ccb88787588eb19745ace8ee09ee604e45af63..fa7adf24a79f3cba630cbb10bd69c56b3bd6cd25 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -3,7 +3,7 @@
  *  Implementation of 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
@@ -28,7 +28,9 @@
 #include "ex.h"
 #include "debugmsg.h"
 
+#ifndef NO_GINAC_NAMESPACE
 namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -36,6 +38,13 @@ namespace GiNaC {
 
 // public
 
+constant::constant() :
+    basic(TINFO_constant), name(""), ef(0),
+    number(0), serial(next_serial++)
+{
+    debugmsg("constant default constructor",LOGLEVEL_CONSTRUCT);
+}
+
 constant::~constant()
 {
     debugmsg("constant destructor",LOGLEVEL_DESTRUCT);
@@ -61,7 +70,7 @@ void constant::copy(constant const & other)
     } else {
         number = 0;
     }
-    fct_assigned=other.fct_assigned;
+    // fct_assigned=other.fct_assigned;
 }
 
 void constant::destroy(bool call_parent)
@@ -77,16 +86,17 @@ void constant::destroy(bool call_parent)
 
 // public
 
-constant::constant(string const & initname, ex (*efun)()) :
+constant::constant(string const & initname, evalffunctype efun) :
     basic(TINFO_constant), name(initname), ef(efun),
-    number(0), fct_assigned(true), serial(next_serial++)
+    // number(0), fct_assigned(true), serial(next_serial++)
+    number(0), serial(next_serial++)
 {
     debugmsg("constant constructor from string, function",LOGLEVEL_CONSTRUCT);
 }
 
 constant::constant(string const & initname, numeric const & initnumber) :
     basic(TINFO_constant), name(initname), ef(0),
-    number(new numeric(initnumber)), fct_assigned(false), serial(next_serial++)
+    number(new numeric(initnumber)), /* fct_assigned(false),*/ serial(next_serial++)
 {
     debugmsg("constant constructor from string, numeric",LOGLEVEL_CONSTRUCT);
 }
@@ -103,9 +113,36 @@ basic * constant::duplicate() const
     return new constant(*this);
 }
 
+void constant::print(ostream & os, unsigned upper_precedence) const
+{
+    debugmsg("constant print",LOGLEVEL_PRINT);
+    os << name;
+}
+
+void constant::printraw(ostream & os) const
+{
+    debugmsg("constant printraw",LOGLEVEL_PRINT);
+    os << "constant(" << name << ")";
+}
+
+void constant::printtree(ostream & os, unsigned indent) const
+{
+    debugmsg("constant printtree",LOGLEVEL_PRINT);
+    os << string(indent,' ') << name
+       << ", type=" << typeid(*this).name()
+       << ", hash=" << hashvalue << " (0x" << hex << hashvalue << dec << ")"
+       << ", flags=" << flags << endl;
+}
+
+void constant::printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const
+{
+    debugmsg("constant print csrc",LOGLEVEL_PRINT);
+    os << name;
+}
+
 ex constant::evalf(int level) const
 {
-    if (fct_assigned) {
+    if (ef!=0) {
         return ef();
     } else if (number != 0) {
         return *number;
@@ -117,7 +154,7 @@ ex constant::evalf(int level) const
 
 int constant::compare_same_type(basic const & other) const
 {
-    ASSERT(is_exactly_of_type(other, constant));
+    GINAC_ASSERT(is_exactly_of_type(other, constant));
     // constant const & o=static_cast<constant &>(const_cast<basic &>(other));
     // return name.compare(o.name);
     const constant *o = static_cast<const constant *>(&other);
@@ -127,7 +164,7 @@ int constant::compare_same_type(basic const & other) const
 
 bool constant::is_equal_same_type(basic const & other) const
 {
-    ASSERT(is_exactly_of_type(other, constant));
+    GINAC_ASSERT(is_exactly_of_type(other, constant));
     const constant *o = static_cast<const constant *>(&other);
     return serial==o->serial;
 }
@@ -154,7 +191,7 @@ unsigned constant::next_serial=0;
 // global constants
 //////////
 
-const constant some_constant("",0);
+const constant some_constant;
 type_info const & typeid_constant=typeid(some_constant);
 
 /**  Pi. (3.14159...)  Diverts straight into CLN for evalf(). */
@@ -165,4 +202,6 @@ const constant EulerGamma("EulerGamma", EulerGammaEvalf);
  *  Diverts straight into CLN for evalf(). */
 const constant Catalan("Catalan", CatalanEvalf);
 
+#ifndef NO_GINAC_NAMESPACE
 } // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE