diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-07-14 20:54:40 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2016-07-14 20:54:40 +0000 |
| commit | 6fa682ad31f8a1d548338de4539ac506a9a1e7c7 (patch) | |
| tree | 6b427a4e401b42d3cadc38fd8352a28ace1308bf /gcc/fortran | |
| parent | a60a5d31dd7360a2788e2cac7865d5f491c3464e (diff) | |
| download | gcc-6fa682ad31f8a1d548338de4539ac506a9a1e7c7.zip gcc-6fa682ad31f8a1d548338de4539ac506a9a1e7c7.tar.gz gcc-6fa682ad31f8a1d548338de4539ac506a9a1e7c7.tar.bz2 | |
re PR fortran/29819 (Error/warning message should ignore comments for "1" in %C output)
2016-07-14 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/29819
* parse.c (parse_contained): Use proper locus.
2016-07-14 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/29819
* gfortran.dg/bind_c_usage_9.f03: Move dg-error.
* gfortran.dg/contains.f90: Ditto.
* gfortran.dg/contains_empty_1.f03: Ditto.
* gfortran.dg/submodule_3.f08: Ditto.
From-SVN: r238354
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/parse.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 0abf7d0..594b19e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2016-07-14 Steven G. Kargl <kargl@gcc.gnu.org> + + PR fortran/29819 + * parse.c (parse_contained): Use proper locus. + 2016-07-14 Andre Vehreschild <vehre@gcc.gnu.org> PR fortran/70842 diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 0aa736c..bd7b138 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -5321,6 +5321,7 @@ parse_contained (int module) gfc_statement st; gfc_symbol *sym; gfc_entry_list *el; + locus old_loc; int contains_statements = 0; int seen_error = 0; @@ -5337,6 +5338,7 @@ parse_contained (int module) next: /* Process the next available statement. We come here if we got an error and rejected the last statement. */ + old_loc = gfc_current_locus; st = next_statement (); switch (st) @@ -5442,7 +5444,7 @@ parse_contained (int module) pop_state (); if (!contains_statements) gfc_notify_std (GFC_STD_F2008, "CONTAINS statement without " - "FUNCTION or SUBROUTINE statement at %C"); + "FUNCTION or SUBROUTINE statement at %L", &old_loc); } |