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

functionObjectList::readFunctionObject: Add support for functionObject arguments containing '()'s

Browse Source
This commit is contained in:
Henry Weller
2016-05-31 17:47:21 +01:00
parent c022a97ff4
commit 1be464d23d
4 changed files with 31 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
View File

@ -113,6 +113,7 @@ bool Foam::functionObjectList::readFunctionObject
string::stripInvalid<word>(funcNameArgs);
word funcName(funcNameArgs);
int argLevel = 0;
wordList args;
word::size_type start = 0;
@ -129,18 +130,29 @@ bool Foam::functionObjectList::readFunctionObject
if (c == '(')
{
funcName.resize(i);
start = i+1;
if (argLevel == 0)
{
funcName.resize(i);
start = i+1;
}
++argLevel;
}
else if (c == ',')
{
args.append(funcNameArgs(start, i - start));
start = i+1;
if (argLevel == 1)
{
args.append(funcNameArgs(start, i - start));
start = i+1;
}
}
else if (c == ')')
{
args.append(funcNameArgs(start, i - start));
break;
if (argLevel == 1)
{
args.append(funcNameArgs(start, i - start));
break;
}
--argLevel;
}
++i;