X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Farchive.cpp;h=79798b617ffb795c1e094341f9fd53f3c63027a6;hp=43b2667cac1c9e0b80c59df913f516726820da6b;hb=bc80f7d97d0dc2c74606b8c2e64e50530a685ba0;hpb=16b43efe2cf6d595ea589477b07da3363d7b98c9

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index 43b2667c..79798b61 100644
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -3,7 +3,7 @@
  *  Archiving of GiNaC expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
@@ -26,8 +26,9 @@
 #include "archive.h"
 #include "registrar.h"
 #include "ex.h"
+#include "lst.h"
 #include "config.h"
-#include "utils.h"
+#include "tostring.h"
 
 namespace GiNaC {
 
@@ -49,18 +50,19 @@ void archive::archive_ex(const ex &e, const char *name)
  *  @return ID of archived node */
 archive_node_id archive::add_node(const archive_node &n)
 {
-	// Search for node in nodes vector
-	std::vector<archive_node>::const_iterator i = nodes.begin(), iend = nodes.end();
-	archive_node_id id = 0;
-	while (i != iend) {
-		if (i->has_same_ex_as(n))
-			return id;
-		i++; id++;
+	// Look if expression is known to be in some node already.
+	if (n.has_ex()) {
+		mapit i = exprtable.find(n.get_ex());
+		if (i != exprtable.end())
+			return i->second;
+		nodes.push_back(n);
+		exprtable[n.get_ex()] = nodes.size() - 1;
+		return nodes.size() - 1;
 	}
 
 	// Not found, add archive_node to nodes vector
 	nodes.push_back(n);
-	return id;
+	return nodes.size()-1;
 }
 
 
@@ -89,19 +91,21 @@ ex archive::unarchive_ex(const lst &sym_lst, const char *name) const
 
 found:
 	// Recursively unarchive all nodes, starting at the root node
-	return nodes[i->root].unarchive(sym_lst);
+	lst sym_lst_copy = sym_lst;
+	return nodes[i->root].unarchive(sym_lst_copy);
 }
 
-ex archive::unarchive_ex(const lst &sym_lst, unsigned int index) const
+ex archive::unarchive_ex(const lst &sym_lst, unsigned index) const
 {
 	if (index >= exprs.size())
 		throw (std::range_error("index of archived expression out of range"));
 
 	// Recursively unarchive all nodes, starting at the root node
-	return nodes[exprs[index].root].unarchive(sym_lst);
+	lst sym_lst_copy = sym_lst;
+	return nodes[exprs[index].root].unarchive(sym_lst_copy);
 }
 
-ex archive::unarchive_ex(const lst &sym_lst, std::string &name, unsigned int index) const
+ex archive::unarchive_ex(const lst &sym_lst, std::string &name, unsigned index) const
 {
 	if (index >= exprs.size())
 		throw (std::range_error("index of archived expression out of range"));
@@ -110,15 +114,16 @@ ex archive::unarchive_ex(const lst &sym_lst, std::string &name, unsigned int ind
 	name = unatomize(exprs[index].name);
 
 	// Recursively unarchive all nodes, starting at the root node
-	return nodes[exprs[index].root].unarchive(sym_lst);
+	lst sym_lst_copy = sym_lst;
+	return nodes[exprs[index].root].unarchive(sym_lst_copy);
 }
 
-unsigned int archive::num_expressions(void) const
+unsigned archive::num_expressions() const
 {
 	return exprs.size();
 }
 
-const archive_node &archive::get_top_node(unsigned int index) const
+const archive_node &archive::get_top_node(unsigned index) const
 {
 	if (index >= exprs.size())
 		throw (std::range_error("index of archived expression out of range"));
@@ -167,7 +172,7 @@ const archive_node &archive::get_top_node(unsigned int index) const
  */
 
 /** Write unsigned integer quantity to stream. */
-static void write_unsigned(std::ostream &os, unsigned int val)
+static void write_unsigned(std::ostream &os, unsigned val)
 {
 	while (val >= 0x80) {
 		os.put((val & 0x7f) | 0x80);
@@ -177,15 +182,15 @@ static void write_unsigned(std::ostream &os, unsigned int val)
 }
 
 /** Read unsigned integer quantity from stream. */
-static unsigned int read_unsigned(std::istream &is)
+static unsigned read_unsigned(std::istream &is)
 {
 	unsigned char b;
-	unsigned int ret = 0;
-	unsigned int shift = 0;
+	unsigned ret = 0;
+	unsigned shift = 0;
 	do {
-        char b2;
+		char b2;
 		is.get(b2);
-        b = b2;
+		b = b2;
 		ret |= (b & 0x7f) << shift;
 		shift += 7;
 	} while (b & 0x80);
@@ -196,9 +201,9 @@ static unsigned int read_unsigned(std::istream &is)
 std::ostream &operator<<(std::ostream &os, const archive_node &n)
 {
 	// Write properties
-	unsigned int num_props = n.props.size();
+	unsigned num_props = n.props.size();
 	write_unsigned(os, num_props);
-	for (unsigned int i=0; i<num_props; i++) {
+	for (unsigned i=0; i<num_props; i++) {
 		write_unsigned(os, n.props[i].type | (n.props[i].name << 3));
 		write_unsigned(os, n.props[i].value);
 	}
@@ -216,23 +221,23 @@ std::ostream &operator<<(std::ostream &os, const archive &ar)
 	write_unsigned(os, ARCHIVE_VERSION);
 
 	// Write atoms
-	unsigned int num_atoms = ar.atoms.size();
+	unsigned num_atoms = ar.atoms.size();
 	write_unsigned(os, num_atoms);
-	for (unsigned int i=0; i<num_atoms; i++)
+	for (unsigned i=0; i<num_atoms; i++)
 		os << ar.atoms[i] << std::ends;
 
 	// Write expressions
-	unsigned int num_exprs = ar.exprs.size();
+	unsigned num_exprs = ar.exprs.size();
 	write_unsigned(os, num_exprs);
-	for (unsigned int i=0; i<num_exprs; i++) {
+	for (unsigned i=0; i<num_exprs; i++) {
 		write_unsigned(os, ar.exprs[i].name);
 		write_unsigned(os, ar.exprs[i].root);
 	}
 
 	// Write nodes
-	unsigned int num_nodes = ar.nodes.size();
+	unsigned num_nodes = ar.nodes.size();
 	write_unsigned(os, num_nodes);
-	for (unsigned int i=0; i<num_nodes; i++)
+	for (unsigned i=0; i<num_nodes; i++)
 		os << ar.nodes[i];
 	return os;
 }
@@ -241,10 +246,10 @@ std::ostream &operator<<(std::ostream &os, const archive &ar)
 std::istream &operator>>(std::istream &is, archive_node &n)
 {
 	// Read properties
-	unsigned int num_props = read_unsigned(is);
+	unsigned num_props = read_unsigned(is);
 	n.props.resize(num_props);
-	for (unsigned int i=0; i<num_props; i++) {
-		unsigned int name_type = read_unsigned(is);
+	for (unsigned i=0; i<num_props; i++) {
+		unsigned name_type = read_unsigned(is);
 		n.props[i].type = (archive_node::property_type)(name_type & 7);
 		n.props[i].name = name_type >> 3;
 		n.props[i].value = read_unsigned(is);
@@ -260,29 +265,29 @@ std::istream &operator>>(std::istream &is, archive &ar)
 	is.get(c1); is.get(c2); is.get(c3); is.get(c4);
 	if (c1 != 'G' || c2 != 'A' || c3 != 'R' || c4 != 'C')
 		throw (std::runtime_error("not a GiNaC archive (signature not found)"));
-	unsigned int version = read_unsigned(is);
+	unsigned version = read_unsigned(is);
 	if (version > ARCHIVE_VERSION || version < ARCHIVE_VERSION - ARCHIVE_AGE)
 		throw (std::runtime_error("archive version " + ToString(version) + " cannot be read by this GiNaC library (which supports versions " + ToString(ARCHIVE_VERSION-ARCHIVE_AGE) + " thru " + ToString(ARCHIVE_VERSION)));
 
 	// Read atoms
-	unsigned int num_atoms = read_unsigned(is);
+	unsigned num_atoms = read_unsigned(is);
 	ar.atoms.resize(num_atoms);
-	for (unsigned int i=0; i<num_atoms; i++)
+	for (unsigned i=0; i<num_atoms; i++)
 		getline(is, ar.atoms[i], '\0');
 
 	// Read expressions
-	unsigned int num_exprs = read_unsigned(is);
+	unsigned num_exprs = read_unsigned(is);
 	ar.exprs.resize(num_exprs);
-	for (unsigned int i=0; i<num_exprs; i++) {
+	for (unsigned i=0; i<num_exprs; i++) {
 		archive_atom name = read_unsigned(is);
 		archive_node_id root = read_unsigned(is);
 		ar.exprs[i] = archive::archived_ex(name, root);
 	}
 
 	// Read nodes
-	unsigned int num_nodes = read_unsigned(is);
+	unsigned num_nodes = read_unsigned(is);
 	ar.nodes.resize(num_nodes, ar);
-	for (unsigned int i=0; i<num_nodes; i++)
+	for (unsigned i=0; i<num_nodes; i++)
 		is >> ar.nodes[i];
 	return is;
 }
@@ -316,18 +321,11 @@ const std::string &archive::unatomize(archive_atom id) const
 }
 
 
-/** Copy constructor of archive_node. */
-archive_node::archive_node(const archive_node &other)
-  : a(other.a), props(other.props), has_expression(other.has_expression), e(other.e)
-{
-}
-
-
 /** Assignment operator of archive_node. */
 const archive_node &archive_node::operator=(const archive_node &other)
 {
 	if (this != &other) {
-		a = other.a;
+		// archive &a member doesn't get copied
 		props = other.props;
 		has_expression = other.has_expression;
 		e = other.e;
@@ -354,13 +352,34 @@ 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)
 {
 	props.push_back(property(a.atomize(name), PTYPE_BOOL, value));
 }
 
-void archive_node::add_unsigned(const std::string &name, unsigned int value)
+void archive_node::add_unsigned(const std::string &name, unsigned value)
 {
 	props.push_back(property(a.atomize(name), PTYPE_UNSIGNED, value));
 }
@@ -378,73 +397,89 @@ void archive_node::add_ex(const std::string &name, const ex &value)
 }
 
 
-bool archive_node::find_bool(const std::string &name, bool &ret) const
+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) {
-			ret = i->value;
-			return true;
+			if (found_index == index) {
+				ret = i->value;
+				return true;
+			}
+			found_index++;
 		}
 		i++;
 	}
 	return false;
 }
 
-bool archive_node::find_unsigned(const std::string &name, unsigned int &ret) const
+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) {
-			ret = i->value;
-			return true;
+			if (found_index == index) {
+				ret = i->value;
+				return true;
+			}
+			found_index++;
 		}
 		i++;
 	}
 	return false;
 }
 
-bool archive_node::find_string(const std::string &name, std::string &ret) const
+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) {
-			ret = a.unatomize(i->value);
-			return true;
+			if (found_index == index) {
+				ret = a.unatomize(i->value);
+				return true;
+			}
+			found_index++;
 		}
 		i++;
 	}
 	return false;
 }
 
-bool archive_node::find_ex(const std::string &name, ex &ret, const lst &sym_lst, unsigned int index) const
+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();
-	unsigned int found_index = 0;
+	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) {
-			if (found_index == index)
-				goto found;
+			if (found_index == index) {
+				ret = a.get_node(i->value).unarchive(sym_lst);
+				return true;
+			}
 			found_index++;
 		}
 		i++;
 	}
 	return false;
-
-found:
-	ret = a.get_node(i->value).unarchive(sym_lst);
-	return true;
 }
 
-const archive_node &archive_node::find_ex_node(const std::string &name, unsigned int index) const
+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();
-	unsigned int found_index = 0;
+	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) {
 			if (found_index == index)
@@ -457,15 +492,15 @@ const archive_node &archive_node::find_ex_node(const std::string &name, unsigned
 }
 
 
-void archive_node::get_properties(std::vector<archive_node::property_info> &v) const
+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;
-		string name = a.unatomize(i->name);
+		std::string name = a.unatomize(i->name);
 
-		std::vector<property_info>::iterator a = v.begin(), aend = v.end();
+		propinfovector::iterator a = v.begin(), aend = v.end();
 		bool found = false;
 		while (a != aend) {
 			if (a->type == type && a->name == name) {
@@ -473,7 +508,7 @@ void archive_node::get_properties(std::vector<archive_node::property_info> &v) c
 				found = true;
 				break;
 			}
-			a++;
+			++a;
 		}
 		if (!found)
 			v.push_back(property_info(type, name));
@@ -483,7 +518,7 @@ void archive_node::get_properties(std::vector<archive_node::property_info> &v) c
 
 
 /** Convert archive node to GiNaC expression. */
-ex archive_node::unarchive(const lst &sym_lst) const
+ex archive_node::unarchive(lst &sym_lst) const
 {
 	// Already unarchived? Then return cached unarchived expression.
 	if (has_expression)
@@ -502,49 +537,23 @@ ex archive_node::unarchive(const lst &sym_lst) const
 }
 
 
-/** Assignment operator of property_info. */
-const archive_node::property_info &archive_node::property_info::operator=(const property_info &other)
-{
-	if (this != &other) {
-		type = other.type;
-		name = other.name;
-		count = other.count;
-	}
-	return *this;
-}
-
-/** Assignment operator of property. */
-const archive_node::property &archive_node::property::operator=(const property &other)
-{
-	if (this != &other) {
-		type = other.type;
-		name = other.name;
-		value = other.value;
-	}
-	return *this;
-}
-
-
-void archive::clear(void)
+void archive::clear()
 {
 	atoms.clear();
 	exprs.clear();
 	nodes.clear();
+	exprtable.clear();
 }
 
 
 /** Delete cached unarchived expressions in all archive_nodes (mainly for debugging). */
-void archive::forget(void)
+void archive::forget()
 {
-	std::vector<archive_node>::iterator i = nodes.begin(), iend = nodes.end();
-	while (i != iend) {
-		i->forget();
-		i++;
-	}
+	for_each(nodes.begin(), nodes.end(), std::mem_fun_ref(&archive_node::forget));
 }
 
 /** Delete cached unarchived expressions from node (for debugging). */
-void archive_node::forget(void)
+void archive_node::forget()
 {
 	has_expression = false;
 	e = 0;
@@ -570,7 +579,7 @@ void archive::printraw(std::ostream &os) const
 	os << "Expressions:\n";
 	{
 		std::vector<archived_ex>::const_iterator i = exprs.begin(), iend = exprs.end();
-		unsigned int index = 0;
+		unsigned index = 0;
 		while (i != iend) {
 			os << " " << index << " \"" << unatomize(i->name) << "\" root node " << i->root << std::endl;
 			i++; index++;
@@ -601,7 +610,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) {
@@ -618,7 +627,7 @@ void archive_node::printraw(std::ostream &os) const
 
 /** Create a dummy archive.  The intention is to fill archive_node's default
  *  ctor, which is currently a Cint-requirement. */
-archive* archive_node::dummy_ar_creator(void)
+archive* archive_node::dummy_ar_creator()
 {
 	static archive* some_ar = new archive;
 	return some_ar;