* Archiving of GiNaC expressions. */
/*
- * GiNaC Copyright (C) 1999-2011 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
#include "registrar.h"
#include "ex.h"
#include "lst.h"
-#include "config.h"
-#include "tostring.h"
+#include "version.h"
#include <iostream>
#include <stdexcept>
// 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);
}
{
// Look if expression is known to be in some node already.
if (n.has_ex()) {
- mapit i = exprtable.find(n.get_ex());
+ auto i = exprtable.find(n.get_ex());
if (i != exprtable.end())
return i->second;
nodes.push_back(n);
// Find root node
std::string name_string = name;
archive_atom id = atomize(name_string);
- std::vector<archived_ex>::const_iterator i = exprs.begin(), iend = exprs.end();
+ auto i = exprs.begin(), iend = exprs.end();
while (i != iend) {
if (i->name == id)
goto found;
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();
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);
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];
}
}
archive_node::archive_node_cit
- archive_node::find_first(const std::string &name) const
-{
+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)
+ for (auto i=props.begin(); i!=props.end(); ++i)
if (i->name == name_atom)
return i;
- return props.end();;
+ return props.end();
}
archive_node::archive_node_cit
- archive_node::find_last(const std::string &name) const
+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();) {
+ 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);
- archive_node_cit 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) {
bool archive_node::find_unsigned(const std::string &name, unsigned &ret, unsigned index) const
{
archive_atom name_atom = a.atomize(name);
- archive_node_cit 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) {
bool archive_node::find_string(const std::string &name, std::string &ret, unsigned index) const
{
archive_atom name_atom = a.atomize(name);
- archive_node_cit 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) {
return false;
}
-void archive_node::find_ex_by_loc(archive_node_cit loc, ex &ret, lst &sym_lst)
- 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);
- archive_node_cit 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) {
const archive_node &archive_node::find_ex_node(const std::string &name, unsigned index) const
{
archive_atom name_atom = a.atomize(name);
- archive_node_cit 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) {
void archive_node::get_properties(propinfovector &v) const
{
v.clear();
- archive_node_cit 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) {
++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)
}
int unarchive_table_t::usecount = 0;
-unarchive_map_t* unarchive_table_t::unarch_map = 0;
+unarchive_map_t* unarchive_table_t::unarch_map = nullptr;
unarchive_table_t::unarchive_table_t()
{
// Dump expressions
os << "Expressions:\n";
{
- std::vector<archived_ex>::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;
// Dump nodes
os << "Nodes:\n";
{
- std::vector<archive_node>::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 << " ";
os << "\n";
// Dump properties
- archive_node_cit i = props.begin(), iend = props.end();
+ auto i = props.begin(), iend = props.end();
while (i != iend) {
os << " ";
switch (i->type) {
}
}
-/** 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()
-{
- static archive* some_ar = new archive;
- return some_ar;
-}
-
} // namespace GiNaC
git://www.ginac.de / ginac.git / blobdiff