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

ENH: string : recursive variable substitution

Browse Source
This commit is contained in:
mattijs
2010-12-19 18:30:52 +00:00
parent fb92bdb5fe
commit 283f4fab77
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/primitives/strings/string/string.C
View File

@ -94,7 +94,7 @@ Foam::string& Foam::string::replaceAll
// Expand all occurences of environment variables and initial tilde sequences // Expand all occurences of environment variables and initial tilde sequences
Foam::string& Foam::string::expand() Foam::string& Foam::string::expand(const bool recurse)
{ {
size_type startEnvar = 0; size_type startEnvar = 0;
@ -140,6 +140,10 @@ Foam::string& Foam::string::expand()
if (enVarString.size()) if (enVarString.size())
{ {
if (recurse)
{
enVarString.expand();
}
std::string::replace std::string::replace
( (
startEnvar, startEnvar,

2
src/OpenFOAM/primitives/strings/string/string.H
View File

@ -182,7 +182,7 @@ public:
// //
// @sa // @sa
// Foam::findEtcFile // Foam::findEtcFile
string& expand(); string& expand(const bool recurse=false);
//- Remove repeated characters returning true if string changed //- Remove repeated characters returning true if string changed
bool removeRepeated(const char); bool removeRepeated(const char);