Commit 7889df78 authored by Mark Olesen's avatar Mark Olesen Committed by Andrew Heather
Browse files

fixup #remove functionEntry and revert 09b3c166

- forgot to use readList in removeEntry, which caused the test failure.

- remaining problem:

it doesn't work as might be expected
This is the problem:

dict
{
   foo xxx;
   bar yyy;
}

dict
{
   baz zzz;
   #remove foo
}

This only removes 'foo' from the current scope (the second dict), since
it occurs before the dictionary merge does.

To remove from the final, merged dictionary, we'd need a new
deleteEntry type that would do the right thing on the merge before
self-destructing (ie, removing itself too).
parent 1b7460bc
...@@ -71,7 +71,7 @@ boundaryField ...@@ -71,7 +71,7 @@ boundaryField
} }
// this should have no effect // this should have no effect
//#remove $inactive #remove inactive
inlet_7 { $active } inlet_7 { $active }
#inputMode overwrite #inputMode overwrite
...@@ -105,9 +105,9 @@ baz ...@@ -105,9 +105,9 @@ baz
// this should work // this should work
//#remove active #remove active
// this should work too // this should work too
//#remove ( bar baz ) #remove ( bar baz )
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
...@@ -65,8 +65,8 @@ bool Foam::functionEntries::removeEntry::execute ...@@ -65,8 +65,8 @@ bool Foam::functionEntries::removeEntry::execute
Istream& is Istream& is
) )
{ {
wordList dictKeys = parentDict.toc(); wordList dictKeys = parentDict.toc();
wordReList patterns(is); wordReList patterns = readList<wordRe>(is);
labelList indices = findStrings(patterns, dictKeys); labelList indices = findStrings(patterns, dictKeys);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment