mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
- the readList<T>(Istream&) function was introduced to handle command
-options with either a single or a list value, but was also used for
the #remove dictionary directive. However, the parsing was fragile
if the list did not start with a '('.
Now handle command-line arg/option list directly (via ITstream)
and #remove with special-purpose reading of a string or word list.
This removes ambiguity and reduces potential future problems.
STYLE: use ITstream instead of IStringStream for command-line lookups
- parses directly to a tokenList without a string copy.
161 lines
4.3 KiB
C++
161 lines
4.3 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/>.
|
|
|
|
Namespace
|
|
Foam::functionEntries
|
|
|
|
Description
|
|
Namespace for containing a functionEntry.
|
|
|
|
|
|
Class
|
|
Foam::functionEntry
|
|
|
|
Description
|
|
A functionEntry causes entries to be added/manipulated on the specified
|
|
dictionary given an input stream.
|
|
|
|
In dictionaries, a \c '\#' sigil is typically used for a functionEntry.
|
|
|
|
SourceFiles
|
|
functionEntry.C
|
|
functionEntryIO.C
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#ifndef functionEntry_H
|
|
#define functionEntry_H
|
|
|
|
#include "word.H"
|
|
#include "memberFunctionSelectionTables.H"
|
|
#include "primitiveEntry.H"
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
namespace Foam
|
|
{
|
|
|
|
class dictionary;
|
|
|
|
/*---------------------------------------------------------------------------*\
|
|
Class functionEntry Declaration
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
class functionEntry
|
|
:
|
|
public primitiveEntry
|
|
{
|
|
// Private Member Functions
|
|
|
|
//- Disallow default bitwise copy construct
|
|
functionEntry(const functionEntry&) = delete;
|
|
|
|
//- Disallow default bitwise assignment
|
|
void operator=(const functionEntry&) = delete;
|
|
|
|
|
|
protected:
|
|
|
|
//- Read line and return as a string token
|
|
static token readLine(const word& key, Istream& is);
|
|
|
|
//- Read a List of strings values, treating a single entry like a
|
|
//- list of size 1.
|
|
template<class StringType>
|
|
static List<StringType> readStringList(Istream& is);
|
|
|
|
public:
|
|
|
|
// Constructors
|
|
|
|
//- Construct from keyword, parent dictionary and Istream
|
|
functionEntry(const word& key, const dictionary& dict, Istream& is);
|
|
|
|
|
|
// Member Function Selectors
|
|
|
|
declareMemberFunctionSelectionTable
|
|
(
|
|
bool,
|
|
functionEntry,
|
|
execute,
|
|
dictionaryIstream,
|
|
(
|
|
dictionary& parentDict,
|
|
Istream& is
|
|
),
|
|
(parentDict, is)
|
|
);
|
|
|
|
//- Execute the functionEntry in a sub-dict context
|
|
static bool execute
|
|
(
|
|
const word& functionName,
|
|
dictionary& parentDict,
|
|
Istream& is
|
|
);
|
|
|
|
declareMemberFunctionSelectionTable
|
|
(
|
|
bool,
|
|
functionEntry,
|
|
execute,
|
|
primitiveEntryIstream,
|
|
(
|
|
const dictionary& parentDict,
|
|
primitiveEntry& entry,
|
|
Istream& is
|
|
),
|
|
(parentDict, entry, is)
|
|
);
|
|
|
|
//- Execute the functionEntry in a primitiveEntry context
|
|
static bool execute
|
|
(
|
|
const word& functionName,
|
|
const dictionary& parentDict,
|
|
primitiveEntry& entry,
|
|
Istream& is
|
|
);
|
|
|
|
//- Write
|
|
virtual void write(Ostream& os) const;
|
|
};
|
|
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
} // End namespace Foam
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
#ifdef NoRepository
|
|
#include "functionEntryTemplates.C"
|
|
#endif
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
#endif
|
|
|
|
// ************************************************************************* //
|