]> git.ipfire.org Git - thirdparty/gcc.git/commit - gcc/fortran/primary.c
arith.c (gfc_convert_integer, [...]): Move to ...
authorSteven G. Kargl <kargl@gcc.gnu.org>
Tue, 23 Jul 2019 21:43:21 +0000 (21:43 +0000)
committerSteven G. Kargl <kargl@gcc.gnu.org>
Tue, 23 Jul 2019 21:43:21 +0000 (21:43 +0000)
commit8dc63166e0b859546ba53093c5fc6c09925210dd
treed8cd9da5b8bca4b00b103577f9637fb996d8024a
parent000a002072d04d70bcd1d4be0daf8838035afa23
arith.c (gfc_convert_integer, [...]): Move to ...

2019-07-23  Steven G. Kargl  <kargl@gcc.gnu.org>

* arith.c (gfc_convert_integer, gfc_convert_real, gfc_convert_complex):
Move to ...
* primary.c (convert_integer, convert_real, convert_complex): ... here.
Rename and make static functions.
(match_integer_constant): Use convert_integer
(match_real_constant): Use convert_real.
(match_complex_constant: Use convert_complex.
* arith.h (gfc_convert_integer, gfc_convert_real, gfc_convert_complex):
Remove prototypes.
* array.c (match_array_cons_element): A BOZ cannot be a data
statement value.  Jump to a common exit point.
* check.c (gfc_invalid_boz): New function.  Emit error or warning
for a BOZ in an invalid context.
(boz_args_check): Move to top of file to prevent need of forward
declaration.
(is_boz_constant): New function.  Check that BOZ expr is constant.
(gfc_b z2real): New function. In-place conversion of BOZ literal
constant to REAL in accordance to F2018.
(gfc_boz2int): New function. In-place conversion of BOZ literal
  onstant to INTEGER in accordance to F2018.
(gfc_check_achar, gfc_check_char, gfc_check_float): Use gfc_invalid_boz.
Convert BOZ as needed.
(gfc_check_bge_bgt_ble_blt): Enforce F2018 requirements on BGE,
BGT, BLE, and BLT intrinsic functions.
(gfc_check_cmplx): Re-organize to check kind, if present, first.
Convert BOZ real and/or imaginary parts as needed in accordance to
F2018.
(gfc_check_complex):  Use gfc_invalid_boz.  Convert BOZ as needed.
(gfc_check_dcmplx, gfc_check_dble ): Convert BOZ as needed.
(gfc_check_dshift):  Make dshift[lr] conform to F2018 standard.
 gfc_check_float (gfc_expr *a)
(gfc_check_iand_ieor_ior):  Make IAND, IEOR, and IOR conform to
F2018 standard.
(gfc_check_int): Conform to F2018 standard.
(gfc_check_intconv): Deprecate SHORT and LONG aliases for INT2 and
INT.  Simply return for a BOZ argument. See gfc_simplify_intconv.
(gfc_check_merge_bits): Make MERGE_BITS conform to Fortran 2018
standard.
(gfc_check_real): Remove incorrect comment. Check kind, if present,
first.  Simply return for a BOZ argument. See gfc_simplify_real.
(gfc_check_and): Re-do error handling for BOZ arguments.  Remove
special casing ts.type != BT_INTEGER or BT_LOGICAL.
* decl.c (match_old_style_init): Check for BOZ in old-style
initialization.  Issue error or warning depending on
-fallow-invalid-boz option.  Issue error if variable is not an
INTEGER or REAL and the value is BOZ.
* expr.c (gfc_copy_expr): Copy a BT_BOZ gfc_expr.
(gfc_check_assign): Re-do error handling for a BOZ in an assignment
statement.  Do in-place conversion of RHS based on LHS type of
INTEGER or REAL.
* gfortran.h (gfc_expr): Add a boz component.  Remove is_boz component.
(gfc_boz2int, gfc_boz2real, gfc_invalid_boz): New prototypes.
* interface.c (gfc_extend_assign): Guard against replacing an
intrinsic involving a BOZ literal constant on RHS.
* invoke.texi: Doument -fallow-invalid-boz.
* lang.opt: New option. -fallow-invalid-boz.
* libgfortran.h (bt): Elevate BOZ to a basic type.
* misc.c (gfc_basic_typename, gfc_typename): Translate BT_BOZ to BOZ.
* primary.c (convert_integer, convert_real, convert_complex): to here.
Rename and make static functions.
* primary.c(match_boz_constant): Rewrite parsing of a BOZ. Re-do
error handling.  Deprecate 'X' for hexidecimal and postfix notation.
Use -fallow-invalid-boz and gfc_invalid_boz to accept deprecated code.
* resolve.c (resolve_ordinary_assign): Rework a RHS that is a
BOZ literal constant.  Use gfc_invalid_boz to allow previous
nonstandard behavior.  Remove range checking of BOZ conversion.
* simplify.c (convert_boz): Remove function.
(simplify_cmplx): Remove conversion of BOZ constants, because
conversion is done in gfc_check_cmplx.
(gfc_simplify_float): Remove conversion of BOZ constant, because
conversion is done in gfc_check_float.
(simplify_intconv): Use gfc_boz2int to convert BOZ to INTEGER.
Remove range checking for BOZ conversion.
(gfc_simplify_real): Use k, if present, to determine kind.  Convert
BOZ to REAL.  Remove range checking for BOZ conversion.
target-memory.c (gfc_convert_boz): Rewrite to deal with convert of
a BOZ to a REAL value.

2019-07-23  Steven G. Kargl  <kargl@gcc.gnu.org>

* gfortran.dg/achar_5.f90: Fix for new BOZ handling.
* arithmetic_overflow_1.f90: Ditto.
* gfortran.dg/boz_11.f90: Ditto.
* gfortran.dg/boz_12.f90: Ditto.
* gfortran.dg/boz_4.f90: Ditto.
* gfortran.dg/boz_5.f90: Ditto.
* gfortran.dg/boz_6.f90: Ditto.
* gfortran.dg/boz_7.f90: Ditto.
* gfortran.dg/boz_8.f90: Ditto.
* gfortran.dg/dec_structure_6.f90: Ditto.
* gfortran.dg/dec_union_1.f90: Ditto.
* gfortran.dg/dec_union_2.f90: Ditto.
* gfortran.dg/dec_union_5.f90: Ditto.
* gfortran.dg/dshift_3.f90: Ditto.
* gfortran.dg/gnu_logical_2.f90: Ditto.
* gfortran.dg/int_conv_1.f90: Ditto.
* gfortran.dg/ishft_1.f90: Ditto.
* gfortran.dg/nan_4.f90: Ditto.
* gfortran.dg/no_range_check_3.f90: Ditto.
* gfortran.dg/pr16433.f: Ditto.
* gfortran.dg/pr44491.f90: Ditto.
* gfortran.dg/pr58027.f90: Ditto.
* gfortran.dg/pr81509_2.f90: Ditto.
* gfortran.dg/unf_io_convert_1.f90: Ditto.
* gfortran.dg/unf_io_convert_2.f90: Ditto.
* gfortran.fortran-torture/execute/intrinsic_fraction_exponent.f90:
Ditto.
* gfortran.fortran-torture/execute/intrinsic_mvbits.f90: Ditto.
* gfortran.fortran-torture/execute/intrinsic_nearest.f90: Ditto.
* gfortran.fortran-torture/execute/seq_io.f90: Ditto.
* gfortran.dg/gnu_logical_1.F: Delete test.
* gfortran.dg/merge_bits_3.f90: New test.
* gfortran.dg/merge_bits_3.f90: Ditto.
* gfortran.dg/boz_int.f90: Ditto.
* gfortran.dg/boz_bge.f90: Ditto.
* gfortran.dg/boz_complex_1.f90: Ditto.
* gfortran.dg/boz_complex_2.f90: Ditto.
* gfortran.dg/boz_complex_3.f90: Ditto.
* gfortran.dg/boz_dble.f90: Ditto.
* gfortran.dg/boz_dshift_1.f90: Ditto.
* gfortran.dg/boz_dshift_2.f90: Ditto.
* gfortran.dg/boz_float_1.f90: Ditto.
* gfortran.dg/boz_float_2.f90: Ditto.
* gfortran.dg/boz_float_3.f90: Ditto.
* gfortran.dg/boz_iand_1.f90: Ditto.
* gfortran.dg/boz_iand_2.f90: Ditto.

2019-07-23  Steven G. Kargl  <kargl@gcc.gnu.org>

* testsuite/libgomp.fortran/reduction4.f90: Update BOZ usage
* testsuite/libgomp.fortran/reduction5.f90: Ditto.

From-SVN: r273747
66 files changed:
gcc/fortran/ChangeLog
gcc/fortran/arith.c
gcc/fortran/arith.h
gcc/fortran/array.c
gcc/fortran/check.c
gcc/fortran/decl.c
gcc/fortran/expr.c
gcc/fortran/gfortran.h
gcc/fortran/interface.c
gcc/fortran/invoke.texi
gcc/fortran/lang.opt
gcc/fortran/libgfortran.h
gcc/fortran/misc.c
gcc/fortran/primary.c
gcc/fortran/resolve.c
gcc/fortran/simplify.c
gcc/fortran/target-memory.c
gcc/testsuite/ChangeLog
gcc/testsuite/gfortran.dg/achar_5.f90
gcc/testsuite/gfortran.dg/arithmetic_overflow_1.f90
gcc/testsuite/gfortran.dg/boz_11.f90
gcc/testsuite/gfortran.dg/boz_12.f90
gcc/testsuite/gfortran.dg/boz_4.f90
gcc/testsuite/gfortran.dg/boz_5.f90
gcc/testsuite/gfortran.dg/boz_6.f90
gcc/testsuite/gfortran.dg/boz_7.f90
gcc/testsuite/gfortran.dg/boz_8.f90
gcc/testsuite/gfortran.dg/boz_bge.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_complex_1.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_complex_2.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_complex_3.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_dble.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_dshift_1.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_dshift_2.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_float_1.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_float_2.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_float_3.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_iand_1.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_iand_2.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/boz_int.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/dec_structure_6.f90
gcc/testsuite/gfortran.dg/dec_union_1.f90
gcc/testsuite/gfortran.dg/dec_union_2.f90
gcc/testsuite/gfortran.dg/dec_union_5.f90
gcc/testsuite/gfortran.dg/dshift_3.f90
gcc/testsuite/gfortran.dg/gnu_logical_1.F
gcc/testsuite/gfortran.dg/gnu_logical_2.f90
gcc/testsuite/gfortran.dg/int_conv_1.f90
gcc/testsuite/gfortran.dg/ishft_1.f90
gcc/testsuite/gfortran.dg/merge_bits_3.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/merge_bits_4.f90 [new file with mode: 0644]
gcc/testsuite/gfortran.dg/nan_4.f90
gcc/testsuite/gfortran.dg/no_range_check_3.f90
gcc/testsuite/gfortran.dg/pr16433.f
gcc/testsuite/gfortran.dg/pr44491.f90
gcc/testsuite/gfortran.dg/pr58027.f90
gcc/testsuite/gfortran.dg/pr81509_2.f90
gcc/testsuite/gfortran.dg/unf_io_convert_1.f90
gcc/testsuite/gfortran.dg/unf_io_convert_2.f90
gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_fraction_exponent.f90
gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_mvbits.f90
gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_nearest.f90
gcc/testsuite/gfortran.fortran-torture/execute/seq_io.f90
libgomp/ChangeLog
libgomp/testsuite/libgomp.fortran/reduction4.f90
libgomp/testsuite/libgomp.fortran/reduction5.f90