obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 36 insertions, 0 deletions

diff --git a/gcc/testsuite/gfortran.dg/fmt_error_3.f90 b/gcc/testsuite/gfortran.dg/fmt_error_3.f90
new file mode 100644
index 000000000..257f876ed
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/fmt_error_3.f90
@@ -0,0 +1,36 @@
+! { dg-do compile }
+
+! PR fortran/29835
+! Check for improved format error messages with correct locus and more detailed
+! "unexpected element" messages.
+
+SUBROUTINE format_labels
+  IMPLICIT NONE
+
+1 FORMAT (A, &
+          A, &
+          Q, & ! { dg-error "Unexpected element 'Q'" }
+          A)
+
+2 FORMAT (A, &
+          I, & ! { dg-error "Nonnegative width" }
+          A)
+
+END SUBROUTINE format_labels
+
+SUBROUTINE format_strings
+  IMPLICIT NONE
+  CHARACTER(len=32), PARAMETER :: str = "hello"
+  INTEGER :: x
+
+  PRINT '(A, Q, A)', & ! { dg-error "Unexpected element 'Q'" }
+        str, str, str ! { dg-bogus "Unexpected element" }
+
+  PRINT '(A, ' // & ! { dg-error "Nonnegative width" }
+        ' I, ' // &
+        ' A)', str, str, str ! { dg-bogus "Nonnegative width" }
+
+  READ '(Q)', & ! { dg-error "Unexpected element 'Q'" }
+       x ! { dg-bogus "Unexpected element" }
+
+END SUBROUTINE format_strings