describe ex_is_less and ex_is_equal

[ginac.git] / ginac / registrar.h

diff --git a/ginac/registrar.h b/ginac/registrar.h
index e800001973abeb8242a2eb0ccf26d2b19f40b8a4..6969f0c23bb66cd5b27ccc7167125000edb0bdc3 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-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -24,19 +24,20 @@
 #define __GINAC_REGISTRAR_H__
 
 #include <string>
+#include <list>
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 class registered_class_info;
 class ex;
 class archive_node;
-class lst;
+
+template <template <class> class> class container;
+typedef container<std::list> lst;
 
 
 /** Unarchiving function (static member function of every GiNaC class). */
-typedef ex (*unarch_func)(const archive_node &n, const lst &sym_lst);
+typedef ex (*unarch_func)(const archive_node &n, lst &sym_lst);
 
 
 /** Head of list of all registered_class_info structures. */
@@ -61,21 +62,50 @@ struct registered_class_info {
 };
 
 
-/** Macro for inclusion in the declaration of each registered class. */
-#define GINAC_DECLARE_REGISTERED_CLASS(classname, supername) \
+/** Primary macro for inclusion in the declaration 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 GiNaC::registered_class_info reg_info; \
+       virtual const char *class_name() const; \
+       \
+       classname(const GiNaC::archive_node &n, GiNaC::lst &sym_lst); \
+       virtual void archive(GiNaC::archive_node &n) const; \
+       static GiNaC::ex unarchive(const GiNaC::archive_node &n, GiNaC::lst &sym_lst); \
+       \
+       class visitor { \
+       public: \
+               virtual void visit(const classname &) = 0; \
+       };
+
+/** 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 * duplicate() const { return new classname(*this); } \
+       \
+       void accept(GiNaC::visitor & v) const \
+       { \
+               if (visitor *p = dynamic_cast<visitor *>(&v)) \
+                       p->visit(*this); \
+               else \
+                       inherited::accept(v); \
+       } \
+protected: \
+       int compare_same_type(const GiNaC::basic & other) const; \
 private:
 
-/** Macro for inclusion in the implementation of each registered class. */
+/** Macro for inclusion in the implementation of each registered class.
+ *  It defines some members that are the same in all classes derived from
+ *  'basic'. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS(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;}
+       GiNaC::registered_class_info classname::reg_info(#classname, #supername, TINFO_##classname, &classname::unarchive); \
+       const char *classname::class_name() const {return reg_info.name;}
 
 
 /** Find TINFO_* key by class name. */
@@ -85,8 +115,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__