ENH: cleanup wordRe interfaces etc.
- ensure that the string-related classes have consistently similar matching methods. Use operator()(const std::string) as an entry point for the match() method, which makes it easier to use for filters and predicates. In some cases this will also permit using a HashSet as a match predicate. regExp ==== - the set method now returns a bool to signal that the requested pattern was compiled. wordRe ==== - have separate constructors with the compilation option (was previously a default parameter). This leaves the single parameter constructor explicit, but the two parameter version is now non-explicit, which makes it easier to use when building lists. - renamed compile-option from REGEX (to REGEXP) for consistency with with the <regex.h>, <regex> header names etc. wordRes ==== - renamed from wordReListMatcher -> wordRes. For reduced typing and since it behaves as an entity only slightly related to its underlying list nature. - Provide old name as typedef and include for code transition. - pass through some list methods into wordRes hashedWordList ==== - hashedWordList[const word& name] now returns a -1 if the name is is not found in the list of indices. That has been a pending change ever since hashedWordList was generalized out of speciesTable (Oct-2010). - add operator()(const word& name) for easy use as a predicate STYLE: adjust parameter names in stringListOps - reflect if the parameter is being used as a primary matcher, or the matcher will be derived from the parameter. For example, (const char* re), which first creates a regExp versus (const regExp& matcher) which is used directly.
Showing
- applications/test/fileName/Test-fileName.C 3 additions, 3 deletionsapplications/test/fileName/Test-fileName.C
- applications/test/wordRe/Test-wordRe.C 28 additions, 2 deletionsapplications/test/wordRe/Test-wordRe.C
- applications/utilities/miscellaneous/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C 4 additions, 4 deletions...us/foamHelp/helpTypes/doxygenXmlParser/doxygenXmlParser.C
- applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C 3 additions, 3 deletions...ities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
- applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C 1 addition, 1 deletion...tilities/preProcessing/createZeroDirectory/boundaryInfo.C
- src/OSspecific/POSIX/regExp.C 8 additions, 4 deletionssrc/OSspecific/POSIX/regExp.C
- src/OSspecific/POSIX/regExp.H 11 additions, 5 deletionssrc/OSspecific/POSIX/regExp.H
- src/OSspecific/POSIX/regExpI.H 6 additions, 0 deletionssrc/OSspecific/POSIX/regExpI.H
- src/OpenFOAM/Make/files 1 addition, 1 deletionsrc/OpenFOAM/Make/files
- src/OpenFOAM/db/IOobjectList/IOobjectList.C 1 addition, 1 deletionsrc/OpenFOAM/db/IOobjectList/IOobjectList.C
- src/OpenFOAM/primitives/strings/keyType/keyType.C 2 additions, 4 deletionssrc/OpenFOAM/primitives/strings/keyType/keyType.C
- src/OpenFOAM/primitives/strings/keyType/keyType.H 16 additions, 9 deletionssrc/OpenFOAM/primitives/strings/keyType/keyType.H
- src/OpenFOAM/primitives/strings/keyType/keyTypeI.H 6 additions, 0 deletionssrc/OpenFOAM/primitives/strings/keyType/keyTypeI.H
- src/OpenFOAM/primitives/strings/lists/hashedWordList.H 23 additions, 16 deletionssrc/OpenFOAM/primitives/strings/lists/hashedWordList.H
- src/OpenFOAM/primitives/strings/lists/hashedWordListI.H 34 additions, 28 deletionssrc/OpenFOAM/primitives/strings/lists/hashedWordListI.H
- src/OpenFOAM/primitives/strings/lists/stringListOps.H 69 additions, 56 deletionssrc/OpenFOAM/primitives/strings/lists/stringListOps.H
- src/OpenFOAM/primitives/strings/lists/stringListOpsTemplates.C 28 additions, 24 deletions...penFOAM/primitives/strings/lists/stringListOpsTemplates.C
- src/OpenFOAM/primitives/strings/string/string.H 10 additions, 4 deletionssrc/OpenFOAM/primitives/strings/string/string.H
- src/OpenFOAM/primitives/strings/string/stringI.H 10 additions, 4 deletionssrc/OpenFOAM/primitives/strings/string/stringI.H
- src/OpenFOAM/primitives/strings/word/word.H 7 additions, 7 deletionssrc/OpenFOAM/primitives/strings/word/word.H
Please register or sign in to comment