validDeckName uses all_of

Favours std::algorithm over hand-written loop.
2016-04-05 23:08:42 +02:00
parent 76336e2047
commit 3f3cb8c313
1 changed files with 5 additions and 11 deletions
--- a/opm/parser/eclipse/Parser/ParserKeyword.cpp
+++ b/opm/parser/eclipse/Parser/ParserKeyword.cpp
@@ -248,17 +248,11 @@ namespace Opm {
        if (!validNameStart(upperCaseName))
            return false;

-        for (size_t i = 1; i < upperCaseName.length(); i++) {
-            char c = upperCaseName[i];
-            if (!isalnum(c) &&
-                c != '-' &&
-                c != '_' &&
-                c != '+')
-            {
-                return false;
-            }
-        }
-        return true;
+        const auto valid = []( char c ) {
+            return std::isalnum( c ) || c == '-' || c == '_' || c == '+';
+        };
+
+        return std::all_of( name.begin() + 1, name.end(), valid );
    }

    bool ParserKeyword::hasMultipleDeckNames() const {