zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: consolidate, cleanup some string methods

Browse Source 
- consolidate word::validated() into word::validate() and also allow
  as short form for string::validate<word>(). Also less confusing than
  having similarly named methods that essentially do the same thing.

- more consistent const access when iterating over strings

- add valid(char) for keyType and wordRe
This commit is contained in:
Mark Olesen
2017-08-02 12:33:35 +02:00
parent 3f6e130c91
commit e70fc61660
43 changed files with 258 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/OpenFOAM/primitives/strings/stringOps/stringOps.C
View File

@ -123,12 +123,12 @@ Foam::string& Foam::stringOps::inplaceExpand
}
else
{
string::iterator iter = s.begin() + begVar + 1;
string::const_iterator iter = s.cbegin() + begVar + 1;
// more generous in accepting keywords than for env variables
while
(
iter != s.end()
iter != s.cend()
&&
(
std::isalnum(*iter)
@ -180,8 +180,7 @@ Foam::string& Foam::stringOps::inplaceExpand
}
HashTable<string, word, string::hash>::const_iterator fnd =
mapping.find(varName);
auto fnd = mapping.cfind(varName);
if (fnd.found())
{
@ -290,7 +289,9 @@ Foam::string Foam::stringOps::getVariable
string::size_type altPos = 0;
// check for parameter:-word or parameter:+word
int altType = findParameterAlternative(name, altPos, name.size()-1);
const int altType =
findParameterAlternative(name, altPos, name.size()-1);
if (altType)
{
value = getEnv
@ -414,13 +415,13 @@ Foam::string& Foam::stringOps::inplaceExpand
}
else
{
string::iterator iter = s.begin() + begVar + 1;
string::const_iterator iter = s.cbegin() + begVar + 1;
string::size_type endVar = begVar;
// more generous in accepting keywords than for env variables
while
(
iter != s.end()
iter != s.cend()
&&
(
std::isalnum(*iter)
@ -552,12 +553,12 @@ Foam::string& Foam::stringOps::inplaceExpand
}
else
{
string::iterator iter = s.begin() + begVar + 1;
string::const_iterator iter = s.cbegin() + begVar + 1;
// more generous in accepting keywords than for env variables
while
(
iter != s.end()
iter != s.cend()
&&
(
std::isalnum(*iter)
@ -700,11 +701,11 @@ Foam::string& Foam::stringOps::inplaceExpand
}
else
{
string::iterator iter = s.begin() + begVar + 1;
string::const_iterator iter = s.cbegin() + begVar + 1;
while
(
iter != s.end()
iter != s.cend()
&& (std::isalnum(*iter) || *iter == '_')
)
{