2007-08-09 Tobias Burnus <burnus@net-b.de>

	PR fortran/32987
	* io.c (format_token): Add FMT_ERROR.
	(next_char_not_space): Print error/warning when
	'\t' are used in format specifications.
	(format_lex): Propagate error.
	(check_format): Ditto.

2007-08-09  Tobias Burnus  <burnus@net-b.de>

	PR fortran/32987
	* io/format.c (next_char): Treat '\t' as ' ' in format specification.

2007-08-09  Tobias Burnus  <burnus@net-b.de>

	PR fortran/32987
	* gfortran.dg/fmt_tab_1.f90: New.
	* gfortran.dg/fmt_tab_2.f90: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@127324 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 894f3d9..94dfd97 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,5 +1,14 @@
 2007-08-09  Tobias Burnus  <burnus@net-b.de>
 
+       PR fortran/32987
+       * io.c (format_token): Add FMT_ERROR.
+       (next_char_not_space): Print error/warning when
+       '\t' are used in format specifications.
+       (format_lex): Propagate error.
+       (check_format): Ditto.
+
+2007-08-09  Tobias Burnus  <burnus@net-b.de>
+
        PR fortran/33001
        * arith.c (arith_error): Point in the error message
        to -fno-range-check.

diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c
index 5862222..ef1b88e 100644 (file)
--- a/gcc/fortran/io.c
+++ b/gcc/fortran/io.c
@@ -97,7 +97,7 @@ typedef enum
   FMT_NONE, FMT_UNKNOWN, FMT_SIGNED_INT, FMT_ZERO, FMT_POSINT, FMT_PERIOD,
   FMT_COMMA, FMT_COLON, FMT_SLASH, FMT_DOLLAR, FMT_POS, FMT_LPAREN,
   FMT_RPAREN, FMT_X, FMT_SIGN, FMT_BLANK, FMT_CHAR, FMT_P, FMT_IBOZ, FMT_F,
-  FMT_E, FMT_EXT, FMT_G, FMT_L, FMT_A, FMT_D, FMT_H, FMT_END
+  FMT_E, FMT_EXT, FMT_G, FMT_L, FMT_A, FMT_D, FMT_H, FMT_END, FMT_ERROR
 }
 format_token;
 
@@ -175,12 +175,23 @@ unget_char (void)
 /* Eat up the spaces and return a character.  */
 
 static char
-next_char_not_space (void)
+next_char_not_space (bool *error)
 {
   char c;
   do
     {
       c = next_char (0);
+      if (c == '\t')
+       {
+         if (gfc_option.allow_std & GFC_STD_GNU)
+           gfc_warning ("Extension: Tab character in format at %C");
+         else
+           {
+             gfc_error ("Extension: Tab character in format at %C");
+             *error = true;
+             return c;
+           }
+       }
     }
   while (gfc_is_whitespace (c));
   return c;
@@ -198,6 +209,7 @@ format_lex (void)
   char c, delim;
   int zflag;
   int negative_flag;
+  bool error = false;
 
   if (saved_token != FMT_NONE)
     {
@@ -206,7 +218,7 @@ format_lex (void)
       return token;
     }
 
-  c = next_char_not_space ();
+  c = next_char_not_space (&error);
   
   negative_flag = 0;
   switch (c)
@@ -214,7 +226,7 @@ format_lex (void)
     case '-':
       negative_flag = 1;
     case '+':
-      c = next_char_not_space ();
+      c = next_char_not_space (&error);
       if (!ISDIGIT (c))
        {
          token = FMT_UNKNOWN;
@@ -225,7 +237,7 @@ format_lex (void)
 
       do
        {
-         c = next_char_not_space ();
+         c = next_char_not_space (&error);
          if (ISDIGIT (c))
            value = 10 * value + c - '0';
        }
@@ -255,7 +267,7 @@ format_lex (void)
 
       do
        {
-         c = next_char_not_space ();
+         c = next_char_not_space (&error);
          if (ISDIGIT (c))
            {
              value = 10 * value + c - '0';
@@ -290,7 +302,7 @@ format_lex (void)
       break;
 
     case 'T':
-      c = next_char_not_space ();
+      c = next_char_not_space (&error);
       if (c != 'L' && c != 'R')
        unget_char ();
 
@@ -310,7 +322,7 @@ format_lex (void)
       break;
 
     case 'S':
-      c = next_char_not_space ();
+      c = next_char_not_space (&error);
       if (c != 'P' && c != 'S')
        unget_char ();
 
@@ -318,7 +330,7 @@ format_lex (void)
       break;
 
     case 'B':
-      c = next_char_not_space ();
+      c = next_char_not_space (&error);
       if (c == 'N' || c == 'Z')
        token = FMT_BLANK;
       else
@@ -380,7 +392,7 @@ format_lex (void)
       break;
 
     case 'E':
-      c = next_char_not_space ();
+      c = next_char_not_space (&error);
       if (c == 'N' || c == 'S')
        token = FMT_EXT;
       else
@@ -420,6 +432,9 @@ format_lex (void)
       break;
     }
 
+  if (error)
+    return FMT_ERROR;
+
   return token;
 }
 
@@ -450,6 +465,8 @@ check_format (bool is_input)
   rv = SUCCESS;
 
   t = format_lex ();
+  if (t == FMT_ERROR)
+    goto fail;
   if (t != FMT_LPAREN)
     {
       error = _("Missing leading left parenthesis");
@@ -457,6 +474,8 @@ check_format (bool is_input)
     }
 
   t = format_lex ();
+  if (t == FMT_ERROR)
+    goto fail;
   if (t == FMT_RPAREN)
     goto finished;             /* Empty format is legal */
   saved_token = t;
@@ -464,12 +483,16 @@ check_format (bool is_input)
 format_item:
   /* In this state, the next thing has to be a format item.  */
   t = format_lex ();
+  if (t == FMT_ERROR)
+    goto fail;
 format_item_1:
   switch (t)
     {
     case FMT_POSINT:
       repeat = value;
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t == FMT_LPAREN)
        {
          level++;
@@ -489,6 +512,8 @@ format_item_1:
     case FMT_ZERO:
       /* Signed integer can only precede a P format.  */
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t != FMT_P)
        {
          error = _("Expected P edit descriptor");
@@ -523,6 +548,8 @@ format_item_1:
 
     case FMT_DOLLAR:
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
 
       if (gfc_notify_std (GFC_STD_GNU, "Extension: $ descriptor at %C")
          == FAILURE)
@@ -570,6 +597,8 @@ data_desc:
       if (pedantic)
        {
          t = format_lex ();
+         if (t == FMT_ERROR)
+           goto fail;
          if (t == FMT_POSINT)
            {
              error = _("Repeat count cannot follow P descriptor");
@@ -584,6 +613,8 @@ data_desc:
     case FMT_POS:
     case FMT_L:
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t == FMT_POSINT)
        break;
 
@@ -610,6 +641,8 @@ data_desc:
 
     case FMT_A:
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t != FMT_POSINT)
        saved_token = t;
       break;
@@ -619,6 +652,8 @@ data_desc:
     case FMT_G:
     case FMT_EXT:
       u = format_lex ();
+      if (u == FMT_ERROR)
+       goto fail;
       if (u != FMT_POSINT)
        {
          error = posint_required;
@@ -626,6 +661,8 @@ data_desc:
        }
 
       u = format_lex ();
+      if (u == FMT_ERROR)
+       goto fail;
       if (u != FMT_PERIOD)
        {
          /* Warn if -std=legacy, otherwise error.  */
@@ -638,6 +675,8 @@ data_desc:
        }
 
       u = format_lex ();
+      if (u == FMT_ERROR)
+       goto fail;
       if (u != FMT_ZERO && u != FMT_POSINT)
        {
          error = nonneg_required;
@@ -649,6 +688,8 @@ data_desc:
 
       /* Look for optional exponent.  */
       u = format_lex ();
+      if (u == FMT_ERROR)
+       goto fail;
       if (u != FMT_E)
        {
          saved_token = u;
@@ -656,6 +697,8 @@ data_desc:
       else
        {
          u = format_lex ();
+         if (u == FMT_ERROR)
+           goto fail;
          if (u != FMT_POSINT)
            {
              error = _("Positive exponent width required");
@@ -667,6 +710,8 @@ data_desc:
 
     case FMT_F:
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t != FMT_ZERO && t != FMT_POSINT)
        {
          error = nonneg_required;
@@ -679,6 +724,8 @@ data_desc:
        }
 
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t != FMT_PERIOD)
        {
          /* Warn if -std=legacy, otherwise error.  */
@@ -691,6 +738,8 @@ data_desc:
        }
 
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t != FMT_ZERO && t != FMT_POSINT)
        {
          error = nonneg_required;
@@ -721,6 +770,8 @@ data_desc:
 
     case FMT_IBOZ:
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t != FMT_ZERO && t != FMT_POSINT)
        {
          error = nonneg_required;
@@ -733,6 +784,8 @@ data_desc:
        }
 
       t = format_lex ();
+      if (t == FMT_ERROR)
+       goto fail;
       if (t != FMT_PERIOD)
        {
          saved_token = t;
@@ -740,6 +793,8 @@ data_desc:
       else
        {
          t = format_lex ();
+         if (t == FMT_ERROR)
+           goto fail;
          if (t != FMT_ZERO && t != FMT_POSINT)
            {
              error = nonneg_required;
@@ -757,6 +812,8 @@ data_desc:
 between_desc:
   /* Between a descriptor and what comes next.  */
   t = format_lex ();
+  if (t == FMT_ERROR)
+    goto fail;
   switch (t)
     {
 
@@ -788,6 +845,8 @@ optional_comma:
   /* Optional comma is a weird between state where we've just finished
      reading a colon, slash, dollar or P descriptor.  */
   t = format_lex ();
+  if (t == FMT_ERROR)
+    goto fail;
 optional_comma_1:
   switch (t)
     {
@@ -811,6 +870,8 @@ optional_comma_1:
 extension_optional_comma:
   /* As a GNU extension, permit a missing comma after a string literal.  */
   t = format_lex ();
+  if (t == FMT_ERROR)
+    goto fail;
   switch (t)
     {
     case FMT_COMMA:
@@ -842,7 +903,7 @@ extension_optional_comma:
 
 syntax:
   gfc_error ("%s in format string at %C", error);
-
+fail:
   /* TODO: More elaborate measures are needed to show where a problem
      is within a format string that has been calculated.  */
   rv = FAILURE;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2659bb2..a293fa4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-09  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/32987
+       * gfortran.dg/fmt_tab_1.f90: New.
+       * gfortran.dg/fmt_tab_2.f90: New.
+
 2007-08-09  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
        PR c/32796
@@ -17,8 +23,8 @@
        * gcc.target/mips/code-readable-3.c: Likewise.
 
 2007-08-08  Vladimir Yanovsky  <yanov@il.ibm.com>
-            Revital Eres  <eres@il.ibm.com>
- 
+           Revital Eres  <eres@il.ibm.com>
+
        * gfortran.dg/sms-1.f90: Add comment.
        * gfortran.dg/sms-2.f90: New.
 

diff --git a/gcc/testsuite/gfortran.dg/fmt_tab_1.f90 b/gcc/testsuite/gfortran.dg/fmt_tab_1.f90
new file mode 100644 (file)
index 0000000..cd95da2
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/fmt_tab_1.f90
@@ -0,0 +1,6 @@
+! { dg-do run }
+! PR fortran/32987
+      program TestFormat
+        write (*, 10)
+ 10     format ('Hello ',      'bug!') ! { dg-warning "Extension: Tab character in format" }
+      end

diff --git a/gcc/testsuite/gfortran.dg/fmt_tab_2.f90 b/gcc/testsuite/gfortran.dg/fmt_tab_2.f90
new file mode 100644 (file)
index 0000000..17acf86
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/fmt_tab_2.f90
@@ -0,0 +1,7 @@
+! { dg-do compile }
+! { dg-options "-std=f2003" }
+! PR fortran/32987
+      program TestFormat
+        write (*, 10) ! { dg-error "FORMAT label 10 at .1. not defined" }
+ 10     format ('Hello ',      'bug!') ! { dg-error "Extension: Tab character in format" }
+      end

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index c7e57db..04b0ecf 100644 (file)
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-09  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/32987
+       * io/format.c (next_char): Treat '\t' as ' ' in format specification.
+
 2007-08-06  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
        PR fortran/30947

diff --git a/libgfortran/io/format.c b/libgfortran/io/format.c
index c8cd2a7..d6afa0a 100644 (file)
--- a/libgfortran/io/format.c
+++ b/libgfortran/io/format.c
@@ -92,7 +92,7 @@ next_char (format_data *fmt, int literal)
       fmt->format_string_len--;
       c = toupper (*fmt->format_string++);
     }
-  while (c == ' ' && !literal);
+  while ((c == ' ' || c == '\t') && !literal);
 
   return c;
 }