X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fregistrar.h;h=c6cdc412aa55eba4eb22917f61da392ddc1d41aa;hb=ec64e556734484ca3c518e6de95b26be61bedee7;hp=e22cb2fb23c835c92089013625f90c88476c6543;hpb=4cf53676d7823ec3c55a90df7723f7f1492a95b2;p=ginac.git

diff --git a/ginac/registrar.h b/ginac/registrar.h
index e22cb2fb..c6cdc412 100644
--- 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-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -20,42 +20,72 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_REGISTRAR_H__
-#define __GINAC_REGISTRAR_H__
-
-#include <string>
-#include <list>
-#include <vector>
+#ifndef GINAC_REGISTRAR_H
+#define GINAC_REGISTRAR_H
 
 #include "class_info.h"
 #include "print.h"
 
+#include <list>
+#include <string>
+#include <typeinfo>
+#include <vector>
+
 namespace GiNaC {
 
 class ex;
 class archive_node;
 
-template <template <class> class> class container;
+template <template <class T, class = std::allocator<T>> class> class container;
 typedef container<std::list> lst;
 
-/** Definitions for the tinfo mechanism. */
-typedef const void * tinfo_t;
-struct tinfo_static_t {};
-
-/** Unarchiving function (static member function of every GiNaC class). */
-typedef ex (*unarch_func)(const archive_node &n, lst &sym_lst);
+/** To distinguish between different kinds of non-commutative objects */
+struct return_type_t
+{
+	/// to distinguish between non-commutative objects of different type.
+	std::type_info const* tinfo; 
+	/// to distinguish between non-commutative objects of the same type.
+	/// Think of gamma matrices with different representation labels.
+	unsigned rl;
+
+	/// Strict weak ordering (so one can put return_type_t's into
+	/// a STL container).
+	inline bool operator<(const return_type_t& other) const
+	{
+		if (tinfo->before(*other.tinfo))
+			return true;
+		return rl < other.rl;
+	}
+	inline bool operator==(const return_type_t& other) const
+	{
+		if (*tinfo != *(other.tinfo))
+			return false;
+		return rl == other.rl;
+	}
+	inline bool operator!=(const return_type_t& other) const
+	{
+		return ! (operator==(other));
+	}
+};
 
+template<typename T> inline return_type_t make_return_type_t(const unsigned rl = 0)
+{
+	return_type_t ret;
+	ret.rl = rl;
+	ret.tinfo = &typeid(T);
+	return ret;
+}
 
 /** This class stores information about a registered GiNaC class. */
 class registered_class_options {
 public:
-	registered_class_options(const char *n, const char *p, tinfo_t ti, unarch_func f)
-	 : name(n), parent_name(p), tinfo_key(ti), unarchive(f) {}
+	registered_class_options(const char *n, const char *p, 
+		                 const std::type_info& ti)
+	 : name(n), parent_name(p), tinfo_key(&ti) { }
 
 	const char *get_name() const { return name; }
 	const char *get_parent_name() const { return parent_name; }
-	tinfo_t get_id() const { return tinfo_key; }
-	unarch_func get_unarch_func() const { return unarchive; }
+	std::type_info const* get_id() const { return tinfo_key; }
 	const std::vector<print_functor> &get_print_dispatch_table() const { return print_dispatch_table; }
 
 	template <class Ctx, class T, class C>
@@ -89,82 +119,76 @@ public:
 private:
 	const char *name;         /**< Class name. */
 	const char *parent_name;  /**< Name of superclass. */
-	tinfo_t tinfo_key;        /**< Type information key. */
-	unarch_func unarchive;    /**< Pointer to unarchiving function. */
+	std::type_info const* tinfo_key;        /**< Type information key. */
 	std::vector<print_functor> print_dispatch_table; /**< Method table for print() dispatch */
 };
 
 typedef class_info<registered_class_options> registered_class_info;
 
-
-/** 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 const GiNaC::tinfo_static_t tinfo_static; \
+/** Common part of GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS and GINAC_DECLARE_REGISTERED_CLASS. */
+#define GINAC_DECLARE_REGISTERED_CLASS_COMMON(classname)	\
 private: \
 	static GiNaC::registered_class_info reg_info; \
 public: \
 	static GiNaC::registered_class_info &get_class_info_static() { return reg_info; } \
-	virtual const GiNaC::registered_class_info &get_class_info() const { return classname::get_class_info_static(); } \
-	virtual GiNaC::registered_class_info &get_class_info() { return classname::get_class_info_static(); } \
-	virtual const char *class_name() const { return classname::get_class_info_static().options.get_name(); } \
-	\
-	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; \
 		virtual ~visitor() {}; \
 	};
 
+/** Primary macro for inclusion in the declaration of each registered class. */
+#define GINAC_DECLARE_REGISTERED_CLASS_NO_CTORS(classname, supername) \
+	GINAC_DECLARE_REGISTERED_CLASS_COMMON(classname) \
+	typedef supername inherited; \
+	virtual const GiNaC::registered_class_info &get_class_info() const { return classname::get_class_info_static(); } \
+	virtual GiNaC::registered_class_info &get_class_info() { return classname::get_class_info_static(); } \
+	virtual const char *class_name() const { return classname::get_class_info_static().options.get_name(); } \
+private:
+
 /** 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: \
+	GINAC_DECLARE_REGISTERED_CLASS_COMMON(classname) \
+	template<class B, typename... Args> friend B & dynallocate(Args &&... args); \
+	typedef supername inherited; \
 	classname(); \
-	virtual classname * duplicate() const { return new classname(*this); } \
+	classname * duplicate() const override { \
+		classname * bp = new classname(*this); \
+		bp->setflag(GiNaC::status_flags::dynallocated);	\
+		return bp; \
+	} \
 	\
-	virtual void accept(GiNaC::visitor & v) const \
+	void accept(GiNaC::visitor & v) const override \
 	{ \
 		if (visitor *p = dynamic_cast<visitor *>(&v)) \
 			p->visit(*this); \
 		else \
 			inherited::accept(v); \
 	} \
+	const GiNaC::registered_class_info &get_class_info() const override { return classname::get_class_info_static(); } \
+	GiNaC::registered_class_info &get_class_info() override { return classname::get_class_info_static(); } \
+	const char *class_name() const override { return classname::get_class_info_static().options.get_name(); } \
 protected: \
-	virtual int compare_same_type(const GiNaC::basic & other) const; \
+	int compare_same_type(const GiNaC::basic & other) const override; \
 private:
 
 
 /** Macro for inclusion in the implementation of each registered class. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS(classname, supername) \
-	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, &classname::tinfo_static, &classname::unarchive)); \
-	const GiNaC::tinfo_static_t classname::tinfo_static = {};
+	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname))); 
 
 /** Macro for inclusion in the implementation of each registered class.
  *  Additional options can be specified. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(classname, supername, options) \
-	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, &classname::tinfo_static, &classname::unarchive).options); \
-	const GiNaC::tinfo_static_t classname::tinfo_static = {};
+	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname)).options);
 
 /** Macro for inclusion in the implementation of each registered class.
  *  Additional options can be specified. */
 #define GINAC_IMPLEMENT_REGISTERED_CLASS_OPT_T(classname, supername, options) \
-	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, &classname::tinfo_static, &classname::unarchive).options); \
-	template<> const GiNaC::tinfo_static_t classname::tinfo_static = {};
-
-
-/** Find type information key by class name. */
-extern tinfo_t find_tinfo_key(const std::string &class_name);
-
-/** Find unarchiving function by class name. */
-extern unarch_func find_unarch_func(const std::string &class_name);
+	GiNaC::registered_class_info classname::reg_info = GiNaC::registered_class_info(GiNaC::registered_class_options(#classname, #supername, typeid(classname)).options);
 
 
 /** Add or replace a print method. */
@@ -184,4 +208,4 @@ extern void set_print_func(void (T::*f)(const C &, unsigned))
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_REGISTRAR_H__
+#endif // ndef GINAC_REGISTRAR_H