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: use exprString expansions for #eval

Browse Source 
- follows the principle of least surprise if the expansion behaviour
  for #eval and expressions (eg, exprFixedValue) are the same.  This
  is possible now that we harness the regular stringOps::expand()
  within exprString::expand()
This commit is contained in:
Mark Olesen
2019-12-17 09:10:35 +01:00
parent c1b07cd103
commit 1cf795a40f
8 changed files with 142 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/OpenFOAM/expressions/exprEntry/expressionEntry.C
View File

@ -223,12 +223,15 @@ void Foam::exprTools::expressionEntry::inplaceExpand
stringOps::inplaceTrim(varName);
// Allow recursive plain expansion for the *variable* name.
// This means "$[(vector) var${index] ]" should work
stringOps::inplaceExpand(varName, dict);
// This means "$[(vector) var${index} ]" should work
// Expand with env=true, empty=true, subDict=false
stringOps::inplaceExpand(varName, dict, true, true, false);
// Length of original text to replace (incl. decorators)
const auto replaceLen = (varEnd - varBeg + 1);
// Get primitiveEntry with env=false, subDict=false
const entry* eptr = getVariableOrDie(varName, dict);
std::string varValue;
@ -236,7 +239,17 @@ void Foam::exprTools::expressionEntry::inplaceExpand
if (castTo.empty())
{
// Serialized with spaces
varValue = eptr->stream().toString();
ITstream& its = eptr->stream();
if (its.size() == 1 && its[0].isStringType())
{
// Already a string-type (WORD, STRING, ...). Just copy.
varValue = its[0].stringToken();
}
else
{
varValue = its.toString();
}
}
else
{
@ -258,7 +271,8 @@ void Foam::exprTools::expressionEntry::inplaceExpand
// - this is done second such that $[(vector) xyz] entries will have
// been properly expanded by this stage
stringOps::inplaceExpand(s, dict);
// Expand with env=true, empty=true, subDict=false
stringOps::inplaceExpand(s, dict, true, true, false);
}