X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Farchive.cpp;h=1d65c7a9ec22f609dfefd62d8a64f919353e0aa5;hp=d462584ae3084e76b93a0d11c5c22f8eca906381;hb=a17a77e5c3d4ec2a92804debac65c75921f0156d;hpb=83a7ee99a947cbbf331018b803ad6be43a9ccd45

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index d462584a..1d65c7a9 100644
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -516,6 +516,12 @@ void archive_node::get_properties(propinfovector &v) const
 	}	
 }
 
+static synthesize_func find_factory_fcn(const std::string& name)
+{
+	static unarchive_table_t the_table;
+	synthesize_func ret = the_table.find(name);
+	return ret;
+}
 
 /** Convert archive node to GiNaC expression. */
 ex archive_node::unarchive(lst &sym_lst) const
@@ -528,14 +534,50 @@ ex archive_node::unarchive(lst &sym_lst) const
 	std::string class_name;
 	if (!find_string("class", class_name))
 		throw (std::runtime_error("archive node contains no class name"));
-	unarch_func f = find_unarch_func(class_name);
 
 	// Call instantiation function
-	e = f(*this, sym_lst);
+	synthesize_func factory_fcn = find_factory_fcn(class_name);
+	ptr<basic> obj(factory_fcn());
+	obj->setflag(status_flags::dynallocated);
+	obj->read_archive(*this, sym_lst);
+	e = ex(*obj);
 	has_expression = true;
 	return e;
 }
 
+int unarchive_table_t::usecount = 0;
+unarchive_map_t* unarchive_table_t::unarch_map = 0;
+
+unarchive_table_t::unarchive_table_t()
+{
+	if (usecount == 0)
+		unarch_map = new unarchive_map_t();
+	++usecount;
+}
+
+synthesize_func unarchive_table_t::find(const std::string& classname) const
+{
+	unarchive_map_t::const_iterator i = unarch_map->find(classname);
+	if (i != unarch_map->end())
+		return i->second;
+	throw std::runtime_error(std::string("no unarchiving function for \"")
+			+ classname + "\" class");
+}
+
+void unarchive_table_t::insert(const std::string& classname, synthesize_func f)
+{
+	if (unarch_map->find(classname) != unarch_map->end())
+		throw std::runtime_error(std::string("Class \"" + classname
+					+ "\" is already registered"));
+	unarch_map->operator[](classname) = f;
+}
+
+unarchive_table_t::~unarchive_table_t()
+{
+	if (--usecount == 0)
+		delete unarch_map;
+}
+
 
 void archive::clear()
 {