OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/39229 (No warning of truncated lines if a continuation line follows)

Browse Source 
2009-08-31  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

	PR fortran/39229
	* scanner.c (next_char): Fix typo in comment.
	(gfc_get_char_literal): Warn if truncate flag is set for both fixed and
	free form source, adjusting error locus as needed.
	* parse.c (next_fixed): Clear the truncate flag.
	(next_statement): Remove truncate warning.

From-SVN: r151258
This commit is contained in:
Jerry DeLisle 2009-09-01 03:02:07 +00:00
parent 453503d6e6
commit 9cd38d51e8
3 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/fortran/ChangeLog
View File

@ -1,3 +1,12 @@
2009-08-31 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/39229
* scanner.c (next_char): Fix typo in comment.
(gfc_get_char_literal): Warn if truncate flag is set for both fixed and
free form source, adjusting error locus as needed.
* parse.c (next_fixed): Clear the truncate flag.
(next_statement): Remove truncate warning.
2009-08-31 Janus Weil <janus@gcc.gnu.org>
Paul Thomas <pault@gcc.gnu.org>
@ -99,7 +108,7 @@
2009-08-22 Bud Davis <bdavis9659@sbcglobal.net>
PR fortran/28093
* io.c: reverted previous patch
* io.c: reverted previous patch.
2009-08-25 Janne Blomqvist <jb@gcc.gnu.org>

10
gcc/fortran/parse.c
View File

@ -849,6 +849,8 @@ next_fixed (void)
blank_line:
if (digit_flag)
gfc_warning ("Ignoring statement label in empty statement at %C");
gfc_current_locus.lb->truncated = 0;
gfc_advance_line ();
return ST_NONE;
}
@ -862,6 +864,7 @@ next_statement (void)
{
gfc_statement st;
locus old_locus;
gfc_new_block = NULL;
gfc_current_ns->old_cl_list = gfc_current_ns->cl_list;
@ -871,14 +874,7 @@ next_statement (void)
gfc_buffer_error (1);
if (gfc_at_eol ())
{
if ((gfc_option.warn_line_truncation || gfc_current_form == FORM_FREE)
&& gfc_current_locus.lb
&& gfc_current_locus.lb->truncated)
gfc_warning_now ("Line truncated at %C");
gfc_advance_line ();
}
gfc_skip_comments ();

21
gcc/fortran/scanner.c
View File

@ -614,7 +614,7 @@ next_char (void)
/* Skip a comment. When we come here the parse pointer is positioned
immediately after the comment character. If we ever implement
compiler directives withing comments, here is where we parse the
compiler directives within comments, here is where we parse the
directive. */
static void
@ -1080,6 +1080,17 @@ restart:
}
}
/* Check to see if the continuation line was truncated. */
if (gfc_option.warn_line_truncation && gfc_current_locus.lb != NULL
&& gfc_current_locus.lb->truncated)
{
int maxlen = gfc_option.free_line_length;
gfc_current_locus.lb->truncated = 0;
gfc_current_locus.nextc += maxlen;
gfc_warning_now ("Line truncated at %L", &gfc_current_locus);
gfc_current_locus.nextc -= maxlen;
}
/* Now find where it continues. First eat any comment lines. */
openmp_cond_flag = skip_free_comments ();
@ -1158,6 +1169,14 @@ restart:
if (c != '\n')
goto done;
/* Check to see if the continuation line was truncated. */
if (gfc_option.warn_line_truncation && gfc_current_locus.lb != NULL
&& gfc_current_locus.lb->truncated)
{
gfc_current_locus.lb->truncated = 0;
gfc_warning_now ("Line truncated at %L", &gfc_current_locus);
}
prev_openmp_flag = openmp_flag;
continue_flag = 1;
old_loc = gfc_current_locus;