diff options
| author | Per Bothner <bothner@bothner.com> | 2006-06-01 16:18:34 +0000 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2006-06-01 09:18:34 -0700 |
| commit | 45a82bd9573cb4b385dca060f340d535b2c04e5f (patch) | |
| tree | b79b8d4ea7e11b5d4679298140dcaf2a650275b8 /gcc/fortran/scanner.c | |
| parent | e118597e1909cbb4d59374306ec219a386a8a42a (diff) | |
| download | gcc-45a82bd9573cb4b385dca060f340d535b2c04e5f.zip gcc-45a82bd9573cb4b385dca060f340d535b2c04e5f.tar.gz gcc-45a82bd9573cb4b385dca060f340d535b2c04e5f.tar.bz2 | |
data.c (gfc_assign_data_value): Handle USE_MAPPED_LOCATION.
* data.c (gfc_assign_data_value): Handle USE_MAPPED_LOCATION.
* scanner.c (gfc_gobble_whitespace): Likewise.
From-SVN: r114310
Diffstat (limited to 'gcc/fortran/scanner.c')
| -rw-r--r-- | gcc/fortran/scanner.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gcc/fortran/scanner.c b/gcc/fortran/scanner.c index d05d603..7e0d696 100644 --- a/gcc/fortran/scanner.c +++ b/gcc/fortran/scanner.c @@ -852,11 +852,18 @@ gfc_gobble_whitespace (void) /* Issue a warning for nonconforming tabs. We keep track of the line number because the Fortran matchers will often back up and the same line will be scanned multiple times. */ - if (!gfc_option.warn_tabs && c == '\t' - && gfc_current_locus.lb->linenum != linenum) + if (!gfc_option.warn_tabs && c == '\t') { - linenum = gfc_current_locus.lb->linenum; - gfc_warning_now ("Nonconforming tab character at %C"); +#ifdef USE_MAPPED_LOCATION + int cur_linenum = LOCATION_LINE (gfc_current_locus.lb->location); +#else + int cur_linenum = gfc_current_locus.lb->linenum; +#endif + if (cur_linenum != linenum) + { + linenum = cur_linenum; + gfc_warning_now ("Nonconforming tab character at %C"); + } } } while (gfc_is_whitespace (c)); |