51cd7ceecb
- direct check of punctuation.
For example,
while (!tok.isPunctuation(token::BEGIN_LIST)) ..
instead of
while (!(tok.isPunctuation() && tok.pToken() == token::BEGIN_LIST)) ..
Using direct comparison (tok != token::BEGIN_LIST) can be fragile
when comparing int values:
int c = readChar(is);
while (tok != c) .. // Danger, uses LABEL comparison!
- direct check of word.
For example,
if (tok.isWord("uniform")) ..
instead of
if (tok.isWord() && tok.wordToken() == "uniform") ..
- make token lineNumber() a setter method
ENH: adjust internal compound method empty() -> moved()
- support named compound tokens
STYLE: setter method for stream indentation
111 lines
2.9 KiB
C
111 lines
2.9 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | www.openfoam.com
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
Copyright (C) 2016 OpenFOAM Foundation
|
|
Copyright (C) 2021 OpenCFD Ltd.
|
|
-------------------------------------------------------------------------------
|
|
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/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
|
|
|
template<class T>
|
|
void Foam::blockMeshTools::read
|
|
(
|
|
Istream& is,
|
|
List<T>& list,
|
|
const dictionary& dict
|
|
)
|
|
{
|
|
token tok(is);
|
|
|
|
if (tok.isLabel())
|
|
{
|
|
const label len = tok.labelToken();
|
|
|
|
// Set list length to that read
|
|
list.resize(len);
|
|
|
|
// Read beginning of contents
|
|
const char delimiter = is.readBeginList("List");
|
|
|
|
if (len)
|
|
{
|
|
if (delimiter == token::BEGIN_LIST)
|
|
{
|
|
for (label i=0; i<len; ++i)
|
|
{
|
|
read(is, list[i], dict);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Read end of contents
|
|
is.readEndList("List");
|
|
}
|
|
else if (tok.isPunctuation(token::BEGIN_LIST))
|
|
{
|
|
SLList<T> sll;
|
|
|
|
is >> tok;
|
|
is.fatalCheck(FUNCTION_NAME);
|
|
|
|
while (!tok.isPunctuation(token::END_LIST))
|
|
{
|
|
is.putBack(tok);
|
|
|
|
T elem;
|
|
read(is, elem, dict);
|
|
sll.append(elem);
|
|
|
|
is >> tok;
|
|
is.fatalCheck(FUNCTION_NAME);
|
|
}
|
|
|
|
// Convert the singly-linked list to this list
|
|
list = std::move(sll);
|
|
}
|
|
else
|
|
{
|
|
FatalIOErrorInFunction(is)
|
|
<< "incorrect first token, expected <int> or '(', found "
|
|
<< tok.info() << nl
|
|
<< exit(FatalIOError);
|
|
}
|
|
}
|
|
|
|
|
|
template<class T>
|
|
Foam::List<T> Foam::blockMeshTools::read
|
|
(
|
|
Istream& is,
|
|
const dictionary& dict
|
|
)
|
|
{
|
|
List<T> list;
|
|
read(is, list, dict);
|
|
return list;
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|