This is an archive of the discontinued LLVM Phabricator instance.

Differential D89017

[flang] Allow "name: value" in compiler directives
ClosedPublic

Authored by klausler on Oct 7 2020, 4:09 PM.

Details

Reviewers
PeteSteinfeld
jdoerfert
Commits
rG3e86eda18c37: [flang] Allow "name: value" in compiler directives
Summary

Some legacy compiler directives use colons rather than
equals signs.

Diff Detail

Event Timeline

klausler created this revision.Oct 7 2020, 4:09 PM
Herald added a reviewer: jdoerfert. · View Herald TranscriptOct 7 2020, 4:09 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a subscriber: llvm-commits. · View Herald Transcript
klausler requested review of this revision.Oct 7 2020, 4:09 PM
Harbormaster completed remote builds in B74368: Diff 296824.Oct 7 2020, 4:21 PM
PeteSteinfeld accepted this revision.Oct 7 2020, 6:50 PM

Builds, tests, and looks good to me.

This revision is now accepted and ready to land.Oct 7 2020, 6:50 PM
This revision was landed with ongoing or failed builds.Oct 8 2020, 10:02 AM
Closed by commit rG3e86eda18c37: [flang] Allow "name: value" in compiler directives (authored by klausler). · Explain Why
This revision was automatically updated to reflect the committed changes.
klausler added a commit: rG3e86eda18c37: [flang] Allow "name: value" in compiler directives.

Revision Contents

PathSize
flang/
lib/
Parser/
10 lines
test/
Parser/
4 lines

Diff 297007

flang/lib/Parser/Fortran-parsers.cpp

Show First 20 Lines • Show All 1,166 Lines • ▼ Show 20 Lines
// Directives, extensions, and deprecated statements // Directives, extensions, and deprecated statements
// !DIR$ IGNORE_TKR [ [(tkr...)] name ]... // !DIR$ IGNORE_TKR [ [(tkr...)] name ]...
// !DIR$ name... // !DIR$ name...
constexpr auto beginDirective{skipStuffBeforeStatement >> "!"_ch}; constexpr auto beginDirective{skipStuffBeforeStatement >> "!"_ch};
constexpr auto endDirective{space >> endOfLine}; constexpr auto endDirective{space >> endOfLine};
constexpr auto ignore_tkr{ constexpr auto ignore_tkr{
"DIR$ IGNORE_TKR" >> optionalList(construct<CompilerDirective::IgnoreTKR>( "DIR$ IGNORE_TKR" >> optionalList(construct<CompilerDirective::IgnoreTKR>(
defaulted(parenthesized(some("tkr"_ch))), name))}; defaulted(parenthesized(some("tkr"_ch))), name))};
TYPE_PARSER( TYPE_PARSER(beginDirective >>
beginDirective >> sourced(construct<CompilerDirective>(ignore_tkr) || sourced(construct<CompilerDirective>(ignore_tkr) ||
construct<CompilerDirective>("DIR$" >> construct<CompilerDirective>(
many(construct<CompilerDirective::NameValue>( "DIR$" >> many(construct<CompilerDirective::NameValue>(name,
name, maybe("=" >> digitString64))))) / maybe(("="_tok || ":"_tok) >> digitString64))))) /
endDirective) endDirective)
TYPE_PARSER(extension<LanguageFeature::CrayPointer>(construct<BasedPointerStmt>( TYPE_PARSER(extension<LanguageFeature::CrayPointer>(construct<BasedPointerStmt>(
"POINTER" >> nonemptyList("expected POINTER associations"_err_en_US, "POINTER" >> nonemptyList("expected POINTER associations"_err_en_US,
construct<BasedPointer>("(" >> objectName / ",", construct<BasedPointer>("(" >> objectName / ",",
objectName, maybe(Parser<ArraySpec>{}) / ")"))))) objectName, maybe(Parser<ArraySpec>{}) / ")")))))
TYPE_PARSER(construct<StructureStmt>("STRUCTURE /" >> name / "/", pure(true), TYPE_PARSER(construct<StructureStmt>("STRUCTURE /" >> name / "/", pure(true),
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines

flang/test/Parser/compiler-directives.f90

! RUN: %f18 -funparse %s 2>&1 ! RUN: %f18 -funparse %s 2>&1
! Test that compiler directives can appear in various places. ! Test that compiler directives can appear in various places.
!dir$ integer !dir$ integer
module m module m
!dir$ integer !dir$ integer
use iso_fortran_env use iso_fortran_env
!dir$ integer !dir$ integer
implicit integer(a-z) implicit integer(a-z)
!dir$ integer !dir$ integer
!dir$ integer=64
!dir$ integer = 64
!dir$ optimize:1
!dir$ optimize : 1
end end