X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Farchive.cpp;h=6fc690071c8b16ad2e5761cc3672ebdccf6b7eed;hb=e62c12d0c93db3a1da2bc25532ffbf23e41c6292;hp=c547916a5875ba2302a77df6316f67b5c76376b5;hpb=ed21ddd5e2bc0af018c10934342f526d0ae4b7a7;p=ginac.git diff --git a/ginac/archive.cpp b/ginac/archive.cpp index c547916a..6fc69007 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-2020 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,17 +17,17 @@ * * 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 -#include - #include "archive.h" #include "registrar.h" #include "ex.h" -#include "config.h" -#include "utils.h" +#include "lst.h" +#include "version.h" + +#include +#include namespace GiNaC { @@ -40,7 +40,7 @@ void archive::archive_ex(const ex &e, const char *name) // Add root node ID to list of archived expressions archived_ex ae = archived_ex(atomize(name), id); - exprs.push_back(ae); + exprs.emplace_back(ae); } @@ -49,18 +49,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::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()) { + auto 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; } @@ -79,7 +80,7 @@ ex archive::unarchive_ex(const lst &sym_lst, const char *name) const // Find root node std::string name_string = name; archive_atom id = atomize(name_string); - std::vector::const_iterator i = exprs.begin(), iend = exprs.end(); + auto i = exprs.begin(), iend = exprs.end(); while (i != iend) { if (i->name == id) goto found; @@ -89,7 +90,8 @@ 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 index) const @@ -98,7 +100,8 @@ ex archive::unarchive_ex(const lst &sym_lst, unsigned index) const 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 index) const @@ -110,10 +113,11 @@ ex archive::unarchive_ex(const lst &sym_lst, std::string &name, unsigned index) 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 archive::num_expressions(void) const +unsigned archive::num_expressions() const { return exprs.size(); } @@ -183,9 +187,9 @@ static unsigned read_unsigned(std::istream &is) 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); @@ -213,7 +217,7 @@ std::ostream &operator<<(std::ostream &os, const archive &ar) os.put('A'); os.put('R'); os.put('C'); - write_unsigned(os, ARCHIVE_VERSION); + write_unsigned(os, GINACLIB_ARCHIVE_VERSION); // Write atoms unsigned num_atoms = ar.atoms.size(); @@ -260,15 +264,19 @@ 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)")); + constexpr unsigned max_version = GINACLIB_ARCHIVE_VERSION; + constexpr unsigned min_version = GINACLIB_ARCHIVE_VERSION - GINACLIB_ARCHIVE_AGE; 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))); + if ((version > max_version) || (version < min_version)) + throw (std::runtime_error("archive version " + std::to_string(version) + " cannot be read by this GiNaC library (which supports versions " + std::to_string(min_version) + " thru " + std::to_string(max_version))); // Read atoms unsigned num_atoms = read_unsigned(is); ar.atoms.resize(num_atoms); - for (unsigned i=0; i>(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::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; } @@ -310,24 +316,17 @@ archive_atom archive::atomize(const std::string &s) const const std::string &archive::unatomize(archive_atom id) const { if (id >= atoms.size()) - throw (std::range_error("archive::unatomizee(): atom ID out of range")); + throw (std::range_error("archive::unatomize(): atom ID out of range")); return atoms[id]; } -/** 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,34 +353,72 @@ 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 (auto 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 (auto i=props.end(); i!=props.begin();) { + --i; + if (i->name == name_atom) + return i; + } + return props.end(); +} + +archive_node::archive_node_cit_range +archive_node::find_property_range(const std::string &name1, const std::string &name2) const +{ + archive_atom name1_atom = a.atomize(name1), + name2_atom = a.atomize(name2); + archive_node_cit_range range = {props.end(), props.end()}; + for (auto i=props.begin(); i!=props.end(); ++i) { + if (i->name == name1_atom && range.begin == props.end()) { + range.begin = i; + } + if (i->name == name2_atom && range.begin != props.end()) { + range.end = i + 1; + } + } + return range; +} void archive_node::add_bool(const std::string &name, bool value) { - props.push_back(property(a.atomize(name), PTYPE_BOOL, value)); + props.emplace_back(property(a.atomize(name), PTYPE_BOOL, value)); } void archive_node::add_unsigned(const std::string &name, unsigned value) { - props.push_back(property(a.atomize(name), PTYPE_UNSIGNED, value)); + props.emplace_back(property(a.atomize(name), PTYPE_UNSIGNED, value)); } 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))); + props.emplace_back(property(a.atomize(name), PTYPE_STRING, a.atomize(value))); } 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 archive_node_id id = a.add_node(archive_node(a, value)); - props.push_back(property(a.atomize(name), PTYPE_NODE, id)); + props.emplace_back(property(a.atomize(name), PTYPE_NODE, id)); } bool archive_node::find_bool(const std::string &name, bool &ret, unsigned index) const { archive_atom name_atom = a.atomize(name); - std::vector::const_iterator i = props.begin(), iend = props.end(); + auto i = props.begin(), iend = props.end(); unsigned found_index = 0; while (i != iend) { if (i->type == PTYPE_BOOL && i->name == name_atom) { @@ -399,7 +436,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::const_iterator i = props.begin(), iend = props.end(); + auto i = props.begin(), iend = props.end(); unsigned found_index = 0; while (i != iend) { if (i->type == PTYPE_UNSIGNED && i->name == name_atom) { @@ -417,7 +454,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::const_iterator i = props.begin(), iend = props.end(); + auto i = props.begin(), iend = props.end(); unsigned found_index = 0; while (i != iend) { if (i->type == PTYPE_STRING && i->name == name_atom) { @@ -432,10 +469,15 @@ bool archive_node::find_string(const std::string &name, std::string &ret, unsign return false; } -bool archive_node::find_ex(const std::string &name, ex &ret, const lst &sym_lst, unsigned 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::const_iterator i = props.begin(), iend = props.end(); + auto i = props.begin(), iend = props.end(); unsigned found_index = 0; while (i != iend) { if (i->type == PTYPE_NODE && i->name == name_atom) { @@ -453,7 +495,7 @@ bool archive_node::find_ex(const std::string &name, ex &ret, const lst &sym_lst, const archive_node &archive_node::find_ex_node(const std::string &name, unsigned index) const { archive_atom name_atom = a.atomize(name); - std::vector::const_iterator i = props.begin(), iend = props.end(); + auto i = props.begin(), iend = props.end(); unsigned found_index = 0; while (i != iend) { if (i->type == PTYPE_NODE && i->name == name_atom) { @@ -470,12 +512,12 @@ 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::const_iterator i = props.begin(), iend = props.end(); + auto i = props.begin(), iend = props.end(); while (i != iend) { property_type type = i->type; std::string name = a.unatomize(i->name); - propinfovector::iterator a = v.begin(), aend = v.end(); + auto a = v.begin(), aend = v.end(); bool found = false; while (a != aend) { if (a->type == type && a->name == name) { @@ -486,14 +528,20 @@ void archive_node::get_properties(propinfovector &v) const ++a; } if (!found) - v.push_back(property_info(type, name)); + v.emplace_back(property_info(type, name)); i++; - } + } } +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(const lst &sym_lst) const +ex archive_node::unarchive(lst &sym_lst) const { // Already unarchived? Then return cached unarchived expression. if (has_expression) @@ -503,54 +551,69 @@ ex archive_node::unarchive(const 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 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 = nullptr; -/** Assignment operator of property_info. */ -const archive_node::property_info &archive_node::property_info::operator=(const property_info &other) +unarchive_table_t::unarchive_table_t() { - if (this != &other) { - type = other.type; - name = other.name; - count = other.count; - } - return *this; + if (usecount == 0) + unarch_map = new unarchive_map_t(); + ++usecount; } -/** Assignment operator of property. */ -const archive_node::property &archive_node::property::operator=(const property &other) +synthesize_func unarchive_table_t::find(const std::string& classname) const { - if (this != &other) { - type = other.type; - name = other.name; - value = other.value; - } - return *this; + 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; +} -void archive::clear(void) +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(); } /** Delete cached unarchived expressions in all archive_nodes (mainly for debugging). */ -void archive::forget(void) +void archive::forget() { 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; @@ -575,7 +638,7 @@ void archive::printraw(std::ostream &os) const // Dump expressions os << "Expressions:\n"; { - std::vector::const_iterator i = exprs.begin(), iend = exprs.end(); + auto i = exprs.begin(), iend = exprs.end(); unsigned index = 0; while (i != iend) { os << " " << index << " \"" << unatomize(i->name) << "\" root node " << i->root << std::endl; @@ -587,7 +650,7 @@ void archive::printraw(std::ostream &os) const // Dump nodes os << "Nodes:\n"; { - std::vector::const_iterator i = nodes.begin(), iend = nodes.end(); + auto i = nodes.begin(), iend = nodes.end(); archive_node_id id = 0; while (i != iend) { os << " " << id << " "; @@ -607,7 +670,7 @@ void archive_node::printraw(std::ostream &os) const os << "\n"; // Dump properties - std::vector::const_iterator i = props.begin(), iend = props.end(); + auto i = props.begin(), iend = props.end(); while (i != iend) { os << " "; switch (i->type) { @@ -622,13 +685,5 @@ 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) -{ - static archive* some_ar = new archive; - return some_ar; -} - } // namespace GiNaC