diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2008-11-15 05:03:56 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2008-11-15 05:03:56 +0000 |
| commit | 746578121846f7d43a2ed2ffa716a08750ea3dec (patch) | |
| tree | 6ee9440230204afb5acd2f4057a1e4489191d9fb /gcc/fortran/io.c | |
| parent | e344d690303de86e22ac633c2462ed2521320f86 (diff) | |
| download | gcc-746578121846f7d43a2ed2ffa716a08750ea3dec.zip gcc-746578121846f7d43a2ed2ffa716a08750ea3dec.tar.gz gcc-746578121846f7d43a2ed2ffa716a08750ea3dec.tar.bz2 | |
re PR fortran/37988 (Edit descriptor checking (compile time) for "<Holerith>T)")
2008-11-14 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/37988
* io.c (enum format_token): For readability replace FMT_POS with FMT_T,
FMT_TL, and FMT_TR. (format_lex): Use new enumerators. (check_format):
Add check for missing positive integer.
From-SVN: r141879
Diffstat (limited to 'gcc/fortran/io.c')
| -rw-r--r-- | gcc/fortran/io.c | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/gcc/fortran/io.c b/gcc/fortran/io.c index cb89edd..1c42a96 100644 --- a/gcc/fortran/io.c +++ b/gcc/fortran/io.c @@ -107,10 +107,10 @@ static gfc_dt *current_dt; 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_COMMA, FMT_COLON, FMT_SLASH, FMT_DOLLAR, 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_ERROR, FMT_DC, - FMT_DP + FMT_DP, FMT_T, FMT_TR, FMT_TL } format_token; @@ -314,10 +314,18 @@ format_lex (void) case 'T': c = next_char_not_space (&error); - if (c != 'L' && c != 'R') - unget_char (); - - token = FMT_POS; + switch (c) + { + case 'L': + token = FMT_TL; + break; + case 'R': + token = FMT_TR; + break; + default: + token = FMT_T; + unget_char (); + } break; case '(': @@ -596,7 +604,9 @@ format_item_1: goto finished; - case FMT_POS: + case FMT_T: + case FMT_TL: + case FMT_TR: case FMT_IBOZ: case FMT_F: case FMT_E: @@ -646,7 +656,17 @@ data_desc: goto optional_comma; - case FMT_POS: + case FMT_T: + case FMT_TL: + case FMT_TR: + t = format_lex (); + if (t != FMT_POSINT) + { + error = _("Positive width required with T descriptor"); + goto syntax; + } + break; + case FMT_L: t = format_lex (); if (t == FMT_ERROR) |