ENH: change wordRes to be a List of wordRe instead of a wrapper (issue #259)

- this permits direct storage of a list with additional matcher
  capabilities

- provide wordRes::matcher class for similar behaviour as previously
This commit is contained in:
Mark Olesen
2018-02-21 10:05:30 +01:00
parent 03b287ed24
commit c126464d1c
113 changed files with 572 additions and 801 deletions

View File

@ -34,7 +34,7 @@ See also
#include "OSspecific.H"
#include "argList.H"
#include "wordReList.H"
#include "wordRes.H"
#include "IOstreams.H"
#include "StringStream.H"
@ -446,20 +446,11 @@ int main(int argc, char *argv[])
Info<<"read float " << xxx << endl;
}
if (args.found("reList"))
{
reLst = args.readList<wordRe>("reList");
}
args.readListIfPresent<wordRe>("reList", reLst);
args.readListIfPresent<word>("wordList", wLst);
if (args.found("wordList"))
if (args.readListIfPresent<string>("stringList", sLst))
{
wLst = args.readList<word>("wordList");
}
if (args.found("stringList"))
{
sLst = args.readList<string>("stringList");
printMyString(sLst);
}