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

BUG: verbatim token output strips type (#1497)

Browse Source 
- use os::write(token) for verbatim string to preserve its type
This commit is contained in:
Mark Olesen
2020-01-20 10:09:58 +01:00
parent 5d33586864
commit 21456b8cdc
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/OpenFOAM/db/IOstreams/token/tokenIO.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2017-2018 OpenCFD Ltd. Copyright (C) 2017-2020 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -194,12 +194,13 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const token& tok)
break; break;
case token::tokenType::STRING: case token::tokenType::STRING:
case token::tokenType::VERBATIMSTRING:
os << *tok.data_.stringPtr; os << *tok.data_.stringPtr;
break; break;
case token::tokenType::VARIABLE: case token::tokenType::VARIABLE:
// Behaviour differs according to stream type case token::tokenType::VERBATIMSTRING:
// Different behaviour for (serial/parallel) stream type
// - preserve its type
os.write(tok); os.write(tok);
break; break;

8
src/OpenFOAM/db/dynamicLibrary/codedBase/codedBase.C
View File

@ -62,8 +62,12 @@ static inline void writeEntryIfPresent
if (eptr) if (eptr)
{ {
const token& tok = eptr->stream()[0]; const tokenList& toks = eptr->stream();
os.writeKeyword(key) << tok << token::END_STATEMENT << nl;
if (!toks.empty())
{
os.writeEntry(key, toks[0]);
}
} }
} }
//! \endcond //! \endcond