aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/check.c
diff options
context:
space:
mode:
authorSteven G. Kargl <kargl@gcc.gnu.org>2011-10-30 21:59:24 +0000
committerSteven G. Kargl <kargl@gcc.gnu.org>2011-10-30 21:59:24 +0000
commit05168bb71efc90918b8cce28be57dca98b60c465 (patch)
treec29a5b32fa13860e9024f18229d3fa7c0d2d8a8b /gcc/fortran/check.c
parentda957891ff2614fc9fa5e88790cf608da07bd5ea (diff)
downloadgcc-05168bb71efc90918b8cce28be57dca98b60c465.zip
gcc-05168bb71efc90918b8cce28be57dca98b60c465.tar.gz
gcc-05168bb71efc90918b8cce28be57dca98b60c465.tar.bz2
re PR other/50573 (configure lists --with-gnu-ld twice)
2011-10-30 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/50573 * check.c (gfc_check_dshift): Update argument checking for BOZ. Update checking SHIFT against BITSIZE of I or J. * intrinsic.texi: Update docs for DSHIFTL and DSHIFTR. 2011-10-30 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/50573 * gfortran.dg/dshift_3.f90: New test. From-SVN: r180686
Diffstat (limited to 'gcc/fortran/check.c')
-rw-r--r--gcc/fortran/check.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 0f54ccd..d9b9a9c 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -1483,7 +1483,14 @@ gfc_check_dshift (gfc_expr *i, gfc_expr *j, gfc_expr *shift)
if (type_check (j, 1, BT_INTEGER) == FAILURE)
return FAILURE;
- if (same_type_check (i, 0, j, 1) == FAILURE)
+ if (i->is_boz && j->is_boz)
+ {
+ gfc_error ("'I' at %L and 'J' at %L cannot both be BOZ literal "
+ "constants", &i->where, &j->where);
+ return FAILURE;
+ }
+
+ if (!i->is_boz && !j->is_boz && same_type_check (i, 0, j, 1) == FAILURE)
return FAILURE;
if (type_check (shift, 2, BT_INTEGER) == FAILURE)
@@ -1492,8 +1499,18 @@ gfc_check_dshift (gfc_expr *i, gfc_expr *j, gfc_expr *shift)
if (nonnegative_check ("SHIFT", shift) == FAILURE)
return FAILURE;
- if (less_than_bitsize1 ("I", i, "SHIFT", shift, true) == FAILURE)
- return FAILURE;
+ if (i->is_boz)
+ {
+ if (less_than_bitsize1 ("J", j, "SHIFT", shift, true) == FAILURE)
+ return FAILURE;
+ i->ts.kind = j->ts.kind;
+ }
+ else
+ {
+ if (less_than_bitsize1 ("I", i, "SHIFT", shift, true) == FAILURE)
+ return FAILURE;
+ j->ts.kind = i->ts.kind;
+ }
return SUCCESS;
}