X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Farchive.cpp;h=a7152ba74a4fa38a958c1c223d2f2b296f5bff1f;hp=7e5e648dc677dc07d73a1ba6a4fa71455467eadd;hb=f9afb6aca6a971650dff63b11ca8c2ef18506690;hpb=da64e515abf7243bc4c84ca3631470931c4e6691

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index 7e5e648d..a7152ba7 100644
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -3,7 +3,7 @@
  *  Archiving of GiNaC expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2011 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,9 +20,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
-#include <stdexcept>
-
 #include "archive.h"
 #include "registrar.h"
 #include "ex.h"
@@ -30,6 +27,9 @@
 #include "config.h"
 #include "tostring.h"
 
+#include <iostream>
+#include <stdexcept>
+
 namespace GiNaC {
 
 
@@ -272,8 +272,10 @@ std::istream &operator>>(std::istream &is, archive &ar)
 	// Read atoms
 	unsigned num_atoms = read_unsigned(is);
 	ar.atoms.resize(num_atoms);
-	for (unsigned i=0; i<num_atoms; i++)
+	for (unsigned i=0; i<num_atoms; i++) {
 		getline(is, ar.atoms[i], '\0');
+		ar.inverse_atoms[ar.atoms[i]] = i;
+	}
 
 	// Read expressions
 	unsigned num_exprs = read_unsigned(is);
@@ -297,17 +299,15 @@ std::istream &operator>>(std::istream &is, archive &ar)
  *  represents the string). */
 archive_atom archive::atomize(const std::string &s) const
 {
-	// Search for string in atoms vector
-	std::vector<std::string>::const_iterator i = atoms.begin(), iend = atoms.end();
-	archive_atom id = 0;
-	while (i != iend) {
-		if (*i == s)
-			return id;
-		i++; id++;
-	}
+	// Search for string in inverse_atoms map.
+	inv_at_cit i = inverse_atoms.find(s);
+	if (i!=inverse_atoms.end())
+		return i->second;
 
 	// Not found, add to atoms vector
+	archive_atom id = atoms.size();
 	atoms.push_back(s);
+	inverse_atoms[s] = id;
 	return id;
 }
 
@@ -352,6 +352,27 @@ bool archive_node::has_same_ex_as(const archive_node &other) const
 	return e.bp == other.e.bp;
 }
 
+archive_node::archive_node_cit
+		archive_node::find_first(const std::string &name) const
+{	
+	archive_atom name_atom = a.atomize(name);
+	for (archive_node_cit i=props.begin(); i!=props.end(); ++i)
+		if (i->name == name_atom)
+			return i;
+	return props.end();;
+}
+
+archive_node::archive_node_cit
+		archive_node::find_last(const std::string &name) const
+{
+	archive_atom name_atom = a.atomize(name);
+	for (archive_node_cit i=props.end(); i!=props.begin();) {
+		--i;
+		if (i->name == name_atom)
+			return i;
+	}
+	return props.end();
+}
 
 void archive_node::add_bool(const std::string &name, bool value)
 {
@@ -379,7 +400,7 @@ void archive_node::add_ex(const std::string &name, const ex &value)
 bool archive_node::find_bool(const std::string &name, bool &ret, unsigned index) const
 {
 	archive_atom name_atom = a.atomize(name);
-	std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+	archive_node_cit i = props.begin(), iend = props.end();
 	unsigned found_index = 0;
 	while (i != iend) {
 		if (i->type == PTYPE_BOOL && i->name == name_atom) {
@@ -397,7 +418,7 @@ bool archive_node::find_bool(const std::string &name, bool &ret, unsigned index)
 bool archive_node::find_unsigned(const std::string &name, unsigned &ret, unsigned index) const
 {
 	archive_atom name_atom = a.atomize(name);
-	std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+	archive_node_cit i = props.begin(), iend = props.end();
 	unsigned found_index = 0;
 	while (i != iend) {
 		if (i->type == PTYPE_UNSIGNED && i->name == name_atom) {
@@ -415,7 +436,7 @@ bool archive_node::find_unsigned(const std::string &name, unsigned &ret, unsigne
 bool archive_node::find_string(const std::string &name, std::string &ret, unsigned index) const
 {
 	archive_atom name_atom = a.atomize(name);
-	std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+	archive_node_cit i = props.begin(), iend = props.end();
 	unsigned found_index = 0;
 	while (i != iend) {
 		if (i->type == PTYPE_STRING && i->name == name_atom) {
@@ -430,10 +451,16 @@ bool archive_node::find_string(const std::string &name, std::string &ret, unsign
 	return false;
 }
 
+void archive_node::find_ex_by_loc(archive_node_cit loc, ex &ret, lst &sym_lst)
+		const
+{
+	ret = a.get_node(loc->value).unarchive(sym_lst);
+}
+
 bool archive_node::find_ex(const std::string &name, ex &ret, lst &sym_lst, unsigned index) const
 {
 	archive_atom name_atom = a.atomize(name);
-	std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+	archive_node_cit i = props.begin(), iend = props.end();
 	unsigned found_index = 0;
 	while (i != iend) {
 		if (i->type == PTYPE_NODE && i->name == name_atom) {
@@ -451,7 +478,7 @@ bool archive_node::find_ex(const std::string &name, ex &ret, lst &sym_lst, unsig
 const archive_node &archive_node::find_ex_node(const std::string &name, unsigned index) const
 {
 	archive_atom name_atom = a.atomize(name);
-	std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+	archive_node_cit i = props.begin(), iend = props.end();
 	unsigned found_index = 0;
 	while (i != iend) {
 		if (i->type == PTYPE_NODE && i->name == name_atom) {
@@ -468,7 +495,7 @@ const archive_node &archive_node::find_ex_node(const std::string &name, unsigned
 void archive_node::get_properties(propinfovector &v) const
 {
 	v.clear();
-	std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+	archive_node_cit i = props.begin(), iend = props.end();
 	while (i != iend) {
 		property_type type = i->type;
 		std::string name = a.unatomize(i->name);
@@ -489,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
@@ -501,18 +534,55 @@ 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()
 {
 	atoms.clear();
+	inverse_atoms.clear();
 	exprs.clear();
 	nodes.clear();
 	exprtable.clear();
@@ -583,7 +653,7 @@ void archive_node::printraw(std::ostream &os) const
 		os << "\n";
 
 	// Dump properties
-	std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+	archive_node_cit i = props.begin(), iend = props.end();
 	while (i != iend) {
 		os << "  ";
 		switch (i->type) {