[flang] Separate keyword from clauses in provenance of construct dire…

…ctives Original-commit: flang-compiler/f18@9994d23 Reviewed-on: flang-compiler/f18#569
llvm · Jul 15, 2019 · 3d8b3dd · 3d8b3dd
1 parent ef59f7a
commit 3d8b3dd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/flang/lib/parser/openmp-grammar.h b/flang/lib/parser/openmp-grammar.h
@@ -42,10 +42,6 @@ namespace Fortran::parser {
 constexpr auto startOmpLine = skipStuffBeforeStatement >> "!$OMP "_sptok;
 constexpr auto endOmpLine = space >> endOfLine;
 
-template<typename A> constexpr decltype(auto) OmpConstructDirective(A keyword) {
-  return sourced(keyword >> Parser<OmpClauseList>{}) / endOmpLine;
-}
-
 template<typename A> constexpr decltype(auto) verbatim(A x) {
   return sourced(construct<Verbatim>(x));
 }
@@ -470,8 +466,8 @@ TYPE_PARSER(construct<OpenMPStandaloneConstruct>(
 TYPE_PARSER(startOmpLine >> "END"_tok >>
     construct<OmpEndSingle>("SINGLE" >> Parser<OmpClauseList>{}) / endOmpLine)
 
-TYPE_PARSER(construct<OpenMPSingleConstruct>(
-    OmpConstructDirective("SINGLE"_tok), block, Parser<OmpEndSingle>{}))
+TYPE_PARSER(construct<OpenMPSingleConstruct>(verbatim("SINGLE"_tok),
+    Parser<OmpClauseList>{} / endOmpLine, block, Parser<OmpEndSingle>{}))
 
 // OMP WORKSHARE
 TYPE_PARSER(construct<OpenMPWorkshareConstruct>(
@@ -491,8 +487,8 @@ TYPE_PARSER(startOmpLine >> "END SECTIONS"_tok >>
         maybe("NOWAIT" >> construct<OmpNowait>()) / endOmpLine))
 
 // OMP SECTIONS
-TYPE_PARSER(construct<OpenMPSectionsConstruct>(
-    OmpConstructDirective("SECTIONS"_tok), block, Parser<OmpEndSections>{}))
+TYPE_PARSER(construct<OpenMPSectionsConstruct>(verbatim("SECTIONS"_tok),
+    Parser<OmpClauseList>{} / endOmpLine, block, Parser<OmpEndSections>{}))
 
 // OMP END PARALLEL SECTIONS [NOWAIT]
 TYPE_PARSER(startOmpLine >> "END PARALLEL SECTIONS"_tok >>
@@ -501,8 +497,8 @@ TYPE_PARSER(startOmpLine >> "END PARALLEL SECTIONS"_tok >>
 
 // OMP PARALLEL SECTIONS
 TYPE_PARSER(construct<OpenMPParallelSectionsConstruct>(
-    OmpConstructDirective("PARALLEL SECTIONS"_tok), block,
-    Parser<OmpEndParallelSections>{}))
+    verbatim("PARALLEL SECTIONS"_tok), Parser<OmpClauseList>{} / endOmpLine,
+    block, Parser<OmpEndParallelSections>{}))
 
 TYPE_PARSER(construct<OmpSection>(verbatim("SECTION"_tok) / endOmpLine))
 

diff --git a/flang/lib/parser/parse-tree.h b/flang/lib/parser/parse-tree.h
@@ -3475,12 +3475,12 @@ WRAPPER_CLASS(OmpSection, Verbatim);
 
 struct OpenMPSectionsConstruct {
   TUPLE_CLASS_BOILERPLATE(OpenMPSectionsConstruct);
-  std::tuple<OmpClauseList, Block, OmpEndSections> t;
+  std::tuple<Verbatim, OmpClauseList, Block, OmpEndSections> t;
 };
 
 struct OpenMPParallelSectionsConstruct {
   TUPLE_CLASS_BOILERPLATE(OpenMPParallelSectionsConstruct);
-  std::tuple<OmpClauseList, Block, OmpEndParallelSections> t;
+  std::tuple<Verbatim, OmpClauseList, Block, OmpEndParallelSections> t;
 };
 
 // WORKSHARE
@@ -3493,7 +3493,7 @@ struct OpenMPWorkshareConstruct {
 WRAPPER_CLASS(OmpEndSingle, OmpClauseList);
 struct OpenMPSingleConstruct {
   TUPLE_CLASS_BOILERPLATE(OpenMPSingleConstruct);
-  std::tuple<OmpClauseList, Block, OmpEndSingle> t;
+  std::tuple<Verbatim, OmpClauseList, Block, OmpEndSingle> t;
 };
 
 // OpenMP directive beginning or ending a block