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

ISstream::read improvements

Browse Source 
- following Andy's idea to return values as label whenever possible
      eg, 1.2e6 -> 1200000
  but left it commented out

- avoid buffer overflow in ISstream::read(word&).
  Is the 'if (fail())' check itself actually in the correct place??

- other minor cosmetic changes
This commit is contained in:
Mark Olesen
2009-08-11 11:55:46 +02:00
parent ee033487a6
commit c832d635b1
3 changed files with 171 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
applications/test/tokenizeTest/tokenizeTest.C
View File

@ -33,6 +33,7 @@ Description
#include "IOstreams.H"
#include "IFstream.H"
#include "IStringStream.H"
#include "cpuTime.H"
using namespace Foam;
@ -44,41 +45,76 @@ int main(int argc, char *argv[])
argList::noParallel();
argList::validArgs.insert("string .. stringN");
argList::validOptions.insert("file", "name");
argList::validOptions.insert("repeat", "count");
argList args(argc, argv, false, true);
forAll(args.additionalArgs(), argI)
{
const string& rawArg = args.additionalArgs()[argI];
Info<< "input string: " << rawArg << nl;
label repeat = 1;
args.optionReadIfPresent<label>("repeat", repeat);
IStringStream is(rawArg);
while (is.good())
cpuTime timer;
for (label count = 0; count < repeat; ++count)
{
forAll(args.additionalArgs(), argI)
{
token tok(is);
Info<< "token: " << tok.info() << endl;
const string& rawArg = args.additionalArgs()[argI];
if (count == 0)
{
Info<< "input string: " << rawArg << nl;
}
IStringStream is(rawArg);
while (is.good())
{
token tok(is);
if (count == 0)
{
Info<< "token: " << tok.info() << endl;
}
}
if (count == 0)
{
Info<< nl;
IOobject::writeDivider(Info);
}
}
Info<< nl;
IOobject::writeDivider(Info);
}
}
Info<< "tokenized args " << repeat << " times in "
<< timer.cpuTimeIncrement() << " s\n\n";
if (args.optionFound("file"))
{
IFstream is(args.option("file"));
Info<< "tokenizing file: " << args.option("file") << nl;
while (is.good())
for (label count = 0; count < repeat; ++count)
{
token tok(is);
Info<< "token: " << tok.info() << endl;
IFstream is(args.option("file"));
if (count == 0)
{
Info<< "tokenizing file: " << args.option("file") << nl;
}
while (is.good())
{
token tok(is);
if (count == 0)
{
Info<< "token: " << tok.info() << endl;
}
}
if (count == 0)
{
Info<< nl;
IOobject::writeDivider(Info);
}
}
Info<< nl;
IOobject::writeDivider(Info);
Info<< "tokenized file " << repeat << " times in "
<< timer.cpuTimeIncrement() << " s\n\n";
}
return 0;