Addressed NIT comments.

Author: swatheesh-mcw

flang/lib/Parser/openmp-parsers.cpp

@@ -1190,7 +1190,7 @@ TYPE_PARSER(sourced(construct<OmpSimpleStandaloneDirective>(first(
 TYPE_PARSER(sourced(construct<OpenMPSimpleStandaloneConstruct>(
     Parser<OmpSimpleStandaloneDirective>{}, Parser<OmpClauseList>{})))
 
-// 14.1 Interop construct
+// OMP 5.2 14.1 Interop construct
 TYPE_PARSER(sourced(construct<OpenMPInteropConstruct>(
     verbatim("INTEROP"_tok), sourced(Parser<OmpClauseList>{}))))
 

flang/lib/Parser/unparse.cpp

@@ -2167,7 +2167,7 @@ class UnparseVisitor {
   void Unparse(const OmpInitClause &x) {
     using Modifier = OmpInitClause::Modifier;
     auto &modifiers{std::get<std::optional<std::list<Modifier>>>(x.t)};
-    bool isTypeStart = true;
+    bool isTypeStart{true};
     for (const Modifier &m : *modifiers) {
       if (auto *interopPreferenceMod{
               std::get_if<parser::OmpInteropPreference>(&m.u)}) {

flang/lib/Semantics/check-omp-structure.cpp

@@ -5611,7 +5611,7 @@ void OmpStructureChecker::Enter(const parser::OpenMPInteropConstruct &x) {
               if (llvm::is_contained(objectSymbolList, objectSymbol)) {
                 context_.Say(
                     GetContext().directiveSource,
-                    "Each interop-var may be specified for at most one action-clause of each interop construct."_err_en_US);
+                    "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
               } else {
                 objectSymbolList.insert(objectSymbol);
               }
@@ -5627,7 +5627,7 @@ void OmpStructureChecker::Enter(const parser::OpenMPInteropConstruct &x) {
               if (llvm::is_contained(objectSymbolList, objectSymbol)) {
                 context_.Say(
                     GetContext().directiveSource,
-                    "Each interop-var may be specified for at most one action-clause of each interop construct."_err_en_US);
+                    "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
               } else {
                 objectSymbolList.insert(objectSymbol);
               }
@@ -5640,7 +5640,7 @@ void OmpStructureChecker::Enter(const parser::OpenMPInteropConstruct &x) {
               if (llvm::is_contained(objectSymbolList, objectSymbol)) {
                 context_.Say(
                     GetContext().directiveSource,
-                    "Each interop-var may be specified for at most one action-clause of each interop construct."_err_en_US);
+                    "Each interop-var may be specified for at most one action-clause of each INTEROP construct."_err_en_US);
               } else {
                 objectSymbolList.insert(objectSymbol);
               }
@@ -5656,7 +5656,7 @@ void OmpStructureChecker::Enter(const parser::OpenMPInteropConstruct &x) {
   if (isDependClauseOccured && !targetSyncCount) {
     context_.Say(
         GetContext().directiveSource,
-        "A depend clause can only appear on the directive if the interop-type includes targetsync"_err_en_US);
+        "A DEPEND clause can only appear on the directive if the interop-type includes TARGETSYNC"_err_en_US);
   }
 }
 

flang/test/Semantics/OpenMP/interop-construct.f90

@@ -8,7 +8,7 @@
 SUBROUTINE test_interop_01()
   USE omp_lib
   INTEGER(OMP_INTEROP_KIND) :: obj
-  !ERROR: Each interop-var may be specified for at most one action-clause of each interop construct.
+  !ERROR: Each interop-var may be specified for at most one action-clause of each INTEROP construct.
   !$OMP INTEROP INIT(TARGETSYNC,TARGET: obj) USE(obj)
   PRINT *, 'pass'
 END SUBROUTINE test_interop_01
@@ -24,7 +24,7 @@ END SUBROUTINE test_interop_02
 SUBROUTINE test_interop_03()
   USE omp_lib
   INTEGER(OMP_INTEROP_KIND) :: obj
-  !ERROR: A depend clause can only appear on the directive if the interop-type includes targetsync
+  !ERROR: A DEPEND clause can only appear on the directive if the interop-type includes TARGETSYNC
   !$OMP INTEROP INIT(TARGET: obj) DEPEND(INOUT: obj)
   PRINT *, 'pass'
 END SUBROUTINE test_interop_03