mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
- 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.
180 lines
3.9 KiB
C++
180 lines
3.9 KiB
C++
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include <cctype>
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
|
|
|
inline void Foam::word::stripInvalid()
|
|
{
|
|
// skip stripping unless debug is active (to avoid costly operations)
|
|
if (debug && string::stripInvalid<word>(*this))
|
|
{
|
|
std::cerr
|
|
<< "word::stripInvalid() called for word "
|
|
<< this->c_str() << std::endl;
|
|
|
|
if (debug > 1)
|
|
{
|
|
std::cerr
|
|
<< " For debug level (= " << debug
|
|
<< ") > 1 this is considered fatal" << std::endl;
|
|
std::abort();
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
|
|
|
inline Foam::word::word()
|
|
:
|
|
string()
|
|
{}
|
|
|
|
|
|
inline Foam::word::word(const word& w)
|
|
:
|
|
string(w)
|
|
{}
|
|
|
|
|
|
inline Foam::word::word(const string& s, const bool doStripInvalid)
|
|
:
|
|
string(s)
|
|
{
|
|
if (doStripInvalid)
|
|
{
|
|
stripInvalid();
|
|
}
|
|
}
|
|
|
|
|
|
inline Foam::word::word(const std::string& s, const bool doStripInvalid)
|
|
:
|
|
string(s)
|
|
{
|
|
if (doStripInvalid)
|
|
{
|
|
stripInvalid();
|
|
}
|
|
}
|
|
|
|
|
|
inline Foam::word::word(const char* s, const bool doStripInvalid)
|
|
:
|
|
string(s)
|
|
{
|
|
if (doStripInvalid)
|
|
{
|
|
stripInvalid();
|
|
}
|
|
}
|
|
|
|
|
|
inline Foam::word::word
|
|
(
|
|
const char* s,
|
|
const size_type len,
|
|
const bool doStripInvalid
|
|
)
|
|
:
|
|
string(s, len)
|
|
{
|
|
if (doStripInvalid)
|
|
{
|
|
stripInvalid();
|
|
}
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
|
|
|
inline bool Foam::word::valid(char c)
|
|
{
|
|
return
|
|
(
|
|
!isspace(c)
|
|
&& c != '"' // string quote
|
|
&& c != '\'' // string quote
|
|
&& c != '/' // path separator
|
|
&& c != ';' // end statement
|
|
&& c != '{' // beg subdict
|
|
&& c != '}' // end subdict
|
|
);
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
|
|
|
|
inline void Foam::word::operator=(const word& w)
|
|
{
|
|
string::operator=(w);
|
|
}
|
|
|
|
|
|
inline void Foam::word::operator=(const string& s)
|
|
{
|
|
string::operator=(s);
|
|
stripInvalid();
|
|
}
|
|
|
|
|
|
inline void Foam::word::operator=(const std::string& s)
|
|
{
|
|
string::operator=(s);
|
|
stripInvalid();
|
|
}
|
|
|
|
|
|
inline void Foam::word::operator=(const char* s)
|
|
{
|
|
string::operator=(s);
|
|
stripInvalid();
|
|
}
|
|
|
|
|
|
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
|
|
|
|
inline Foam::word Foam::operator&(const word& a, const word& b)
|
|
{
|
|
if (b.size())
|
|
{
|
|
string ub = b;
|
|
ub.string::operator[](0) = char(toupper(ub.string::operator[](0)));
|
|
|
|
return a + ub;
|
|
}
|
|
else
|
|
{
|
|
return a;
|
|
}
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|