* ginac/registrar.h: dtor is inlined now.

[ginac.git] / ginac / registrar.h

diff --git a/ginac/registrar.h b/ginac/registrar.h
index 8eb4d31d7f3ec09350e8a43c5949fa1720ffc1c0..125d0998903a6950f368a4f2898dd7213b9d330d 100644 (file)
--- a/ginac/registrar.h
+++ b/ginac/registrar.h
@@ -3,7 +3,7 @@
  *  GiNaC's class registrar (for class basic and all classes derived from it). */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -25,9 +25,7 @@
 
 #include <string>
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 class registered_class_info;
 class ex;
@@ -53,30 +51,71 @@ struct registered_class_info {
                first_registered_class = this;
        }
 
-       registered_class_info *next;    /**< Pointer to next registered_class_info in list. */
-       const char *name;                               /**< Class name. */
-       const char *super;                              /**< Name of superclass. */
-       unsigned int tinfo_key;                 /**< TINFO_* key. */
-       unarch_func unarchive;                  /**< Pointer to unarchiving function. */
+       registered_class_info *next;  /**< Pointer to next registered_class_info in list. */
+       const char *name;             /**< Class name. */
+       const char *super;            /**< Name of superclass. */
+       unsigned int tinfo_key;       /**< TINFO_* key. */
+       unarch_func unarchive;        /**< Pointer to unarchiving function. */
 };
 
 
-/** Macro for inclusion in the declaration of each registered class. */
-#define GINAC_DECLARE_REGISTERED_CLASS(classname, supername) \
+/** Primary macro for inclusion in the implementation of each registered class. */
+#define GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(classname, supername) \
 public: \
        typedef supername inherited; \
        static registered_class_info reg_info; \
        virtual const char *class_name(void) const; \
        classname(const archive_node &n, const lst &sym_lst); \
        virtual void archive(archive_node &n) const; \
-       static ex unarchive(const archive_node &n, const lst &sym_lst); \
+       static ex unarchive(const archive_node &n, const lst &sym_lst);
+
+/** Macro for inclusion in the declaration of each registered class.
+ *  It declares some functions that are common to all classes derived
+ *  from 'basic' as well as all required stuff for the GiNaC class
+ *  registry (mainly needed for archiving). */
+#define GINAC_DECLARE_REGISTERED_CLASS(classname, supername) \
+       GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(classname, supername) \
+public: \
+       classname(); \
+       ~classname() { /*debugmsg(#classname " dtor", LOGLEVEL_DESTRUCT);*/ destroy(false); } \
+       classname(const classname & other); \
+       const classname & operator=(const classname & other); \
+       basic * duplicate() const; \
+protected: \
+       void copy(const classname & other); \
+       void destroy(bool call_parent); \
+       int compare_same_type(const basic & other) const; \
 private:
 
-/** Macro for inclusion in the implementation of each registered class. */
-#define GINAC_IMPLEMENT_REGISTERED_CLASS(classname, supername) \
+/** Primary macro for inclusion in the implementation of each registered class. */
+#define GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(classname, supername) \
        registered_class_info classname::reg_info(#classname, #supername, TINFO_##classname, &classname::unarchive); \
        const char *classname::class_name(void) const {return reg_info.name;}
 
+/** Macro for inclusion in the implementation of each registered class.
+ *  It implements some functions that are the same in all classes derived
+ *  from 'basic' (such as the assignment operator). */
+#define GINAC_IMPLEMENT_REGISTERED_CLASS(classname, supername) \
+       GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(classname, supername) \
+classname::classname(const classname & other) \
+{ \
+       /*debugmsg(#classname " copy ctor", LOGLEVEL_CONSTRUCT);*/ \
+       copy(other); \
+} \
+const classname & classname::operator=(const classname & other) \
+{ \
+       /*debugmsg(#classname " operator=", LOGLEVEL_ASSIGNMENT);*/ \
+       if (this != &other) { \
+               destroy(true); \
+               copy(other); \
+       } \
+       return *this; \
+} \
+basic * classname::duplicate() const { \
+       /*debugmsg(#classname " duplicate", LOGLEVEL_DUPLICATE);*/ \
+       return new classname(*this); \
+}
+
 
 /** Find TINFO_* key by class name. */
 extern unsigned int find_tinfo_key(const std::string &class_name);
@@ -85,8 +124,6 @@ extern unsigned int find_tinfo_key(const std::string &class_name);
 extern unarch_func find_unarch_func(const std::string &class_name);
 
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_REGISTRAR_H__