From 86e9d05f3541b1142799a2772dab463bc696221c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tobias=20Schl=C3=BCter?= Date: Mon, 24 Sep 2007 23:15:00 +0200 Subject: [PATCH] re PR fortran/33269 (Diagnose missing "(" in "PRINT ('a'),") PR fortran/33269 fortran/ * io.c (check_format_string): Move NULL and constant checks into this function. (check_io_constraints): Call gfc_simplify_expr() before calling check_format_string(). Remove NULL and constant checks. testsuite/ * gfortran.dg/fmt_error_2.f90: New. From-SVN: r128732 --- gcc/fortran/ChangeLog | 8 ++++++ gcc/fortran/io.c | 7 +++-- gcc/testsuite/ChangeLog | 8 ++++++ gcc/testsuite/gfortran.dg/fmt_error_2.f90 | 35 +++++++++++++++++++++++ 4 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/fmt_error_2.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 00f2cb9176c..fcf15997eb4 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2007-09-23 Tobias Schlüter + + PR fortran/33269 + * io.c (check_format_string): Move NULL and constant checks into + this function. + (check_io_constraints): Call gfc_simplify_expr() before calling + check_format_string(). Remove NULL and constant checks. + 2007-09-24 Francois-Xavier Coudert PR fortran/33538 diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index 901af922b95..0e2a0cb7df2 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -919,6 +919,9 @@ finished: static try check_format_string (gfc_expr *e, bool is_input) { + if (!e || e->expr_type != EXPR_CONSTANT) + return SUCCESS; + mode = MODE_STRING; format_string = e->value.character.string; return check_format (is_input); @@ -2786,8 +2789,8 @@ if (condition) \ } expr = dt->format_expr; - if (expr != NULL && expr->expr_type == EXPR_CONSTANT - && check_format_string (expr, k == M_READ) == FAILURE) + if (gfc_simplify_expr (expr, 0) == FAILURE + || check_format_string (expr, k == M_READ) == FAILURE) return MATCH_ERROR; return m; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9dfab26018f..f4da1ddf0a2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2007-09-23 Tobias Schlüter + + PR fortran/33269 + * io.c (check_format_string): Move NULL and constant checks into + this function. + (check_io_constraints): Call gfc_simplify_expr() before calling + check_format_string(). Remove NULL and constant checks. + 2007-09-24 Roman Zippel * gcc.c-torture/execute/loop-2f.x: New. Disable test for m68k-linux. diff --git a/gcc/testsuite/gfortran.dg/fmt_error_2.f90 b/gcc/testsuite/gfortran.dg/fmt_error_2.f90 new file mode 100644 index 00000000000..8fdaf9e3f21 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/fmt_error_2.f90 @@ -0,0 +1,35 @@ +! { dg-do compile } +! PR 33269: we used to not simplify format strings before checking if +! they were valid, leading to a missed error. + +IMPLICIT CHARACTER*5 (h-z) + +CHARACTER*5 f +CHARACTER*5 bad, good +parameter(bad="a", good="(a)") + +PRINT ('a'), "hello" ! { dg-error "Missing leading left parenthesis in format string" } +WRITE (*, ("a")) "error" ! { dg-error "Missing leading left parenthesis in format string" } + +PRINT 'a', "hello" ! { dg-error "Missing leading left parenthesis in format string" } +WRITE (*, "a") "error" ! { dg-error "Missing leading left parenthesis in format string" } +WRITE (*, bad) "error" ! { dg-error "Missing leading left parenthesis in format string" } + +PRINT 'a' // ', a', "err", "or" ! { dg-error "Missing leading left parenthesis in format string" } + +PRINT '(' // 'a' ! { dg-error "Unexpected end of format string in format string" } + +! the following are ok +PRINT "(2f5.3)", bar, foo +PRINT ' (a)', "hello" +WRITE (*, " ((a))") "hello" +print "(a" // ")", "all is fine" +print good, "great" + +! verify that we haven't broken non-constant expressions +f = "(f5.3)" +print f, 3.14159 +print (f), 2.71813 +print implicitly_typed, "something" +write (*, implicitly_typed_as_well) "something else" +END -- 2.30.2