Merge branch 'style-string-access' into 'develop'

Consistent use of string methods

See merge request !128

applications/test/string/Test-string.C

@@ -83,7 +83,8 @@ int main(int argc, char *argv[])
     Info<<"camel-case => " << (word("camel") & "case") << nl;
     for (const auto& s : { " text with \"spaces'", "08/15 value" })
     {
-        Info<<"validated \"" << s << "\" => " <<  word::validated(s) << nl;
+        Info<<"validated \"" << s << "\" => "
+            << word::validated(s, true) << nl;
     }
     Info<< nl;
 

applications/test/stringSplit/Make/files

@@ -0,0 +1,3 @@
+Test-stringSplit.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-stringSplit

applications/test/stringSplit/Test-stringSplit.C

@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    Test-stringSplit
+
+Description
+    Test string splitting
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "fileName.H"
+#include "stringOps.H"
+
+using namespace Foam;
+
+template<class String>
+void printSplitting(const String& str, const char delimiter)
+{
+    auto split = stringOps::split(str, delimiter);
+
+    Info<< "string {" << str.size() << " chars} = " << str << nl
+        << split.size() << " elements {" << split.length() << " chars}"
+        << nl;
+
+    unsigned i = 0;
+    for (const auto s : split)
+    {
+        Info<< "[" << i++ << "] {" << s.length() << " chars} = "
+            << s.str() << nl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noParallel();
+
+    argList args(argc, argv, false, true);
+
+    if (args.size() <= 1 && args.options().empty())
+    {
+        args.printUsage();
+    }
+
+    for (label argi=1; argi < args.size(); ++argi)
+    {
+        printSplitting(args[argi], '/');
+    }
+
+    Info<< "\nEnd\n" << endl;
+    return 0;
+}
+
+
+// ************************************************************************* //

applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L

@@ -221,6 +221,7 @@ redundantBlock             {space}({comment}|{unknownPeriodicFace}|{periodicFace
 endOfSection               {space}")"{space}
 
 
+/* balance "-quoted for editor */
 
  /* ------------------------------------------------------------------------ *\
                       -----  Exclusive start states -----
@@ -693,7 +694,7 @@ endOfSection               {space}")"{space}
 {lbrac}{label} {
         Warning
             << "Found unknown block of type: "
-            << Foam::string(YYText())(1, YYLeng()-1) << nl
+            << std::string(YYText()).substr(1, YYLeng()-1) << nl
             << "    on line " << lineNo << endl;
 
         yy_push_state(ignoreBlock);

applications/utilities/mesh/manipulation/setSet/setSet.C

@@ -903,10 +903,10 @@ int main(int argc, char *argv[])
             }
 
             // Strip off anything after #
-            string::size_type i = rawLine.find_first_of("#");
+            string::size_type i = rawLine.find('#');
             if (i != string::npos)
             {
-                rawLine = rawLine(0, i);
+                rawLine.resize(i);
             }
 
             if (rawLine.empty())

applications/utilities/preProcessing/changeDictionary/changeDictionary.C

@@ -254,7 +254,7 @@ bool merge
 
         if (key[0] == '~')
         {
-            word eraseKey = key(1, key.size()-1);
+            const word eraseKey = key.substr(1);
             if (thisDict.remove(eraseKey))
             {
                 // Mark thisDict entry as having been match for wildcard
@@ -325,7 +325,7 @@ bool merge
 
             if (key[0] == '~')
             {
-                word eraseKey = key(1, key.size()-1);
+                const word eraseKey = key.substr(1);
 
                 // List of indices into thisKeys
                 labelList matches

src/OSspecific/POSIX/POSIX.C

@@ -88,7 +88,7 @@ static inline bool isBackupName(const Foam::fileName& name)
     {
         return false;
     }
-    else if (name[name.size()-1] == '~')
+    else if (name.back() == '~')
     {
         return true;
     }

src/OSspecific/POSIX/printStack.C

@@ -40,12 +40,11 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-string pOpen(const string &cmd, label line=0)
+string pOpen(const string& cmd, label line=0)
 {
-    string res = "\n";
+    string res;
 
     FILE *cmdPipe = popen(cmd.c_str(), "r");
-
     if (cmdPipe)
     {
         char *buf = nullptr;
@@ -54,8 +53,7 @@ string pOpen(const string &cmd, label line=0)
         for (label cnt = 0; cnt <= line; cnt++)
         {
             size_t linecap = 0;
-            ssize_t linelen;
+            ssize_t linelen = ::getline(&buf, &linecap, cmdPipe);
-            linelen = ::getline(&buf, &linecap, cmdPipe);
 
             if (linelen < 0)
             {
@@ -65,6 +63,11 @@ string pOpen(const string &cmd, label line=0)
             if (cnt == line)
             {
                 res = string(buf);
+                // Trim trailing newline
+                if (res.size())
+                {
+                    res.resize(res.size()-1);
+                }
                 break;
             }
         }
@@ -77,7 +80,7 @@ string pOpen(const string &cmd, label line=0)
         pclose(cmdPipe);
     }
 
-    return res.substr(0, res.size() - 1);
+    return res;
 }
 
 

src/OpenFOAM/db/IOstreams/Sstreams/ISstream.C

@@ -604,13 +604,14 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
         // Read, counting brackets
         buf[nChar++] = c;
 
+        // Also allow '/' between ${...} blocks for slash-scoping of entries
         while
         (
             get(c)
          && (
                 c == token::BEGIN_BLOCK
              || c == token::END_BLOCK
-             || word::valid(c)
+             || word::valid(c) || c == '/'
             )
         )
         {
@@ -620,7 +621,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
                 buf[errLen] = '\0';
 
                 FatalIOErrorInFunction(*this)
-                    << "word '" << buf << "...'\n"
+                    << "variable '" << buf << "...'\n"
                     << "    is too long (max. " << maxLen << " characters)"
                     << exit(FatalIOError);
 
@@ -656,7 +657,7 @@ Foam::Istream& Foam::ISstream::readVariable(string& str)
                 buf[errLen] = '\0';
 
                 FatalIOErrorInFunction(*this)
-                    << "word '" << buf << "...'\n"
+                    << "variable '" << buf << "...'\n"
                     << "    is too long (max. " << maxLen << " characters)"
                     << exit(FatalIOError);
 

src/OpenFOAM/db/dictionary/dictionaryIO.C

@@ -130,7 +130,7 @@ bool Foam::dictionary::read(Istream& is)
 
 bool Foam::dictionary::substituteKeyword(const word& keyword, bool mergeEntry)
 {
-    const word varName = keyword(1, keyword.size()-1);
+    const word varName = keyword.substr(1);
 
     // Lookup the variable name in the given dictionary
     const entry* ePtr = lookupEntryPtr(varName, true, true);

src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C

@@ -210,7 +210,7 @@ bool Foam::functionObjectList::readFunctionObject
         {
             if (argLevel == 0)
             {
-                funcName = funcNameArgs(start, i - start);
+                funcName = funcNameArgs.substr(start, i - start);
                 start = i+1;
             }
             ++argLevel;
@@ -226,7 +226,7 @@ bool Foam::functionObjectList::readFunctionObject
                         Tuple2<word, string>
                         (
                             argName,
-                            funcNameArgs(start, i - start)
+                            funcNameArgs.substr(start, i - start)
                         )
                     );
                     namedArg = false;
@@ -235,7 +235,10 @@ bool Foam::functionObjectList::readFunctionObject
                 {
                     args.append
                     (
-                        string::validate<word>(funcNameArgs(start, i - start))
+                        string::validate<word>
+                        (
+                            funcNameArgs.substr(start, i - start)
+                        )
                     );
                 }
                 start = i+1;
@@ -252,7 +255,11 @@ bool Foam::functionObjectList::readFunctionObject
         }
         else if (c == '=')
         {
-            argName = string::validate<word>(funcNameArgs(start, i - start));
+            argName = string::validate<word>
+            (
+                funcNameArgs.substr(start, i - start)
+            );
+
             start = i+1;
             namedArg = true;
         }

src/OpenFOAM/dimensionSet/dimensionSetIO.C

@@ -140,7 +140,7 @@ void Foam::dimensionSet::tokeniser::splitWord(const word& w)
         {
             if (i > start)
             {
-                word subWord = w(start, i-start);
+                const word subWord = w.substr(start, i-start);
                 if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
                 {
                     push(token(readScalar(IStringStream(subWord)())));
@@ -166,7 +166,7 @@ void Foam::dimensionSet::tokeniser::splitWord(const word& w)
     }
     if (start < w.size())
     {
-        word subWord = w(start, w.size()-start);
+        const word subWord = w.substr(start);
         if (isdigit(subWord[0]) || subWord[0] == token::SUBTRACT)
         {
             push(token(readScalar(IStringStream(subWord)())));
@@ -524,9 +524,9 @@ Foam::Istream& Foam::dimensionSet::read
         do
         {
             word symbolPow = nextToken.wordToken();
-            if (symbolPow[symbolPow.size()-1] == token::END_SQR)
+            if (symbolPow.back() == token::END_SQR)
             {
-                symbolPow = symbolPow(0, symbolPow.size()-1);
+                symbolPow.resize(symbolPow.size()-1);
                 continueParsing = false;
             }
 
@@ -537,8 +537,8 @@ Foam::Istream& Foam::dimensionSet::read
             size_t index = symbolPow.find('^');
             if (index != string::npos)
             {
-                word symbol = symbolPow(0, index);
+                const word symbol = symbolPow.substr(0, index);
-                word exp = symbolPow(index+1, symbolPow.size()-index+1);
+                const word exp = symbolPow.substr(index+1);
                 scalar exponent = readScalar(IStringStream(exp)());
 
                 dimensionedScalar s;
@@ -580,9 +580,9 @@ Foam::Istream& Foam::dimensionSet::read
     {
         // Read first five dimensions
         exponents_[dimensionSet::MASS] = nextToken.number();
-        for (int Dimension=1; Dimension<dimensionSet::CURRENT; Dimension++)
+        for (int d=1; d < dimensionSet::CURRENT; ++d)
         {
-            is >> exponents_[Dimension];
+            is >> exponents_[d];
         }
 
         // Read next token

src/OpenFOAM/matrices/solution/solution.C

@@ -76,16 +76,13 @@ void Foam::solution::read(const dictionary& dict)
                 const word& e = entryNames[i];
                 scalar value = readScalar(relaxDict.lookup(e));
 
-                if (e(0, 1) == "p")
+                if (e.startsWith("p"))
                 {
                     fieldRelaxDict_.add(e, value);
                 }
-                else if (e.length() >= 3)
+                else if (e.startsWith("rho"))
                 {
-                    if (e(0, 3) == "rho")
+                    fieldRelaxDict_.add(e, value);
-                    {
-                        fieldRelaxDict_.add(e, value);
-                    }
                 }
 
             }

src/OpenFOAM/primitives/strings/lists/SubStrings.H

@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::SubStrings
+
+Description
+    Sub-ranges of a string with a structure similar to std::match_results,
+    but without the underlying regular expression matching.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SubStrings_H
+#define SubStrings_H
+
+#include <string>
+#include <regex>
+#include <vector>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class SubStrings Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class String>
+class SubStrings
+:
+    public std::vector<std::sub_match<typename String::const_iterator>>
+{
+public:
+
+    // Typedefs
+
+        //- The element type
+        using value_type =
+            typename std::sub_match<typename String::const_iterator>;
+
+        //- The const_iterator for the underlying string type
+        using string_iterator = typename String::const_iterator;
+
+
+    // Constructors
+
+        //- Construct null
+        SubStrings()
+        {}
+
+
+    // Member Functions
+
+        //- The total length of all sub-elements.
+        //  Use size() for the number elements.
+        std::string::size_type length() const
+        {
+            std::string::size_type len = 0;
+
+            for (const auto& elem : *this)
+            {
+                len += elem.length();
+            }
+
+            return len;
+        }
+
+
+        //- Append sub-string defined by begin/end iterators
+        void append(string_iterator b, string_iterator e)
+        {
+            value_type range;
+            range.first = b;
+            range.second = e;
+            range.matched = true;
+
+            this->push_back(range);
+        }
+
+
+        //- Const reference to the first element,
+        //  for consistency with other OpenFOAM containers
+        auto first() const -> decltype(this->front())
+        {
+            return this->front();
+        }
+
+
+        //- Const reference to the last element,
+        //  for consistency with other OpenFOAM containers
+        auto last() const -> decltype(this->back())
+        {
+            return this->back();
+        }
+
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/OpenFOAM/primitives/strings/stringOps/stringOps.H

@@ -30,12 +30,14 @@ Description
 
 SourceFiles
     stringOps.C
+    stringOpsTemplates.C
 
 \*---------------------------------------------------------------------------*/
 #ifndef stringOps_H
 #define stringOps_H
 
 #include "string.H"
+#include "SubStrings.H"
 #include "word.H"
 #include "dictionary.H"
 #include "HashTable.H"
@@ -302,14 +304,21 @@ namespace stringOps
     Foam::word name(const std::string& fmt, const PrimitiveType& val);
 
 
-} // End namespace stringOps
+    //- Split a string into sub-strings at the delimiter character.
+    //  An empty sub-strings are suppressed.
+    template<class StringType>
+    Foam::SubStrings<StringType> split
+    (
+        const StringType& str,
+        const char delimiter
+    );
 
+} // End namespace stringOps
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository

src/OpenFOAM/primitives/strings/stringOps/stringOpsTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -65,4 +65,36 @@ Foam::word Foam::stringOps::name
 }
 
 
