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: simplify method names for reading argList options and arguments

Browse Source 
- use succincter method names that more closely resemble dictionary
  and HashTable method names. This improves method name consistency
  between classes and also requires less typing effort:

    args.found(optName)        vs.  args.optionFound(optName)
    args.readIfPresent(..)     vs.  args.optionReadIfPresent(..)
    ...
    args.opt<scalar>(optName)  vs.  args.optionRead<scalar>(optName)
    args.read<scalar>(index)   vs.  args.argRead<scalar>(index)

- the older method names forms have been retained for code compatibility,
  but are now deprecated
This commit is contained in:
Mark Olesen
2018-01-08 15:35:18 +01:00
parent 2feb11dbeb
commit 345a2a42f1
168 changed files with 1161 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
applications/test/stringSplit/Test-stringSplit.C
View File

@ -105,18 +105,12 @@ int main(int argc, char *argv[])
args.printUsage();
}
const bool keepEmpty = args.optionFound("empty");
const bool keepEmpty = args.found("empty");
int nopts = 0;
for (auto optName : { "any", "slash", "space", "sub", "fixed", "char" })
{
if (args.optionFound(optName))
{
++nopts;
}
}
const label nopts =
args.count({"any", "slash", "space", "sub", "fixed", "char"});
if (args.optionFound("any"))
if (args.found("any"))
{
const std::string& str = args["any"];
Info<< "split on any chars" << nl
@ -135,7 +129,7 @@ int main(int argc, char *argv[])
}
}
if (args.optionFound("sub"))
if (args.found("sub"))
{
const std::string& str = args["sub"];
Info<< "split on substring" << nl
@ -154,7 +148,7 @@ int main(int argc, char *argv[])
}
}
if (args.optionFound("space"))
if (args.found("space"))
{
Info<< "split on space" << nl
<< "~~~~~~~~~~~~~~" << nl;
@ -171,7 +165,7 @@ int main(int argc, char *argv[])
}
}
if (args.optionFound("char"))
if (args.found("char"))
{
const char delim = args["char"][0];
@ -190,9 +184,9 @@ int main(int argc, char *argv[])
}
}
if (args.optionFound("fixed"))
if (args.found("fixed"))
{
const label width = readLabel(args["fixed"]);
const label width = args.opt<label>("fixed");
Info<< "split on fixed width = " << width << nl
<< "~~~~~~~~~~~~~~" << nl;
@ -210,7 +204,7 @@ int main(int argc, char *argv[])
}
// Default
if (!nopts || args.optionFound("slash"))
if (!nopts || args.found("slash"))
{
const char delim = '/';