This is an archive of the discontinued LLVM Phabricator instance.

Differential D117818

[flang] Allow explicit '+' in NAMELIST input subscripts
ClosedPublic

Authored by klausler on Jan 20 2022, 11:09 AM.

Details

Reviewers
mleair
Commits
rG922c29ccf143: [flang] Allow explicit '+' in NAMELIST input subscripts
Summary

Array subscripts and substring limits in NAMELIST input are
allowed to bear an explicit plus sign.

Diff Detail

Event Timeline

klausler created this revision.Jan 20 2022, 11:09 AM
Herald added a subscriber: jdoerfert. · View Herald TranscriptJan 20 2022, 11:09 AM
klausler requested review of this revision.Jan 20 2022, 11:09 AM
Harbormaster completed remote builds in B144641: Diff 401712.Jan 20 2022, 1:07 PM
mleair accepted this revision.Jan 20 2022, 4:17 PM

LGTM

This revision is now accepted and ready to land.Jan 20 2022, 4:17 PM
Closed by commit rG922c29ccf143: [flang] Allow explicit '+' in NAMELIST input subscripts (authored by klausler). · Explain WhyJan 20 2022, 5:01 PM
This revision was automatically updated to reflect the committed changes.
klausler added a commit: rG922c29ccf143: [flang] Allow explicit '+' in NAMELIST input subscripts.
Herald added a project: Restricted Project. · View Herald TranscriptJan 20 2022, 5:01 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
flang/
runtime/
2 lines
unittests/
Runtime/
4 lines

Diff 401712

flang/runtime/namelist.cpp

Context not available.
std::optional<SubscriptValue> value; std::optional<SubscriptValue> value;
std::optional<char32_t> ch{io.GetCurrentChar()}; std::optional<char32_t> ch{io.GetCurrentChar()};
bool negate{ch && *ch == '-'}; bool negate{ch && *ch == '-'};
if (negate) { if ((ch && *ch == '+') || negate) {
io.HandleRelativePosition(1); io.HandleRelativePosition(1);
ch = io.GetCurrentChar(); ch = io.GetCurrentChar();
} }
Context not available.

flang/unittests/Runtime/Namelist.cpp

Context not available.
aDesc->GetDimension(1).SetBounds(-1, 1); aDesc->GetDimension(1).SetBounds(-1, 1);
const NamelistGroup::Item items[]{{"a", *aDesc}}; const NamelistGroup::Item items[]{{"a", *aDesc}};
const NamelistGroup group{"justa", 1, items}; const NamelistGroup group{"justa", 1, items};
static char t1[]{"&justa A(0,1:-1:-2)=1 2/"}; static char t1[]{"&justa A(0,+1:-1:-2)=1 2/"};
StaticDescriptor<1, true> statDesc; StaticDescriptor<1, true> statDesc;
Descriptor &internalDesc{statDesc.descriptor()}; Descriptor &internalDesc{statDesc.descriptor()};
internalDesc.Establish(TypeCode{CFI_type_char}, internalDesc.Establish(TypeCode{CFI_type_char},
Context not available.
std::vector<std::string>{"abcdefgh", "ijklmnop"}, 8)}; std::vector<std::string>{"abcdefgh", "ijklmnop"}, 8)};
const NamelistGroup::Item items[]{{"a", *scDesc}}; const NamelistGroup::Item items[]{{"a", *scDesc}};
const NamelistGroup group{"justa", 1, items}; const NamelistGroup group{"justa", 1, items};
static char t1[]{"&justa A(:)(2:5)='BCDE' 'JKLM'/"}; static char t1[]{"&justa A(:)(2:+5)='BCDE' 'JKLM'/"};
StaticDescriptor<1, true> statDesc; StaticDescriptor<1, true> statDesc;
Descriptor &internalDesc{statDesc.descriptor()}; Descriptor &internalDesc{statDesc.descriptor()};
internalDesc.Establish(TypeCode{CFI_type_char}, internalDesc.Establish(TypeCode{CFI_type_char},
Context not available.