- The status_flags::expanded is now used on some occasions.

[ginac.git] / ginac / fail.cpp

diff --git a/ginac/fail.cpp b/ginac/fail.cpp
index 395b1189c6a981e58b7e77d6429d9f7906e6c949..d35c2f43e7b81a0ed646545b9842840f2363a4d0 100644 (file)
--- a/ginac/fail.cpp
+++ b/ginac/fail.cpp
@@ -22,11 +22,14 @@
  */
 
 #include "fail.h"
+#include "archive.h"
 #include "debugmsg.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
+
+GINAC_IMPLEMENT_REGISTERED_CLASS(fail, basic)
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -34,7 +37,7 @@ namespace GiNaC {
 
 // public
 
-fail::fail() : basic(TINFO_fail)
+fail::fail() : inherited(TINFO_fail)
 {
     debugmsg("fail default constructor",LOGLEVEL_CONSTRUCT);
 }
@@ -45,13 +48,13 @@ fail::~fail()
     destroy(0);
 }
 
-fail::fail(fail const & other)
+fail::fail(const fail & other)
 {
     debugmsg("fail copy constructor",LOGLEVEL_CONSTRUCT);
     copy(other);
 }
 
-fail const & fail::operator=(fail const & other)
+const fail & fail::operator=(const fail & other)
 {
     debugmsg("fail operator=",LOGLEVEL_ASSIGNMENT);
     if (this != &other) {
@@ -63,14 +66,14 @@ fail const & fail::operator=(fail const & other)
 
 // protected
 
-void fail::copy(fail const & other)
+void fail::copy(const fail & other)
 {
-    basic::copy(other);
+    inherited::copy(other);
 }
 
 void fail::destroy(bool call_parent)
 {
-    if (call_parent) basic::destroy(call_parent);
+    if (call_parent) inherited::destroy(call_parent);
 }
 
 
@@ -80,6 +83,28 @@ void fail::destroy(bool call_parent)
 
 // none
 
+//////////
+// archiving
+//////////
+
+/** Construct object from archive_node. */
+fail::fail(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+{
+    debugmsg("fail constructor from archive_node", LOGLEVEL_CONSTRUCT);
+}
+
+/** Unarchive the object. */
+ex fail::unarchive(const archive_node &n, const lst &sym_lst)
+{
+    return (new fail(n, sym_lst))->setflag(status_flags::dynallocated);
+}
+
+/** Archive the object. */
+void fail::archive(archive_node &n) const
+{
+    inherited::archive(n);
+}
+
 //////////
 // functions overriding virtual functions from bases classes
 //////////
@@ -106,7 +131,7 @@ void fail::printraw(ostream & os) const
 
 // protected
 
-int fail::compare_same_type(basic const & other) const
+int fail::compare_same_type(const basic & other) const
 {
        // two fails are always identical
     return 0;
@@ -135,8 +160,8 @@ int fail::compare_same_type(basic const & other) const
 //////////
 
 const fail some_fail;
-type_info const & typeid_fail=typeid(some_fail);
+const type_info & typeid_fail=typeid(some_fail);
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC