X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Farchive.cpp;h=43b2667cac1c9e0b80c59df913f516726820da6b;hp=dcfb00dc9c37e382cb0ae88550cec11adaf4fd93;hb=3ab9a310275c0289ec5ae6deaf3b970aca6904e9;hpb=7d10a252470cc6501b2c66bf9d6774c79b093761

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index dcfb00dc..43b2667c 100644
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -3,7 +3,7 @@
  *  Archiving of GiNaC expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2001 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
@@ -29,14 +29,9 @@
 #include "config.h"
 #include "utils.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 
-/** Archive an expression.
- *  @param ex  the expression to be archived
- *  @param name  name under which the expression is stored */
 void archive::archive_ex(const ex &e, const char *name)
 {
 	// Create root node (which recursively archives the whole expression tree)
@@ -79,8 +74,6 @@ archive_node &archive::get_node(archive_node_id id)
 }
 
 
-/** Retrieve expression from archive by name.
- *  @param sym_lst  list of pre-defined symbols */
 ex archive::unarchive_ex(const lst &sym_lst, const char *name) const
 {
 	// Find root node
@@ -92,15 +85,13 @@ ex archive::unarchive_ex(const lst &sym_lst, const char *name) const
 			goto found;
 		i++;
 	}
-	throw (std::logic_error("expression with name '" + name_string + "' not found in archive"));
+	throw (std::runtime_error("expression with name '" + name_string + "' not found in archive"));
 
 found:
 	// Recursively unarchive all nodes, starting at the root node
 	return nodes[i->root].unarchive(sym_lst);
 }
 
-/** Retrieve expression from archive by index.
- *  @param sym_lst  list of pre-defined symbols */
 ex archive::unarchive_ex(const lst &sym_lst, unsigned int index) const
 {
 	if (index >= exprs.size())
@@ -110,8 +101,6 @@ ex archive::unarchive_ex(const lst &sym_lst, unsigned int index) const
 	return nodes[exprs[index].root].unarchive(sym_lst);
 }
 
-/** Retrieve expression and its name from archive by index.
- *  @param sym_lst  list of pre-defined symbols */
 ex archive::unarchive_ex(const lst &sym_lst, std::string &name, unsigned int index) const
 {
 	if (index >= exprs.size())
@@ -124,13 +113,19 @@ ex archive::unarchive_ex(const lst &sym_lst, std::string &name, unsigned int ind
 	return nodes[exprs[index].root].unarchive(sym_lst);
 }
 
-
-/** Return number of archived expressions. */
 unsigned int archive::num_expressions(void) const
 {
 	return exprs.size();
 }
 
+const archive_node &archive::get_top_node(unsigned int index) const
+{
+	if (index >= exprs.size())
+		throw (std::range_error("index of archived expression out of range"));
+
+	return nodes[exprs[index].root];
+}
+
 
 /*
  *  Archive file format
@@ -174,7 +169,7 @@ unsigned int archive::num_expressions(void) const
 /** Write unsigned integer quantity to stream. */
 static void write_unsigned(std::ostream &os, unsigned int val)
 {
-	while (val > 0x80) {
+	while (val >= 0x80) {
 		os.put((val & 0x7f) | 0x80);
 		val >>= 7;
 	}
@@ -188,7 +183,9 @@ static unsigned int read_unsigned(std::istream &is)
 	unsigned int ret = 0;
 	unsigned int shift = 0;
 	do {
-		is.get(b);
+        char b2;
+		is.get(b2);
+        b = b2;
 		ret |= (b & 0x7f) << shift;
 		shift += 7;
 	} while (b & 0x80);
@@ -222,7 +219,7 @@ std::ostream &operator<<(std::ostream &os, const archive &ar)
 	unsigned int num_atoms = ar.atoms.size();
 	write_unsigned(os, num_atoms);
 	for (unsigned int i=0; i<num_atoms; i++)
-		os << ar.atoms[i] << ends;
+		os << ar.atoms[i] << std::ends;
 
 	// Write expressions
 	unsigned int num_exprs = ar.exprs.size();
@@ -358,25 +355,21 @@ bool archive_node::has_same_ex_as(const archive_node &other) const
 }
 
 
-/** Add property of type "bool" to node. */
 void archive_node::add_bool(const std::string &name, bool value)
 {
 	props.push_back(property(a.atomize(name), PTYPE_BOOL, value));
 }
 
-/** Add property of type "unsigned int" to node. */
 void archive_node::add_unsigned(const std::string &name, unsigned int value)
 {
 	props.push_back(property(a.atomize(name), PTYPE_UNSIGNED, value));
 }
 
-/** Add property of type "string" to node. */
 void archive_node::add_string(const std::string &name, const std::string &value)
 {
 	props.push_back(property(a.atomize(name), PTYPE_STRING, a.atomize(value)));
 }
 
-/** Add property of type "ex" to node. */
 void archive_node::add_ex(const std::string &name, const ex &value)
 {
 	// Recursively create an archive_node and add its ID to the properties of this node
@@ -385,8 +378,6 @@ void archive_node::add_ex(const std::string &name, const ex &value)
 }
 
 
-/** Retrieve property of type "bool" from node.
- *  @return "true" if property was found, "false" otherwise */
 bool archive_node::find_bool(const std::string &name, bool &ret) const
 {
 	archive_atom name_atom = a.atomize(name);
@@ -401,8 +392,6 @@ bool archive_node::find_bool(const std::string &name, bool &ret) const
 	return false;
 }
 
-/** Retrieve property of type "unsigned" from node.
- *  @return "true" if property was found, "false" otherwise */
 bool archive_node::find_unsigned(const std::string &name, unsigned int &ret) const
 {
 	archive_atom name_atom = a.atomize(name);
@@ -417,8 +406,6 @@ bool archive_node::find_unsigned(const std::string &name, unsigned int &ret) con
 	return false;
 }
 
-/** Retrieve property of type "string" from node.
- *  @return "true" if property was found, "false" otherwise */
 bool archive_node::find_string(const std::string &name, std::string &ret) const
 {
 	archive_atom name_atom = a.atomize(name);
@@ -433,8 +420,6 @@ bool archive_node::find_string(const std::string &name, std::string &ret) const
 	return false;
 }
 
-/** Retrieve property of type "ex" from node.
- *  @return "true" if property was found, "false" otherwise */
 bool archive_node::find_ex(const std::string &name, ex &ret, const lst &sym_lst, unsigned int index) const
 {
 	archive_atom name_atom = a.atomize(name);
@@ -455,6 +440,47 @@ found:
 	return true;
 }
 
+const archive_node &archive_node::find_ex_node(const std::string &name, unsigned int 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;
+	while (i != iend) {
+		if (i->type == PTYPE_NODE && i->name == name_atom) {
+			if (found_index == index)
+				return a.get_node(i->value);
+			found_index++;
+		}
+		i++;
+	}
+	throw (std::runtime_error("property with name '" + name + "' not found in archive node"));
+}
+
+
+void archive_node::get_properties(std::vector<archive_node::property_info> &v) const
+{
+	v.clear();
+	std::vector<property>::const_iterator i = props.begin(), iend = props.end();
+	while (i != iend) {
+		property_type type = i->type;
+		string name = a.unatomize(i->name);
+
+		std::vector<property_info>::iterator a = v.begin(), aend = v.end();
+		bool found = false;
+		while (a != aend) {
+			if (a->type == type && a->name == name) {
+				a->count++;
+				found = true;
+				break;
+			}
+			a++;
+		}
+		if (!found)
+			v.push_back(property_info(type, name));
+		i++;
+	}	
+}
+
 
 /** Convert archive node to GiNaC expression. */
 ex archive_node::unarchive(const lst &sym_lst) const
@@ -476,6 +502,17 @@ 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)
 {
@@ -488,7 +525,6 @@ const archive_node::property &archive_node::property::operator=(const property &
 }
 
 
-/** Clear all archived expressions. */
 void archive::clear(void)
 {
 	atoms.clear();
@@ -524,11 +560,11 @@ void archive::printraw(std::ostream &os) const
 		std::vector<std::string>::const_iterator i = atoms.begin(), iend = atoms.end();
 		archive_atom id = 0;
 		while (i != iend) {
-			os << " " << id << " " << *i << endl;
+			os << " " << id << " " << *i << std::endl;
 			i++; id++;
 		}
 	}
-	os << endl;
+	os << std::endl;
 
 	// Dump expressions
 	os << "Expressions:\n";
@@ -536,11 +572,11 @@ void archive::printraw(std::ostream &os) const
 		std::vector<archived_ex>::const_iterator i = exprs.begin(), iend = exprs.end();
 		unsigned int index = 0;
 		while (i != iend) {
-			os << " " << index << " \"" << unatomize(i->name) << "\" root node " << i->root << endl;
+			os << " " << index << " \"" << unatomize(i->name) << "\" root node " << i->root << std::endl;
 			i++; index++;
 		}
 	}
-	os << endl;
+	os << std::endl;
 
 	// Dump nodes
 	os << "Nodes:\n";
@@ -575,7 +611,7 @@ void archive_node::printraw(std::ostream &os) const
 			case PTYPE_NODE: os << "node"; break;
 			default: os << "<unknown>"; break;
 		}
-		os << " \"" << a.unatomize(i->name) << "\" " << i->value << endl;
+		os << " \"" << a.unatomize(i->name) << "\" " << i->value << std::endl;
 		i++;
 	}
 }
@@ -589,6 +625,4 @@ archive* archive_node::dummy_ar_creator(void)
 }
 
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC