From 237f2e1076e9f3185da11b1fb1749508add3d22a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 Jun 2020 00:28:00 +0200
Subject: [PATCH] STYLE: accept label for version in dictionary header
- refinement of commit 33f9ae5080f0.
After foamDictionary -expand, the '2.0' becomes '2', so accept that
as a reasonable token.
---
src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.C | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.C b/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.C
index 7138043a726..a4d5255ee2f 100644
--- a/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.C
+++ b/src/OpenFOAM/db/IOstreams/IOstreams/IOstreamOption.C
@@ -155,14 +155,16 @@ Foam::IOstreamOption::versionNumber::versionNumber(const token& tok)
{
(*this) = versionNumber(tok.stringToken());
}
- else if (tok.isScalar())
+ else if (tok.isNumber())
{
- (*this) = versionNumber(float(tok.scalarToken()));
+ // Accept integer or floating-point
+ // Eg, '2.0' becomes '2' after foamDictionary -expand
+ (*this) = versionNumber(float(tok.number()));
}
else
{
WarningInFunction
- << "Wrong token for version - expected word/float, found "
+ << "Wrong token for version - expected word/number, found "
<< tok.info() << nl;
}
}
--
GitLab