maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Remove typo that affected complex namelist input 

A recent patch to real/complex formatted input included what must
have been an editing hiccup: "++ ++p" instead of "++p".  This
compiles, and it broke the consumption of the trailing ')' of a
complex value in namelist input by skipping over the character.

Extend existing test to cover this case.

Differential Revision: https://reviews.llvm.org/D114297
This commit is contained in:
Peter Klausler 2021-11-19 15:49:16 -08:00
parent 2f5d6a0ea5
commit d02b318af6
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flang/runtime/edit-input.cpp
View File

@ -303,15 +303,15 @@ static bool TryFastPathRealInput(
for (; p < limit && (*p == ' ' || *p == '\t'); ++p) {
}
if (edit.descriptor == DataEdit::ListDirectedImaginaryPart) {
// Need a trailing ')'
// Need to consume a trailing ')' and any white space after
if (p >= limit || *p != ')') {
return false;
}
for (++ ++p; p < limit && (*p == ' ' || *p == '\t'); ++p) {
for (++p; p < limit && (*p == ' ' || *p == '\t'); ++p) {
}
}
if (p < limit) {
return false; // unconverted characters remain in field
if (edit.width && p < str + *edit.width) {
return false; // unconverted characters remain in fixed width field
}
// Success on the fast path!
// TODO: raise converted.flags as exceptions?

9
flang/unittests/Runtime/NumericalFormatTest.cpp
View File

@ -144,11 +144,11 @@ TEST(IOApiTests, MultilineOutputTest) {
}
TEST(IOApiTests, ListInputTest) {
static const char input[]{",1*,(5.,6..)"};
static const char input[]{",1*,(5.,6.),(7.0,8.0)"};
auto cookie{IONAME(BeginInternalListInput)(input, sizeof input - 1)};
// Create real values for IO tests
static constexpr int numRealValues{6};
static constexpr int numRealValues{8};
float z[numRealValues];
for (int j{0}; j < numRealValues; ++j) {
z[j] = -(j + 1);
@ -166,7 +166,7 @@ TEST(IOApiTests, ListInputTest) {
<< static_cast<int>(status);
// Ensure writing complex values from floats does not result in an error
static constexpr int bufferSize{33};
static constexpr int bufferSize{39};
char output[bufferSize];
output[bufferSize - 1] = '\0';
cookie = IONAME(BeginInternalListOutput)(output, bufferSize - 1);
@ -182,7 +182,8 @@ TEST(IOApiTests, ListInputTest) {
<< static_cast<int>(status);
// Verify output buffer against expected value
static const char expect[bufferSize]{" (-1.,-2.) (-3.,-4.) (5.,6.) "};
static const char expect[bufferSize]{
" (-1.,-2.) (-3.,-4.) (5.,6.) (7.,8.) "};
ASSERT_EQ(std::strncmp(output, expect, bufferSize), 0)
<< "Failed complex list-directed output, expected '" << expect
<< "', but got '" << output << "'";