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: support negated regular expressions (#2283)

Browse Source 
- extendes the prefix syntax to handle '!' values.

  For example,  "(?!).*processor.*" or "(?!i)inlet.*"
This commit is contained in:
Mark Olesen
2021-12-03 15:32:54 +01:00
parent 49e26dd7d2
commit e09298092d
8 changed files with 478 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
applications/test/regex1/Test-regex1.C
View File

@ -252,12 +252,16 @@ void testExpressions(const UList<regexTest>& tests)
}
else if (re.search(str))
{
Info<< "partial match";
Info<< "partial";
}
else
{
Info<< "false";
}
if (re.negated())
{
Info<< " (negated)";
}
Info<< endl;
}
catch (const Foam::error& err)
@ -329,6 +333,15 @@ int main(int argc, char *argv[])
}
#endif
Info<< "sizeof std::regex: " << sizeof(std::regex) << nl;
Info<< "sizeof regex C++11: " << sizeof(regExpCxx) << nl;
#ifndef _WIN32
Info<< "sizeof regex POSIX: " << sizeof(regExpPosix) << nl;
#endif
Info<< "sizeof word: " << sizeof(Foam::word) << nl;
Info<< "sizeof wordRe: " << sizeof(Foam::wordRe) << nl;
Info<< "sizeof keyType: " << sizeof(Foam::keyType) << nl;
if (!args.count({"cxx", "posix"}))
{
args.setOption("cxx");

4
applications/test/regex1/testRegexps2
View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2106 |
| \\ / O peration | Version: v2112 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@ -12,6 +12,8 @@
(
( true "(U|k|epsilon)" "U" )
( false "(U|k|epsilon)" "alpha" )
( true "(?!)(U|k|epsilon)" "alpha" )
( true "(?! *&)(U|k|epsilon)" "alpha" ) // Ignore unknown content
( true "ab.*" "abc" )
( true ".*" "abc" )