[flang] Fixed up messages per comments from Peter Klausler.

Original-commit: flang-compiler/f18@4103ca4297e3c4cb2cb0dd4378ea3380b37f9874
Reviewed-on: https://github.com/flang-compiler/f18/pull/398
Tree-same-pre-rewrite: false

diff --git a/flang/lib/semantics/resolve-labels.cc b/flang/lib/semantics/resolve-labels.cc
index 466f271b0670a556a1ef0f45bdfa234b2ed5176b..81c967487a10b39cbebf3efdcc49bf99ffae2816 100644 (file)
--- a/flang/lib/semantics/resolve-labels.cc
+++ b/flang/lib/semantics/resolve-labels.cc
@@ -898,12 +898,12 @@ void CheckLabelDoConstraints(const SourceStmtList &dos,
               TargetStatementEnum::CompatibleDo)) {
         errorHandler.Say(doTarget.parserCharBlock,
             parser::MessageFormattedText{
-                "'%u' DO statements must terminate with END DO or CONTINUE"_err_en_US,
+                "'%u' Obsolete construct.  A DO loop should terminate with END DO or CONTINUE"_err_en_US,
                 SayLabel(label)});
       } else {
         errorHandler.Say(doTarget.parserCharBlock,
             parser::MessageFormattedText{
-                "'%u' Obsolete construct not allowed.  DO statements must terminate with END DO or CONTINUE"_en_US,
+                "'%u' A DO loop should terminate with END DO or CONTINUE statement"_en_US,
                 SayLabel(label)});
       }
     } else {

diff --git a/flang/test/semantics/canondo07.f90 b/flang/test/semantics/canondo07.f90
index 5fb8fc690f5a3ba3842f36e54020e0f4d4e03d57..8ea7acaa90ffe960cf3535e9e2cd50d6427a7e23 100644 (file)
--- a/flang/test/semantics/canondo07.f90
+++ b/flang/test/semantics/canondo07.f90
@@ -16,7 +16,7 @@
 ! See R1131 and C1131
 
 ! RUN: ${F18} -funparse-with-symbols %s 2>&1 | ${FileCheck} %s
-! CHECK: Obsolete construct not allowed.  DO statements must terminate with END DO or CONTINUE
+! CHECK: A DO loop should terminate with END DO or CONTINUE
 
 program endDo
   do 10 i = 1, 5