added example for namespace bracing

[ginac.git] / ginac / constant.cpp

diff --git a/ginac/constant.cpp b/ginac/constant.cpp
index 636eeae4104eb7ad3b82377ac0de0d5729d038f4..e0ccf54428902d3e3d72b7e531bb28b8e538ab59 100644 (file)
--- a/ginac/constant.cpp
+++ b/ginac/constant.cpp
@@ -27,53 +27,36 @@
 #include "constant.h"
 #include "numeric.h"
 #include "ex.h"
-#include "print.h"
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(constant, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(constant, basic,
+  print_func<print_context>(&constant::do_print).
+  print_func<print_latex>(&constant::do_print_latex).
+  print_func<print_tree>(&constant::do_print_tree).
+  print_func<print_python_repr>(&constant::do_print_python_repr))
 
 //////////
-// default ctor, dtor, copy ctor, assignment operator and helpers
+// default constructor
 //////////
 
 // public
 
-constant::constant() : basic(TINFO_constant), ef(0), number(0), serial(next_serial++) {}
-
-// protected
-
-/** For use by copy ctor and assignment operator. */
-void constant::copy(const constant & other)
-{
-       inherited::copy(other);
-       name = other.name;
-       TeX_name = other.TeX_name;
-       serial = other.serial;
-       ef = other.ef;
-       if (other.number != 0)
-               number = new numeric(*other.number);
-       else
-               number = 0;
-}
-
-void constant::destroy(bool call_parent)
+constant::constant() : basic(TINFO_constant), ef(0), serial(next_serial++)
 {
-       delete number;
-       if (call_parent)
-               inherited::destroy(call_parent);
+       setflag(status_flags::evaluated | status_flags::expanded);
 }
 
 //////////
-// other ctors
+// other constructors
 //////////
 
 // public
 
 constant::constant(const std::string & initname, evalffunctype efun, const std::string & texname)
-  : basic(TINFO_constant), name(initname), ef(efun), number(0), serial(next_serial++)
+  : basic(TINFO_constant), name(initname), ef(efun), serial(next_serial++)
 {
        if (texname.empty())
                TeX_name = "\\mbox{" + name + "}";
@@ -83,7 +66,7 @@ constant::constant(const std::string & initname, evalffunctype efun, const std::
 }
 
 constant::constant(const std::string & initname, const numeric & initnumber, const std::string & texname)
-  : basic(TINFO_constant), name(initname), ef(0), number(new numeric(initnumber)), serial(next_serial++)
+  : basic(TINFO_constant), name(initname), ef(0), number(initnumber), serial(next_serial++)
 {
        if (texname.empty())
                TeX_name = "\\mbox{" + name + "}";
@@ -96,9 +79,9 @@ constant::constant(const std::string & initname, const numeric & initnumber, con
 // archiving
 //////////
 
-constant::constant(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) {}
+constant::constant(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) {}
 
-ex constant::unarchive(const archive_node &n, const lst &sym_lst)
+ex constant::unarchive(const archive_node &n, lst &sym_lst)
 {
        // Find constant by name (!! this is bad: 'twould be better if there
        // was a list of all global constants that we could search)
@@ -128,29 +111,37 @@ void constant::archive(archive_node &n) const
 
 // public
 
-void constant::print(const print_context & c, unsigned level) const
+void constant::do_print(const print_context & c, unsigned level) const
 {
-       if (is_a<print_tree>(c)) {
-               c.s << std::string(level, ' ') << name << " (" << class_name() << ")"
-                   << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
-                   << std::endl;
-       } else if (is_a<print_latex>(c)) {
-               c.s << TeX_name;
-       } else if (is_a<print_python_repr>(c)) {
-               c.s << class_name() << "('" << name << "'";
-               if (TeX_name != "\\mbox{" + name + "}")
-                       c.s << ",TeX_name='" << TeX_name << "'";
-               c.s << ')';
-       } else
-               c.s << name;
+       c.s << name;
+}
+
+void constant::do_print_tree(const print_tree & c, unsigned level) const
+{
+       c.s << std::string(level, ' ') << name << " (" << class_name() << ")" << " @" << this
+           << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+           << std::endl;
+}
+
+void constant::do_print_latex(const print_latex & c, unsigned level) const
+{
+       c.s << TeX_name;
+}
+
+void constant::do_print_python_repr(const print_python_repr & c, unsigned level) const
+{
+       c.s << class_name() << "('" << name << "'";
+       if (TeX_name != "\\mbox{" + name + "}")
+               c.s << ",TeX_name='" << TeX_name << "'";
+       c.s << ')';
 }
 
 ex constant::evalf(int level) const
 {
        if (ef!=0) {
                return ef();
-       } else if (number != 0) {
-               return number->evalf();
+       } else {
+               return number.evalf();
        }
        return *this;
 }
@@ -184,14 +175,12 @@ bool constant::is_equal_same_type(const basic & other) const
        return serial == o.serial;
 }
 
-unsigned constant::calchash(void) const
+unsigned constant::calchash() const
 {
        hashvalue = golden_ratio_hash(tinfo() ^ serial);
-       // mask out numeric hashes:
-       hashvalue &= 0x7FFFFFFFU;
-       
+
        setflag(status_flags::hash_calculated);
-       
+
        return hashvalue;
 }