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

options.c (set_dec_flags, [...]): Only set flag_d_lines with -fdec when not set by user.

Browse Source 
2017-08-10  Fritz Reese <Reese-Fritz@zai.com>

    gcc/fortran/ChangeLog:

	* options.c (set_dec_flags, gfc_post_options): Only set flag_d_lines
	with -fdec when not set by user.

    gcc/testsuite/ChangeLog:

    gfortran.dg/
	* dec_d_lines_1.f, dec_d_lines_2.f: New.

From-SVN: r251024
This commit is contained in:
Fritz Reese 2017-08-10 12:36:44 +00:00 committed by Fritz Reese
parent 6f855a26ab
commit 57e1270f58
5 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/fortran/ChangeLog
View File

@ -1,4 +1,9 @@
2017-08-10 Fritz Reese <Reese-Fritz@zai.com>
2017-08-10 Fritz Reese <fritzoreese@gmail.com>
* options.c (set_dec_flags, gfc_post_options): Only set flag_d_lines
with -fdec when not set by user.
2017-08-10 Fritz Reese <fritzoreese@gmail.com>
* decl.c (attr_seen): New static variable.
* decl.c (variable_decl): Match %FILL in STRUCTURE body.

14
gcc/fortran/options.c
View File

@ -57,9 +57,6 @@ set_dec_flags (int value)
| GFC_STD_GNU | GFC_STD_LEGACY;
gfc_option.warn_std &= ~(GFC_STD_LEGACY | GFC_STD_F95_DEL);
/* Set -fd-lines-as-comments by default. */
if (value && gfc_current_form != FORM_FREE && gfc_option.flag_d_lines == -1)
gfc_option.flag_d_lines = 0;
/* Set other DEC compatibility extensions. */
flag_dollar_ok |= value;
@ -339,8 +336,15 @@ gfc_post_options (const char **pfilename)
diagnostic_classify_diagnostic (global_dc, OPT_Wline_truncation,
DK_ERROR, UNKNOWN_LOCATION);
}
else if (warn_line_truncation == -1)
warn_line_truncation = 0;
else
{
/* With -fdec, set -fd-lines-as-comments by default in fixed form. */
if (flag_dec && gfc_option.flag_d_lines == -1)
gfc_option.flag_d_lines = 0;
if (warn_line_truncation == -1)
warn_line_truncation = 0;
}
/* If -pedantic, warn about the use of GNU extensions. */
if (pedantic && (gfc_option.allow_std & GFC_STD_GNU) != 0)

7
gcc/testsuite/ChangeLog
View File

@ -1,4 +1,9 @@
2017-08-10 Fritz Reese <Reese-Fritz@zai.com>
2017-08-10 Fritz Reese <fritzoreese@gmail.com>
* gfortran.dg/dec_d_lines_1.f: New test.
* gfortran.dg/dec_d_lines_2.f: New test.
2017-08-10 Fritz Reese <fritzoreese@gmail.com>
* gfortran.dg/dec_structure_18.f90: New test.
* gfortran.dg/dec_structure_19.f90: New test.

9
gcc/testsuite/gfortran.dg/dec_d_lines_1.f Normal file
View File

@ -0,0 +1,9 @@
! { dg-do compile }
! { dg-options "-ffixed-form -fd-lines-as-code -fdec" }
!
! Ensure -fd-lines-as-code is not overridden by -fdec.
!
i = 0
d end
subroutine s
D end

8
gcc/testsuite/gfortran.dg/dec_d_lines_2.f Normal file
View File

@ -0,0 +1,8 @@
! { dg-do compile }
! { dg-options "-ffixed-form -fdec" }
!
! Ensure -fd-lines-as-comments is enabled by default with -fdec.
!
d This is a comment.
D This line, too.
end