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: no dictionary variable and function expansion when discarding entry

Browse Source 
- the 'protect' inputMode is used to supply defaults.
  If an entry already exists, it should act as a no-op without any
  side-effects whatsoever.
This commit is contained in:
Mark Olesen
2017-07-20 10:27:35 +02:00
parent e082be566b
commit f304c7e830
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
View File

@ -191,7 +191,7 @@ int main(int argc, char *argv[])
<< endl;
}
int oldFlag = entry::disableFunctionEntries;
const int oldFlag = entry::disableFunctionEntries;
if (!enableEntries)
{
// By default disable dictionary expansion for fields

2
applications/utilities/preProcessing/changeDictionary/changeDictionary.C
View File

@ -464,7 +464,7 @@ int main(int argc, char *argv[])
<< endl;
}
int oldFlag = entry::disableFunctionEntries;
const int oldFlag = entry::disableFunctionEntries;
if (!enableEntries)
{
// By default disable dictionary expansion for fields

2
applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C
View File

@ -500,7 +500,7 @@ int main(int argc, char *argv[])
IOobjectList objects(runTime, runTime.timeName());
int oldFlag = entry::disableFunctionEntries;
const int oldFlag = entry::disableFunctionEntries;
if (!enableEntries)
{
// By default disable dictionary expansion for fields

12
src/OpenFOAM/db/dictionary/entry/entryIO.C
View File

@ -283,15 +283,21 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
}
else if (functionEntries::inputModeEntry::protect())
{
// read and discard the entry
// Read and discard the entry.
// Disable function/variable expansion to avoid side-effects
const int oldFlag = entry::disableFunctionEntries;
entry::disableFunctionEntries = 1;
if (nextToken == token::BEGIN_BLOCK)
{
dictionaryEntry dummy(keyword, parentDict, is);
dictionaryEntry dummy("dummy", parentDict, is);
}
else
{
primitiveEntry dummy(keyword, parentDict, is);
primitiveEntry dummy("dummy", parentDict, is);
}
entry::disableFunctionEntries = oldFlag;
return true;
}
else if (functionEntries::inputModeEntry::error())