+template<class StringType>
+Foam::SubStrings<StringType> Foam::stringOps::split
+(
+    const StringType& str,
+    const char delimiter
+)
+{
+    Foam::SubStrings<StringType> lst;
+    lst.reserve(20);
+
+    std::string::size_type beg = 0, end = 0;
+
+    while ((end = str.find(delimiter, beg)) != std::string::npos)
+    {
+        if (beg < end)
+        {
+            // (Non-empty) intermediate element
+            lst.append(str.cbegin() + beg, str.cbegin() + end);
+        }
+        beg = end + 1;
+    }
+
+    // (Non-empty) trailing element
+    if (beg < str.size())
+    {
+        lst.append(str.cbegin() + beg, str.cbegin() + str.size());
+    }
+
+    return lst;
+}
+
+
 // ************************************************************************* //

src/OpenFOAM/primitives/strings/word/word.H

@@ -113,9 +113,9 @@ public:
         inline static bool valid(char c);
 
         //- Construct a validated word, in which all invalid characters have
-        //  been stripped out. Normally also prefix any leading digit
+        //  been stripped out. Optionally prefix any leading digit
         //  with '_' to have words that work nicely as dictionary keywords.
-        static word validated(const std::string& s, const bool prefix=true);
+        static word validated(const std::string& s, const bool prefix=false);
 
 
       // File-like functions

src/combustionModels/FSD/reactionRateFlameAreaModels/reactionRateFlameArea/reactionRateFlameAreaNew.C

@@ -34,16 +34,15 @@ Foam::autoPtr<Foam::reactionRateFlameArea> Foam::reactionRateFlameArea::New
     const combustionModel& combModel
 )
 {
-    word reactionRateFlameAreaType
+    const word modelType
     (
         dict.lookup("reactionRateFlameArea")
     );
 
     Info<< "Selecting reaction rate flame area correlation "
-        << reactionRateFlameAreaType << endl;
+        << modelType << endl;
 
-    auto cstrIter =
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
-        dictionaryConstructorTablePtr_->cfind(reactionRateFlameAreaType);
 
     if (!cstrIter.found())
     {
@@ -51,15 +50,13 @@ Foam::autoPtr<Foam::reactionRateFlameArea> Foam::reactionRateFlameArea::New
         (
             dict
         )   << "Unknown reactionRateFlameArea type "
-            << reactionRateFlameAreaType << nl << nl
+            << modelType << nl << nl
             << "Valid reaction rate flame area types :" << endl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
-    const label tempOpen = reactionRateFlameAreaType.find('<');
+    const word className = modelType.substr(0, modelType.find('<'));
-
-    const word className = reactionRateFlameAreaType(0, tempOpen);
 
     return autoPtr<reactionRateFlameArea>
         (cstrIter()(className, dict, mesh, combModel));

src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C

@@ -35,7 +35,7 @@ Foam::combustionModels::psiCombustionModel::New
     const word& phaseName
 )
 {
-    const word combModelName
+    const word modelType
     (
         IOdictionary
         (
@@ -51,21 +51,21 @@ Foam::combustionModels::psiCombustionModel::New
         ).lookup("combustionModel")
     );
 
-    Info<< "Selecting combustion model " << combModelName << endl;
+    Info<< "Selecting combustion model " << modelType << endl;
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(combModelName);
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
     if (!cstrIter.found())
     {
         FatalErrorInFunction
             << "Unknown psiCombustionModel type "
-            << combModelName << endl << endl
+            << modelType << nl << nl
-            << "Valid combustionModel types :" << endl
+            << "Valid combustionModel types :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
-    const word className = combModelName(0, combModelName.find('<'));
+    const word className = modelType.substr(0, modelType.find('<'));
 
     return autoPtr<psiCombustionModel>
     (

src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C

@@ -35,7 +35,7 @@ Foam::combustionModels::rhoCombustionModel::New
     const word& phaseName
 )
 {
-    const word combTypeName
+    const word modelType
     (
         IOdictionary
         (
@@ -51,23 +51,21 @@ Foam::combustionModels::rhoCombustionModel::New
         ).lookup("combustionModel")
     );
 
-    Info<< "Selecting combustion model " << combTypeName << endl;
+    Info<< "Selecting combustion model " << modelType << endl;
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(combTypeName);
+    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
 
     if (!cstrIter.found())
     {
         FatalErrorInFunction
             << "Unknown rhoCombustionModel type "
-            << combTypeName << endl << endl
+            << modelType << nl << nl
-            << "Valid combustionModel types :" << endl
+            << "Valid combustionModel types :" << nl
             << dictionaryConstructorTablePtr_->sortedToc()
             << exit(FatalError);
     }
 
-    const label tempOpen = combTypeName.find('<');
+    const word className = modelType.substr(0, modelType.find('<'));
-
-    const word className = combTypeName(0, tempOpen);
 
     return autoPtr<rhoCombustionModel>
     (

src/conversion/ccm/reader/ccmReader.C

@@ -365,7 +365,7 @@ void Foam::ccm::reader::readProblemDescription_boundaryRegion
             }
             else
             {
-                dict.add(opt, word::validated(str));
+                dict.add(opt, word::validated(str, true));
             }
         }
 
@@ -407,7 +407,7 @@ void Foam::ccm::reader::readProblemDescription_boundaryRegion
 
             if (!str.empty())
             {
-                dict.add(opt, word::validated(str));
+                dict.add(opt, word::validated(str, true));
             }
         }
 
@@ -472,7 +472,7 @@ void Foam::ccm::reader::readProblemDescription_cellTable
                 str = "zone_" + ::Foam::name(Id);
             }
 
-            dict.add(opt, word::validated(str));
+            dict.add(opt, word::validated(str, true));
         }
 
 
@@ -484,7 +484,7 @@ void Foam::ccm::reader::readProblemDescription_cellTable
 
             if (!str.empty())
             {
-                dict.add(opt, word::validated(str));
+                dict.add(opt, word::validated(str, true));
             }
         }
 

src/conversion/fire/FIREMeshReader.C

@@ -155,7 +155,7 @@ void Foam::fileFormats::FIREMeshReader::readSelections(ISstream& is)
             // index starting at 1
             const label selId = ++nCellSelections;
 
-            cellTable_.setName(selId, word::validated(name));
+            cellTable_.setName(selId, word::validated(name, true));
             cellTable_.setMaterial(selId, "fluid");
 
             for (label i = 0; i < count; ++i)
@@ -170,7 +170,7 @@ void Foam::fileFormats::FIREMeshReader::readSelections(ISstream& is)
             // index starting at 0
             const label selId = nFaceSelections++;
 
-            faceNames.append(word::validated(name));
+            faceNames.append(word::validated(name, true));
 
             for (label i = 0; i < count; ++i)
             {

src/meshTools/edgeMesh/edgeMeshFormats/nas/NASedgeFormat.C

@@ -74,7 +74,7 @@ bool Foam::fileFormats::NASedgeFormat::read
         // Check if character 72 is continuation
         if (line.size() > 72 && line[72] == '+')
         {
-            line = line.substr(0, 72);
+            line.resize(72);
 
             while (true)
             {
@@ -87,7 +87,7 @@ bool Foam::fileFormats::NASedgeFormat::read
                 }
                 else
                 {
-                    line += buf.substr(8, buf.size()-8);
+                    line += buf.substr(8);
                     break;
                 }
             }

src/meshTools/edgeMesh/edgeMeshFormats/obj/OBJedgeFormat.C

@@ -117,9 +117,9 @@ bool Foam::fileFormats::OBJedgeFormat::read(const fileName& filename)
         string line = this->getLineNoComment(is);
 
         // handle continuations
-        if (line[line.size()-1] == '\\')
+        if (line.back() == '\\')
         {
-            line.substr(0, line.size()-1);
+            line.resize(line.size()-1);
             line += this->getLineNoComment(is);
         }
 

src/regionModels/thermalBaffleModels/derivedFvPatchFields/thermalBaffle/thermalBaffleFvPatchScalarField.C

@@ -191,9 +191,8 @@ void thermalBaffleFvPatchScalarField::createPatchMesh()
     dicts[bottomPatchID].add("inGroups", inGroups);
     dicts[bottomPatchID].add("sampleMode", mpp.sampleModeNames_[mpp.mode()]);
 
-    const label sepPos = coupleGroup.find('_');
+    const word coupleGroupSlave =
-
+        coupleGroup.substr(0, coupleGroup.find('_')) + "_slave";
-    const word coupleGroupSlave = coupleGroup(0, sepPos) + "_slave";
 
     inGroups[0] = coupleGroupSlave;
     dicts[topPatchID].add("coupleGroup", coupleGroupSlave);

src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C

@@ -186,7 +186,7 @@ void Foam::ensightSurfaceReader::readCase(IFstream& is)
         //   surfaceName.****.fieldName
         // This is not parser friendly - simply take remainder of buffer
         label iPos = iss.stdStream().tellg();
-        fieldFileName = buffer(iPos, buffer.size() - iPos);
+        fieldFileName = buffer.substr(iPos);
         size_t p0  = fieldFileName.find_first_not_of(' ');
         if (p0 == string::npos)
         {

src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C

@@ -89,12 +89,12 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
         string line;
         is.getLine(line);
 
-        // Ansa extension
+        // ANSA extension
-        if (line.substr(0, 10) == "$ANSA_NAME")
+        if (line.startsWith("$ANSA_NAME"))
         {
-            string::size_type sem0 = line.find (';', 0);
+            string::size_type sem0 = line.find(';', 0);
-            string::size_type sem1 = line.find (';', sem0+1);
+            string::size_type sem1 = line.find(';', sem0+1);
-            string::size_type sem2 = line.find (';', sem1+1);
+            string::size_type sem2 = line.find(';', sem1+1);
 
             if
             (
@@ -111,14 +111,11 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
                 string rawName;
                 is.getLine(rawName);
-                if (rawName[rawName.size()-1] == '\r')
+                if (rawName.back() == '\r')
                 {
-                    rawName = rawName.substr(1, rawName.size()-2);
+                    rawName.resize(rawName.size()-1);
-                }
-                else
-                {
-                    rawName = rawName.substr(1, rawName.size()-1);
                 }
+                rawName = rawName.substr(1);
 
                 string::stripInvalid<word>(rawName);
                 ansaName = rawName;
@@ -132,11 +129,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
         // Hypermesh extension
         // $HMNAME COMP                   1"partName"
-        if
+        if (line.startsWith("$HMNAME COMP") && line.find('"') != string::npos)
-        (
-            line.substr(0, 12) == "$HMNAME COMP"
-         && line.find ('"') != string::npos
-        )
         {
             label groupId = readLabel
             (
@@ -165,7 +158,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
         // Check if character 72 is continuation
         if (line.size() > 72 && line[72] == '+')
         {
-            line = line.substr(0, 72);
+            line.resize(72);
 
             while (true)
             {
@@ -178,7 +171,7 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
                 }
                 else
                 {
-                    line += buf.substr(8, buf.size()-8);
+                    line += buf.substr(8);
                     break;
                 }
             }

src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C

@@ -82,9 +82,9 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
         string line = this->getLineNoComment(is);
 
         // handle continuations
-        if (line[line.size()-1] == '\\')
+        if (line.back() == '\\')
         {
-            line.substr(0, line.size()-1);
+            line.resize(line.size()-1);
             line += this->getLineNoComment(is);
         }
 

src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C

@@ -64,7 +64,7 @@ Foam::fileFormats::STARCDsurfaceFormatCore::readInpCellTable
         if (ctnameRE.match(line, groups))
         {
             const label tableId = atoi(groups[0].c_str());
-            const word tableName = word::validated(groups[1]);
+            const word tableName = word::validated(groups[1], true);
 
             if (!tableName.empty())
             {

src/surfMesh/surfaceFormats/tri/TRIsurfaceFormatCore.C

@@ -87,9 +87,9 @@ bool Foam::fileFormats::TRIsurfaceFormatCore::read
         string line = this->getLineNoComment(is);
 
         // handle continuations ?
-        //          if (line[line.size()-1] == '\\')
+        //          if (line.back() == '\\')
         //          {
-        //              line.substr(0, line.size()-1);
+        //              line.resize(line.size()-1);
         //              line += this->getLineNoComment(is);
         //          }
 
@@ -128,14 +128,14 @@ bool Foam::fileFormats::TRIsurfaceFormatCore::read
         // ie, instead of having 0xFF, skip 0 and leave xFF to
         // get read as a word and name it "zoneFF"
 
-        char zero;
+        char zeroChar;
-        lineStream >> zero;
+        lineStream >> zeroChar;
 
-        word rawName(lineStream);
+        const word rawName(lineStream);
-        word name("zone" + rawName(1, rawName.size()-1));
+        const word name("zone" + rawName.substr(1));
 
-        HashTable<label>::const_iterator fnd = lookup.find(name);
+        HashTable<label>::const_iterator fnd = lookup.cfind(name);
-        if (fnd != lookup.end())
+        if (fnd.found())
         {
             if (zoneI != fnd())
             {

src/surfMesh/triSurface/interfaces/NAS/readNAS.C

@@ -32,7 +32,6 @@ Description
         GRID          28        10.20269-.030265-2.358-8
     \endverbatim
 
-
 \*---------------------------------------------------------------------------*/
 
 #include "triSurface.H"
@@ -78,11 +77,8 @@ static std::string readNASToken
     size_t& index
 )
 {
-    size_t indexStart, indexEnd;
+    size_t indexStart = index;
-
+    size_t indexEnd = line.find(',', indexStart);
-    indexStart = index;
-
-    indexEnd = line.find(',', indexStart);
     index = indexEnd + 1;
 
     if (indexEnd == std::string::npos)
@@ -134,12 +130,12 @@ bool triSurface::readNAS(const fileName& fName)
         string line;
         is.getLine(line);
 
-        // Ansa extension
+        // ANSA extension
-        if (line.substr(0, 10) == "$ANSA_NAME")
+        if (line.startsWith("$ANSA_NAME"))
         {
-            string::size_type sem0 = line.find (';', 0);
+            string::size_type sem0 = line.find(';', 0);
-            string::size_type sem1 = line.find (';', sem0+1);
+            string::size_type sem1 = line.find(';', sem0+1);
-            string::size_type sem2 = line.find (';', sem1+1);
+            string::size_type sem2 = line.find(';', sem1+1);
 
             if
             (
@@ -156,15 +152,11 @@ bool triSurface::readNAS(const fileName& fName)
 
                 string nameString;
                 is.getLine(ansaName);
-                if (ansaName[ansaName.size()-1] == '\r')
+                if (ansaName.back() == '\r')
                 {
-                    ansaName = ansaName.substr(1, ansaName.size()-2);
+                    ansaName.resize(ansaName.size()-1);
                 }
-                else
+                ansaName = ansaName.substr(1);
-                {
-                    ansaName = ansaName.substr(1, ansaName.size()-1);
-                }
-
                 // Info<< "ANSA tag for NastranID:" << ansaId
                 //     << " of type " << ansaType
                 //     << " name " << ansaName << endl;
@@ -174,11 +166,7 @@ bool triSurface::readNAS(const fileName& fName)
 
         // Hypermesh extension
         // $HMNAME COMP                   1"partName"
-        if
+        if (line.startsWith("$HMNAME COMP") && line.find('"') != string::npos)
-        (
-            line.substr(0, 12) == "$HMNAME COMP"
-         && line.find ('"') != string::npos
-        )
         {
             label groupId = readLabel
             (
@@ -204,20 +192,20 @@ bool triSurface::readNAS(const fileName& fName)
         // Check if character 72 is continuation
         if (line.size() > 72 && line[72] == '+')
         {
-            line = line.substr(0, 72);
+            line.resize(72);
 
             while (true)
             {
                 string buf;
                 is.getLine(buf);
 
-                if (buf.size() > 72 && buf[72]=='+')
+                if (buf.size() > 72 && buf[72] == '+')
                 {
                     line += buf.substr(8, 64);
                 }
                 else
                 {
-                    line += buf.substr(8, buf.size()-8);
+                    line += buf.substr(8);
                     break;
                 }
             }

src/surfMesh/triSurface/interfaces/OBJ/readOBJ.C

@@ -51,13 +51,13 @@ bool Foam::triSurface::readOBJ(const fileName& OBJfileName)
     {
         string line = getLineNoComment(OBJfile);
 
-        label sz = line.size();
+        const label sz = line.size();
 
         if (sz)
         {
-            if (line[sz-1] == '\\')
+            if (line.back() == '\\')
             {
-                line.substr(0, sz-1);
+                line.resize(sz-1);
                 line += getLineNoComment(OBJfile);
             }
 

src/surfMesh/triSurface/interfaces/TRI/readTRI.C

@@ -99,19 +99,18 @@ bool Foam::triSurface::readTRI(const fileName& TRIfileName)
 
         // Region/colour in .tri file starts with 0x. Skip.
 
-        char zero;
+        char zeroChar;
-        lineStream >> zero;
+        lineStream >> zeroChar;
 
-        word rawSolidName(lineStream);
+        const word rawSolidName(lineStream);
 
-        word solidName("patch" + rawSolidName(1, rawSolidName.size()-1));
+        const word solidName("patch" + rawSolidName.substr(1));
 
         label region  = -1;
 
-        HashTable<label, string>::const_iterator fnd =
+        auto fnd = STLsolidNames.cfind(solidName);
-            STLsolidNames.find(solidName);
 
-        if (fnd != STLsolidNames.end())
+        if (fnd.found())
         {
             region = fnd();
         }

src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C

@@ -531,11 +531,11 @@ void Foam::radiation::fvDOM::setRayIdLambdaId
 ) const
 {
     // assuming name is in the form: CHARS_rayId_lambdaId
-    size_type i1 = name.find_first_of("_");
+    const size_type i1 = name.find('_');
-    size_type i2 = name.find_last_of("_");
+    const size_type i2 = name.rfind('_');
 
     rayId = readLabel(IStringStream(name.substr(i1+1, i2-1))());
-    lambdaId = readLabel(IStringStream(name.substr(i2+1, name.size()-1))());
+    lambdaId = readLabel(IStringStream(name.substr(i2+1))());
 }
 
 

src/thermophysicalModels/radiation/submodels/sootModel/sootModel/sootModelNew.C

@@ -56,9 +56,7 @@ Foam::radiation::sootModel::New
             << exit(FatalError);
     }
 
-    const label tempOpen = modelType.find('<');
+    const word className = modelType.substr(0, modelType.find('<'));
-
-    const word className = modelType(0, tempOpen);
 
     return autoPtr<sootModel>(cstrIter()(dict, mesh, className));
 }

src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L

@@ -382,7 +382,7 @@ bool finishReaction = false;
     }
 
 <readSpecies>{specieName} {
-        word specieName(foamName(foamSpecieString(YYText())));
+        const word specieName(foamName(foamSpecieString(YYText())));
 
         if (specieName == "THERMO")
         {
@@ -429,10 +429,10 @@ bool finishReaction = false;
     }
 
 <readThermoAll>{thermoTemp}{thermoTemp}{thermoTemp} {
-        string temperaturesString(YYText());
+        const string temperaturesString(YYText());
-        //scalar lowestT(stringToScalar(temperaturesString(0, 10)));
+        //scalar lowestT(stringToScalar(temperaturesString.substr(0, 10)));
-        allCommonT = stringToScalar(temperaturesString(10, 10));
+        allCommonT = stringToScalar(temperaturesString.substr(10, 10));
-        //scalar highestT(stringToScalar(temperaturesString(20, 10)));
+        //scalar highestT(stringToScalar(temperaturesString.substr(20, 10)));
         BEGIN(readThermoSpecieName);
     }
 
@@ -449,7 +449,7 @@ bool finishReaction = false;
             size_t spacePos = specieString.find(' ');
             if (spacePos != string::npos)
             {
-                currentSpecieName = specieString(0, spacePos);
+                currentSpecieName = specieString.substr(0, spacePos);
             }
             else
             {
@@ -467,15 +467,15 @@ bool finishReaction = false;
     }
 
 <readThermoFormula>{thermoFormula} {
-        string thermoFormula(YYText());
+        const string thermoFormula(YYText());
 
         nSpecieElements = 0;
         currentSpecieComposition.setSize(5);
 
         for (int i=0; i<4; i++)
         {
-            word elementName(foamName(thermoFormula(5*i, 2)));
+            word elementName(foamName(thermoFormula.substr(5*i, 2)));
-            label nAtoms = atoi(thermoFormula(5*i + 2, 3).c_str());
+            label nAtoms = atoi(thermoFormula.substr(5*i + 2, 3).c_str());
 
             if (elementName.size() && nAtoms)
             {
@@ -490,7 +490,7 @@ bool finishReaction = false;
     }
 
 <readThermoPhase>{thermoPhase} {
-        char phaseChar = YYText()[0];
+        const char phaseChar = YYText()[0];
 
         switch (phaseChar)
         {
@@ -511,10 +511,10 @@ bool finishReaction = false;
     }
 
 <readThermoTemps>{thermoLowTemp}{thermoHighTemp}{thermoCommonTemp} {
-        string temperaturesString(YYText());
+        const string temperaturesString(YYText());
-        currentLowT = stringToScalar(temperaturesString(0, 10));
+        currentLowT = stringToScalar(temperaturesString.substr(0, 10));
-        currentHighT = stringToScalar(temperaturesString(10, 10));
+        currentHighT = stringToScalar(temperaturesString.substr(10, 10));
-        currentCommonT = stringToScalar(temperaturesString(20, 8));
+        currentCommonT = stringToScalar(temperaturesString.substr(20, 8));
 
         if (currentCommonT < SMALL)
         {
@@ -525,9 +525,9 @@ bool finishReaction = false;
     }
 
 <readThermoFormula2>{thermoFormula2} {
-        string thermoFormula(YYText());
+        const string thermoFormula(YYText());
-        word elementName(foamName(thermoFormula(0, 2)));
+        word elementName(foamName(thermoFormula.substr(0, 2)));
-        label nAtoms = atoi(thermoFormula(2, 3).c_str());
+        const label nAtoms = atoi(thermoFormula.substr(2, 3).c_str());
 
         if
         (
@@ -568,13 +568,13 @@ bool finishReaction = false;
     }
 
 <readThermoCoeff1>{thermoCoeff}{thermoCoeff}{thermoCoeff}{thermoCoeff}{thermoCoeff} {
-        string thermoCoeffString(YYText());
+        const string thermoCoeffString(YYText());
 
-        highCpCoeffs[0] = stringToScalar(thermoCoeffString(0, 15));
+        highCpCoeffs[0] = stringToScalar(thermoCoeffString.substr(0, 15));
-        highCpCoeffs[1] = stringToScalar(thermoCoeffString(15, 15));
+        highCpCoeffs[1] = stringToScalar(thermoCoeffString.substr(15, 15));
-        highCpCoeffs[2] = stringToScalar(thermoCoeffString(30, 15));
+        highCpCoeffs[2] = stringToScalar(thermoCoeffString.substr(30, 15));
-        highCpCoeffs[3] = stringToScalar(thermoCoeffString(45, 15));
+        highCpCoeffs[3] = stringToScalar(thermoCoeffString.substr(45, 15));
-        highCpCoeffs[4] = stringToScalar(thermoCoeffString(60, 15));
+        highCpCoeffs[4] = stringToScalar(thermoCoeffString.substr(60, 15));
 
         BEGIN(readThermoLineLabel2);
     }
@@ -586,12 +586,12 @@ bool finishReaction = false;
 <readThermoCoeff2>{thermoCoeff}{thermoCoeff}{thermoCoeff}{thermoCoeff}{thermoCoeff} {
         string thermoCoeffString(YYText());
 
-        highCpCoeffs[5] = stringToScalar(thermoCoeffString(0, 15));
+        highCpCoeffs[5] = stringToScalar(thermoCoeffString.substr(0, 15));
-        highCpCoeffs[6] = stringToScalar(thermoCoeffString(15, 15));
+        highCpCoeffs[6] = stringToScalar(thermoCoeffString.substr(15, 15));
 
-        lowCpCoeffs[0] = stringToScalar(thermoCoeffString(30, 15));
+        lowCpCoeffs[0] = stringToScalar(thermoCoeffString.substr(30, 15));
-        lowCpCoeffs[1] = stringToScalar(thermoCoeffString(45, 15));
+        lowCpCoeffs[1] = stringToScalar(thermoCoeffString.substr(45, 15));
-        lowCpCoeffs[2] = stringToScalar(thermoCoeffString(60, 15));
+        lowCpCoeffs[2] = stringToScalar(thermoCoeffString.substr(60, 15));
 
         BEGIN(readThermoLineLabel3);
     }
@@ -603,10 +603,10 @@ bool finishReaction = false;
 <readThermoCoeff3>{thermoCoeff}{thermoCoeff}{thermoCoeff}{thermoCoeff}{thermoCoeff} {
         string thermoCoeffString(YYText());
 
-        lowCpCoeffs[3] = stringToScalar(thermoCoeffString(0, 15));
+        lowCpCoeffs[3] = stringToScalar(thermoCoeffString.substr(0, 15));
-        lowCpCoeffs[4] = stringToScalar(thermoCoeffString(15, 15));
+        lowCpCoeffs[4] = stringToScalar(thermoCoeffString.substr(15, 15));
-        lowCpCoeffs[5] = stringToScalar(thermoCoeffString(30, 15));
+        lowCpCoeffs[5] = stringToScalar(thermoCoeffString.substr(30, 15));
-        lowCpCoeffs[6] = stringToScalar(thermoCoeffString(45, 15));
+        lowCpCoeffs[6] = stringToScalar(thermoCoeffString.substr(45, 15));
 
         BEGIN(readThermoLineLabel4);
     }
@@ -1327,11 +1327,10 @@ bool finishReaction = false;
 
 <readPDependentSpecie>{pDependentSpecie} {
 
-        word rhsPDependentSpecieName = pDependentSpecieName;
+        const word rhsPDependentSpecieName = pDependentSpecieName;
         pDependentSpecieName =
             foamName(foamSpecieString(YYText()));
-        pDependentSpecieName =
+        pDependentSpecieName.resize(pDependentSpecieName.size()-1);
-            pDependentSpecieName(0, pDependentSpecieName.size() - 1);
 
         if (rrType == thirdBodyArrhenius)
         {

src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C

@@ -211,17 +211,12 @@ Foam::Reaction<ReactionThermo>::specieCoeffs::specieCoeffs
     {
         word specieName = t.wordToken();
 
-        size_t i = specieName.find('^');
+        const size_t i = specieName.find('^');
 
         if (i != word::npos)
         {
-            string exponentStr = specieName
+            exponent = atof(specieName.substr(i + 1).c_str());
-            (
+            specieName.resize(i);
-                i + 1,
-                specieName.size() - i - 1
-            );
-            exponent = atof(exponentStr.c_str());
-            specieName = specieName(0, i);
         }
 
         if (species.contains(specieName))