diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C index f3cc0ff3be..c53ef932c6 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryIO.C +++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C @@ -27,7 +27,6 @@ License #include "IOobject.H" #include "inputSyntaxEntry.H" #include "inputModeEntry.H" -#include "regExp.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C index 640ee9aace..53547bc943 100644 --- a/src/OpenFOAM/db/dictionary/entry/entryIO.C +++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C @@ -57,6 +57,12 @@ bool Foam::entry::getKeyword(keyType& keyword, token& keywordToken, Istream& is) keyword = keywordToken.wordToken(); return true; } + else if (keywordToken.isVariable()) + { + // Disable wildcards for variables + keyword = keyType(keywordToken.stringToken(), false); + return true; + } else if (keywordToken.isString()) { // Enable wildcards diff --git a/src/OpenFOAM/primitives/strings/keyType/keyType.H b/src/OpenFOAM/primitives/strings/keyType/keyType.H index e7657fb11b..ec2a5d1aa9 100644 --- a/src/OpenFOAM/primitives/strings/keyType/keyType.H +++ b/src/OpenFOAM/primitives/strings/keyType/keyType.H @@ -119,6 +119,7 @@ public: // Optionally force a literal match only bool match(const std::string&, bool literalMatch=false) const; + // Member Operators // Assignment