Use C++11 'auto' and range-based for loops where possible.

[ginac.git] / ginac / archive.cpp

diff --git a/ginac/archive.cpp b/ginac/archive.cpp
index 27ebfb8970a219349df7d54e4f3eebcc5d34aaed..566c0c1319f80800a5ec6c05ae836646ad4e5567 100644 (file)
--- a/ginac/archive.cpp
+++ b/ginac/archive.cpp
@@ -54,7 +54,7 @@ archive_node_id archive::add_node(const archive_node &n)
 {
        // 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);
@@ -83,7 +83,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<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;
@@ -360,7 +360,7 @@ 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)
+       for (auto i=props.begin(); i!=props.end(); ++i)
                if (i->name == name_atom)
                        return i;
        return props.end();;
@@ -370,7 +370,7 @@ 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();) {
+       for (auto i=props.end(); i!=props.begin();) {
                --i;
                if (i->name == name_atom)
                        return i;
@@ -404,7 +404,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);
-       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) {
@@ -422,7 +422,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);
-       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) {
@@ -440,7 +440,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);
-       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) {
@@ -464,7 +464,7 @@ void archive_node::find_ex_by_loc(archive_node_cit loc, ex &ret, lst &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) {
@@ -482,7 +482,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);
-       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) {
@@ -499,12 +499,12 @@ const archive_node &archive_node::find_ex_node(const std::string &name, unsigned
 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) {
@@ -625,7 +625,7 @@ void archive::printraw(std::ostream &os) const
        // 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;
@@ -637,7 +637,7 @@ void archive::printraw(std::ostream &os) const
        // 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 << " ";
@@ -657,7 +657,7 @@ void archive_node::printraw(std::ostream &os) const
                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) {