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: use stringOps::expandDict when processing codeStream input

Browse Source
This commit is contained in:
Mark Olesen
2011-02-23 14:22:14 +01:00
parent 31f6d9ba5e
commit 67fc6a171a
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
View File

@ -83,17 +83,21 @@ bool Foam::functionEntries::codeStream::execute
<< exit(FatalIOError);
}
// get code dictionary
// must reference parent for stringOps::expandDict to work nicely
dictionary codeDict("#codeStream", parentDict, is);
// Read three sections of code.
// Remove any leading whitespace - necessary for compilation options,
// convenience for includes and body.
dictionary codeDict(is);
// "codeInclude" is optional
string codeInclude;
if (codeDict.found("codeInclude"))
{
codeInclude = stringOps::trim(codeDict["codeInclude"]);
stringOps::inplaceExpandDict(codeInclude, codeDict);
}
// "codeOptions" is optional
@ -101,10 +105,13 @@ bool Foam::functionEntries::codeStream::execute
if (codeDict.found("codeOptions"))
{
codeOptions = stringOps::trim(codeDict["codeOptions"]);
stringOps::inplaceExpandDict(codeOptions, codeDict);
}
// "code" is mandatory
string code = stringOps::trim(codeDict["code"]);
stringOps::inplaceExpandDict(code, codeDict);
// Create SHA1 digest from the contents
SHA1Digest sha;