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: expose null constructible dictionary searcher

Browse Source
This commit is contained in:
Mark Olesen
2017-11-03 10:18:22 +01:00
parent 2ee1f73ff2
commit b9d97d96c1
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/OpenFOAM/db/dictionary/dictionary.C
View File

@ -271,7 +271,7 @@ const Foam::entry& Foam::dictionary::lookupEntry
bool patternMatch
) const
{
auto finder = csearch(keyword, recursive, patternMatch);
const const_searcher finder(csearch(keyword, recursive, patternMatch));
if (!finder.found())
{
@ -320,7 +320,7 @@ bool Foam::dictionary::substituteKeyword(const word& keyword, bool mergeEntry)
const word varName(keyword.substr(1), false);
// Lookup the variable name in the given dictionary
const_searcher finder = csearch(varName, true, true);
const const_searcher finder(csearch(varName, true, true));
// If defined insert its entries into this dictionary
if (finder.found())
@ -354,7 +354,7 @@ bool Foam::dictionary::substituteScopedKeyword
const word varName(keyword.substr(1), false);
// Lookup the variable name in the given dictionary
const_searcher finder = csearchScoped(varName, true, true);
const const_searcher finder(csearchScoped(varName, true, true));
// If defined insert its entries into this dictionary
if (finder.found())
@ -397,7 +397,7 @@ Foam::dictionary* Foam::dictionary::subDictPtr(const word& keyword)
const Foam::dictionary& Foam::dictionary::subDict(const word& keyword) const
{
// Find non-recursive with patterns
auto finder = csearch(keyword, false, true);
const const_searcher finder(csearch(keyword, false, true));
if (!finder.found())
{
@ -416,7 +416,7 @@ const Foam::dictionary& Foam::dictionary::subDict(const word& keyword) const
Foam::dictionary& Foam::dictionary::subDict(const word& keyword)
{
// Find non-recursive with patterns
auto finder = search(keyword, false, true);
searcher finder = search(keyword, false, true);
if (!finder.found())
{
@ -439,7 +439,7 @@ Foam::dictionary Foam::dictionary::subOrEmptyDict
) const
{
// Find non-recursive with patterns
auto finder = csearch(keyword, false, true);
const const_searcher finder(csearch(keyword, false, true));
if (finder.isDict())
{
@ -475,7 +475,7 @@ const Foam::dictionary& Foam::dictionary::optionalSubDict
const word& keyword
) const
{
auto finder = csearch(keyword, false, true);
const const_searcher finder(csearch(keyword, false, true));
if (finder.isDict())
{
@ -535,6 +535,11 @@ Foam::List<Foam::keyType> Foam::dictionary::keys(bool patterns) const
bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
{
if (!entryPtr)
{
return false;
}
auto iter = hashedEntries_.find(entryPtr->keyword());
if (mergeEntry && iter.found())
@ -543,8 +548,8 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
if (iter()->isDict() && entryPtr->isDict())
{
iter()->dict().merge(entryPtr->dict());
delete entryPtr;
delete entryPtr;
return true;
}
@ -576,6 +581,7 @@ bool Foam::dictionary::add(entry* entryPtr, bool mergeEntry)
<< " in dictionary " << name() << endl;
parent_type::remove(entryPtr);
delete entryPtr;
return false;
}
@ -657,8 +663,13 @@ void Foam::dictionary::add
void Foam::dictionary::set(entry* entryPtr)
{
if (!entryPtr)
{
return;
}
// Find non-recursive with patterns
auto finder = search(entryPtr->keyword(), false, true);
searcher finder(search(entryPtr->keyword(), false, true));
// Clear dictionary so merge acts like overwrite
if (finder.isDict())

15
src/OpenFOAM/db/dictionary/dictionary.H
View File

@ -222,13 +222,6 @@ public:
pointer eptr_;
//- Construct null
Searcher()
:
dict_(nullptr),
eptr_(nullptr)
{}
//- Construct for the given dictionary context
Searcher(dict_pointer dict)
:
@ -245,6 +238,14 @@ public:
public:
//- Construct null
Searcher()
:
dict_(nullptr),
eptr_(nullptr)
{}
//- Entry was found.
inline bool found() const
{

1
src/OpenFOAM/db/dictionary/dictionarySearch.C
View File

@ -587,6 +587,7 @@ Foam::dictionary* Foam::dictionary::makeScopedDictPtr(const fileName& dictPath)
}
else
{
// Note: a failed add() deletes the eptr passed
return nullptr;
}
}