clean-up

Author: akuhlens

flang/lib/Parser/message.cpp

@@ -272,7 +272,7 @@ static llvm::raw_ostream::Colors PrefixColor(Severity severity) {
   return llvm::raw_ostream::SAVEDCOLOR;
 }
 
-// FIXME: Make these configurable, based on verbosity level.
+// TODO: Make these configurable, based on verbosity level.
 const int MAX_CONTEXTS_EMITTED = 2;
 const bool OMIT_SHARED_CONTEXTS = true;
 
@@ -282,21 +282,23 @@ void Message::Emit(llvm::raw_ostream &o, const AllCookedSources &allCooked,
   const AllSources &sources{allCooked.allSources()};
   sources.EmitMessage(o, provenanceRange, ToString(), Prefix(severity()),
       PrefixColor(severity()), echoSourceLine);
+  // Always refers to if the attachment in the loop below is a context.
   bool isContext{attachmentIsContext_};
-  int contextsEmitted{isContext ? 1 : 0};
+  int contextsEmitted{0};
   // Emit attachments.
   for (const Message *attachment{attachment_.get()}; attachment;
+      isContext = attachment->attachmentIsContext_,
       attachment = attachment->attachment_.get()) {
     Severity severity = isContext ? Severity::Context : attachment->severity();
     auto emitAttachment = [&]() {
       sources.EmitMessage(o, attachment->GetProvenanceRange(allCooked),
           attachment->ToString(), Prefix(severity), PrefixColor(severity),
           echoSourceLine);
     };
-    // TODO isContext is not used correctly here.
-    if (attachment->attachmentIsContext_) {
+
+    if (isContext) {
       // Truncate the number of contexts emitted.
-      if (contextsEmitted <= MAX_CONTEXTS_EMITTED) {
+      if (contextsEmitted < MAX_CONTEXTS_EMITTED) {
         emitAttachment();
         contextsEmitted += 1;
       }

flang/test/Parser/acc-data-statement.f90

@@ -41,7 +41,17 @@ program acc_data_test
 
     ! Negative tests  
     ! Basic data construct in program body
-    !$acc data copy(a, b) create(d)
+    !$acc data copy(a, b) create(d) bogus()
+    !CHECK: acc-data-statement.f90:
+    !CHECK-SAME: error: expected end of OpenACC directive
+    !CHECK-NEXT: !$acc data copy(a, b) create(d) bogus()
+    !CHECK-NEXT: ^
+    !CHECK-NEXT: in the context: OpenACC construct
+    !CHECK-NEXT: !$acc data copy(a, b) create(d) bogus()
+    !CHECK-NEXT: ^
+    !CHECK-NEXT: in the context: execution part
+    !CHECK-NEXT: !$acc data copy(a, b) create(c)
+    !CHECK-NEXT: ^
     a = 1
     b = 2
     d = a + b
@@ -54,7 +64,6 @@ program acc_data_test
         a = a + 1
 !       !$acc end data
         print *, "Inside if block"
-        ! First error in the file.
         !CHECK: acc-data-statement.f90:
         !CHECK-SAME: error: expected OpenACC end block directive
         !CHECK-NEXT: end if
@@ -92,19 +101,19 @@ program acc_data_test
     s = s + 1
 !   !$acc end data
     print *, "After nested data"
-!   !$acc end data
-
-    print *, "Program finished"
+    !$acc end data  I forgot to comment this out.
     !CHECK: acc-data-statement.f90:
-    !CHECK-SAME: error: expected OpenACC end block directive
-    !CHECK-NEXT: contains
-    !CHECK-NEXT: ^ 
+    !CHECK-SAME: error: expected end of OpenACC directive
+    !CHECK-NEXT: !$acc end data  I forgot to comment this out.
+    !CHECK-NEXT: ^
     !CHECK-NEXT: in the context: OpenACC construct
     !CHECK-NEXT: !$acc data copy(s)
     !CHECK-NEXT: ^
     !CHECK-NEXT: in the context: OpenACC construct
     !CHECK-NEXT: !$acc data copyin(a)
     !CHECK-NEXT: ^
+    print *, "Program finished"
+
     !CHECK: acc-data-statement.f90:
     !CHECK-SAME: error: expected OpenACC end block directive
     !CHECK-NEXT: contains
@@ -113,14 +122,14 @@ program acc_data_test
     !CHECK-NEXT: !$acc data copyin(a)
     !CHECK-NEXT: ^
     !CHECK-NEXT: in the context: OpenACC construct
-    !CHECK-NEXT: !$acc data copy(a, b) create(d)
+    !CHECK-NEXT: !$acc data copy(a, b) create(d) bogus()
     !CHECK-NEXT: ^
     !CHECK: acc-data-statement.f90:
     !CHECK-SAME: error: expected OpenACC end block directive
     !CHECK-NEXT: contains
     !CHECK-NEXT: ^
     !CHECK-NEXT: in the context: OpenACC construct
-    !CHECK-NEXT: $acc data copy(a, b) create(d)
+    !CHECK-NEXT: $acc data copy(a, b) create(d) bogus()
     !CHECK-NEXT: ^
     !CHECK-NEXT: in the context: execution part
     !CHECK-NEXT: !$acc data copy(a, b) create(c)