DEC comparisons - allow Hollerith constants in comparisons.
The -fdec option enables the use of Hollerith comparisons in comparisons with INTEGER, COMPLEX, REAL and CHARACTER expressions. Mark Eggleston <mark.eggleston@codethink.com> Jim MacArthur <jim.macarthur@codethink.co.uk> * gfortran.texi: Update Hollerith constants support for character types and use in comparisons. * invoke.texi: Tidy up list of options. Update description of -fdec-char-conversions. * resolve.c (is_character_based): New. (Convert_hollerith_to_character): New. (convert_to_numeric): New. (resolve_operator): If both sides are character based and -fdec is enabled convert Hollerith to character. If an operand is Hollerith, the other is numeric and -fdec is enabled convert to numeric. (resolve_ordinary_assign): Add check for -fdec-char-conversions for assignment of character literals. Mark Eggleston <mark.eggleston@codethink.com> Jim MacArthur <jim.macarthur@codethink.co.uk> * gfortran.dg/dec-comparison-character_1.f90: New test. * gfortran.dg/dec-comparison-character_2.f90: New test. * gfortran.dg/dec-comparison-character_3.f90: New test. * gfortran.dg/dec-comparison-complex_1.f90: New test. * gfortran.dg/dec-comparison-complex_2.f90: New test. * gfortran.dg/dec-comparison-complex_3.f90: New test. * gfortran.dg/dec-comparison-int_1.f90: New test. * gfortran.dg/dec-comparison-int_2.f90: New test. * gfortran.dg/dec-comparison-int_3.f90: New test. * gfortran.dg/dec-comparison-real_1.f90: New test. * gfortran.dg/dec-comparison-real_2.f90: New test. * gfortran.dg/dec-comparison-real_3.f90: New test. * gfortran.dg/dec-comparison.f90: New test. Co-Authored-By: Jim MacArthur <jim.macarthur@codethink.co.uk> From-SVN: r278674
This commit is contained in:
Mark Eggleston
Mark Eggleston
parent
ee499b407f
commit
32bef8ff80
18 changed files with 402 additions and 24 deletions
|
|
@ -1,4 +1,17 @@
|
|||
2019-11-20 Janne Blomqvist <jb@gcc.gnu.org>
|
||||
2019-11-25 Mark Eggleston <mark.eggleston@codethink.com>
|
||||
Jim MacArthur <jim.macarthur@codethink.co.uk>
|
||||
|
||||
* gfortran.texi: Update Hollerith constants support for character types
|
||||
and use in comparisons.
|
||||
* invoke.texi: Tidy up list of options. Update description of
|
||||
-fdec-char-conversions.
|
||||
* resolve.c (is_character_based): New.
|
||||
(Convert_hollerith_to_character): New. (convert_to_numeric): New.
|
||||
(resolve_operator): If both sides are character based and -fdec is
|
||||
enabled convert Hollerith to character. If an operand is Hollerith, the
|
||||
other is numeric and -fdec is enabled convert to numeric.
|
||||
(resolve_ordinary_assign): Add check for -fdec-char-conversions for
|
||||
assignment of character literals.2019-11-20 Janne Blomqvist <jb@gcc.gnu.org>
|
||||
|
||||
PR fortran/92463
|
||||
Revert r269139
|
||||
|
|
|
|||
|
|
@ -1916,14 +1916,14 @@ in I/O operations.
|
|||
@subsection Hollerith constants support
|
||||
@cindex Hollerith constants
|
||||
|
||||
GNU Fortran supports Hollerith constants in assignments, function
|
||||
arguments, and @code{DATA} statements. A Hollerith constant is written
|
||||
as a string of characters preceded by an integer constant indicating the
|
||||
character count, and the letter @code{H} or @code{h}, and stored in
|
||||
bytewise fashion in a numeric (@code{INTEGER}, @code{REAL}, or
|
||||
@code{COMPLEX}) or @code{LOGICAL} variable. The constant will be padded
|
||||
with spaces or truncated to fit the size of the variable in which it is
|
||||
stored.
|
||||
GNU Fortran supports Hollerith constants in assignments, @code{DATA}
|
||||
statements, function and subroutine arguments. A Hollerith constant is
|
||||
written as a string of characters preceded by an integer constant
|
||||
indicating the character count, and the letter @code{H} or
|
||||
@code{h}, and stored in bytewise fashion in a numeric (@code{INTEGER},
|
||||
@code{REAL}, or @code{COMPLEX}), @code{LOGICAL} or @code{CHARACTER} variable.
|
||||
The constant will be padded with spaces or truncated to fit the size of
|
||||
the variable in which it is stored.
|
||||
|
||||
Examples of valid uses of Hollerith constants:
|
||||
@smallexample
|
||||
|
|
@ -1951,10 +1951,22 @@ case where the intent is specifically to initialize a numeric variable
|
|||
with a given byte sequence. In these cases, the same result can be
|
||||
obtained by using the @code{TRANSFER} statement, as in this example.
|
||||
@smallexample
|
||||
INTEGER(KIND=4) :: a
|
||||
a = TRANSFER ("abcd", a) ! equivalent to: a = 4Habcd
|
||||
integer(kind=4) :: a
|
||||
a = transfer ("abcd", a) ! equivalent to: a = 4Habcd
|
||||
@end smallexample
|
||||
|
||||
The use of the @option{-fdec} option extends support of Hollerith constants
|
||||
to comparisons:
|
||||
@smallexample
|
||||
integer*4 a
|
||||
a = 4hABCD
|
||||
if (a .ne. 4habcd) then
|
||||
write(*,*) "no match"
|
||||
end if
|
||||
@end smallexample
|
||||
|
||||
Supported types are numeric (@code{INTEGER}, @code{REAL}, or @code{COMPLEX}),
|
||||
and @code{CHARACTER}.
|
||||
|
||||
@node Character conversion
|
||||
@subsection Character conversion
|
||||
|
|
|
|||
|
|
@ -117,17 +117,17 @@ by type. Explanations are in the following sections.
|
|||
@item Fortran Language Options
|
||||
@xref{Fortran Dialect Options,,Options controlling Fortran dialect}.
|
||||
@gccoptlist{-fall-intrinsics -fallow-argument-mismatch -fallow-invalid-boz @gol
|
||||
-fbackslash -fcray-pointer -fd-lines-as-code -fd-lines-as-comments -fdec @gol
|
||||
-fdec-char-conversions -fdec-structure -fdec-intrinsic-ints -fdec-static @gol
|
||||
-fdec-math -fdec-include -fdec-format-defaults -fdec-blank-format-item @gol
|
||||
-fdefault-double-8 -fdefault-integer-8 -fdefault-real-8 -fdefault-real-10 @gol
|
||||
-fdefault-real-16 -fdollar-ok -ffixed-line-length-@var{n} @gol
|
||||
-ffixed-line-length-none -fpad-source -ffree-form @gol
|
||||
-ffree-line-length-@var{n} -ffree-line-length-none -fimplicit-none @gol
|
||||
-finteger-4-integer-8 -fmax-identifier-length -fmodule-private @gol
|
||||
-ffixed-form -fno-range-check -fopenacc -fopenmp -freal-4-real-10 @gol
|
||||
-freal-4-real-16 -freal-4-real-8 -freal-8-real-10 -freal-8-real-16 @gol
|
||||
-freal-8-real-4 -std=@var{std} -ftest-forall-temp
|
||||
-fbackslash -fcray-pointer -fd-lines-as-code -fd-lines-as-comments @gol
|
||||
-fdec -fdec-char-conversions -fdec-structure -fdec-intrinsic-ints @gol
|
||||
-fdec-static -fdec-math -fdec-include -fdec-format-defaults @gol
|
||||
-fdec-blank-format-item -fdefault-double-8 -fdefault-integer-8 @gol
|
||||
-fdefault-real-8 -fdefault-real-10 -fdefault-real-16 -fdollar-ok @gol
|
||||
-ffixed-line-length-@var{n} -ffixed-line-length-none -fpad-source @gol
|
||||
-ffree-form -ffree-line-length-@var{n} -ffree-line-length-none @gol
|
||||
-fimplicit-none -finteger-4-integer-8 -fmax-identifier-length @gol
|
||||
-fmodule-private -ffixed-form -fno-range-check -fopenacc -fopenmp @gol
|
||||
-freal-4-real-10 -freal-4-real-16 -freal-4-real-8 -freal-8-real-10 @gol
|
||||
-freal-8-real-16 -freal-8-real-4 -std=@var{std} -ftest-forall-temp
|
||||
}
|
||||
|
||||
@item Preprocessing Options
|
||||
|
|
@ -283,7 +283,7 @@ If @option{-fd-lines-as-code}/@option{-fd-lines-as-comments} are unset, then
|
|||
|
||||
@item -fdec-char-conversions
|
||||
@opindex @code{fdec-char-conversions}
|
||||
Enable the use of character literals in assignments and data statements
|
||||
Enable the use of character literals in assignments and @code{DATA} statements
|
||||
for non-character variables.
|
||||
|
||||
@item -fdec-structure
|
||||
|
|
|
|||
|
|
@ -3900,6 +3900,42 @@ impure_function_callback (gfc_expr **e, int *walk_subtrees ATTRIBUTE_UNUSED,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* Return true if TYPE is character based, false otherwise. */
|
||||
|
||||
static int
|
||||
is_character_based (bt type)
|
||||
{
|
||||
return type == BT_CHARACTER || type == BT_HOLLERITH;
|
||||
}
|
||||
|
||||
|
||||
/* If expression is a hollerith, convert it to character and issue a warning
|
||||
for the conversion. */
|
||||
|
||||
static void
|
||||
convert_hollerith_to_character (gfc_expr *e)
|
||||
{
|
||||
if (e->ts.type == BT_HOLLERITH)
|
||||
{
|
||||
gfc_typespec t;
|
||||
gfc_clear_ts (&t);
|
||||
t.type = BT_CHARACTER;
|
||||
t.kind = e->ts.kind;
|
||||
gfc_convert_type_warn (e, &t, 2, 1);
|
||||
}
|
||||
}
|
||||
|
||||
/* Convert to numeric and issue a warning for the conversion. */
|
||||
|
||||
static void
|
||||
convert_to_numeric (gfc_expr *a, gfc_expr *b)
|
||||
{
|
||||
gfc_typespec t;
|
||||
gfc_clear_ts (&t);
|
||||
t.type = b->ts.type;
|
||||
t.kind = b->ts.kind;
|
||||
gfc_convert_type_warn (a, &t, 2, 1);
|
||||
}
|
||||
|
||||
/* Resolve an operator expression node. This can involve replacing the
|
||||
operation with a user defined function call. */
|
||||
|
|
@ -4100,6 +4136,15 @@ resolve_operator (gfc_expr *e)
|
|||
case INTRINSIC_EQ_OS:
|
||||
case INTRINSIC_NE:
|
||||
case INTRINSIC_NE_OS:
|
||||
|
||||
if (flag_dec
|
||||
&& is_character_based (op1->ts.type)
|
||||
&& is_character_based (op2->ts.type))
|
||||
{
|
||||
convert_hollerith_to_character (op1);
|
||||
convert_hollerith_to_character (op2);
|
||||
}
|
||||
|
||||
if (op1->ts.type == BT_CHARACTER && op2->ts.type == BT_CHARACTER
|
||||
&& op1->ts.kind == op2->ts.kind)
|
||||
{
|
||||
|
|
@ -4137,6 +4182,13 @@ resolve_operator (gfc_expr *e)
|
|||
if (op1->ts.type == BT_REAL && !gfc_boz2real (op2, op1->ts.kind))
|
||||
return false;
|
||||
}
|
||||
if (flag_dec
|
||||
&& op1->ts.type == BT_HOLLERITH && gfc_numeric_ts (&op2->ts))
|
||||
convert_to_numeric (op1, op2);
|
||||
|
||||
if (flag_dec
|
||||
&& gfc_numeric_ts (&op1->ts) && op2->ts.type == BT_HOLLERITH)
|
||||
convert_to_numeric (op2, op1);
|
||||
|
||||
if (gfc_numeric_ts (&op1->ts) && gfc_numeric_ts (&op2->ts))
|
||||
{
|
||||
|
|
@ -10693,7 +10745,7 @@ resolve_ordinary_assign (gfc_code *code, gfc_namespace *ns)
|
|||
|
||||
if ((gfc_numeric_ts (&lhs->ts) || lhs->ts.type == BT_LOGICAL)
|
||||
&& rhs->ts.type == BT_CHARACTER
|
||||
&& rhs->expr_type != EXPR_CONSTANT)
|
||||
&& (rhs->expr_type != EXPR_CONSTANT || !flag_dec_char_conversions))
|
||||
{
|
||||
/* Use of -fdec-char-conversions allows assignment of character data
|
||||
to non-character variables. This not permited for nonconstant
|
||||
|
|
|
|||
|
|
@ -1,3 +1,20 @@
|
|||
2019-11-25 Mark Eggleston <mark.eggleston@codethink.com>
|
||||
Jim MacArthur <jim.macarthur@codethink.co.uk>
|
||||
|
||||
* gfortran.dg/dec-comparison-character_1.f90: New test.
|
||||
* gfortran.dg/dec-comparison-character_2.f90: New test.
|
||||
* gfortran.dg/dec-comparison-character_3.f90: New test.
|
||||
* gfortran.dg/dec-comparison-complex_1.f90: New test.
|
||||
* gfortran.dg/dec-comparison-complex_2.f90: New test.
|
||||
* gfortran.dg/dec-comparison-complex_3.f90: New test.
|
||||
* gfortran.dg/dec-comparison-int_1.f90: New test.
|
||||
* gfortran.dg/dec-comparison-int_2.f90: New test.
|
||||
* gfortran.dg/dec-comparison-int_3.f90: New test.
|
||||
* gfortran.dg/dec-comparison-real_1.f90: New test.
|
||||
* gfortran.dg/dec-comparison-real_2.f90: New test.
|
||||
* gfortran.dg/dec-comparison-real_3.f90: New test.
|
||||
* gfortran.dg/dec-comparison.f90: New test.
|
||||
|
||||
2019-11-25 Martin Jambor <mjambor@suse.cz>
|
||||
|
||||
PR ipa/91956
|
||||
|
|
|
|||
18
gcc/testsuite/gfortran.dg/dec-comparison-character_1.f90
Normal file
18
gcc/testsuite/gfortran.dg/dec-comparison-character_1.f90
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
program convert
|
||||
character(4) :: c = 4HJMAC
|
||||
if (4HJMAC.ne.4HJMAC) stop 1
|
||||
if (4HJMAC.ne."JMAC") stop 2
|
||||
if (4HJMAC.eq."JMAN") stop 3
|
||||
if ("JMAC".eq.4HJMAN) stop 4
|
||||
if ("AAAA".eq.5HAAAAA) stop 5
|
||||
if ("BBBBB".eq.5HBBBB ) stop 6
|
||||
if (4HJMAC.ne.c) stop 7
|
||||
if (c.ne.4HJMAC) stop 8
|
||||
end program
|
||||
|
||||
18
gcc/testsuite/gfortran.dg/dec-comparison-character_2.f90
Normal file
18
gcc/testsuite/gfortran.dg/dec-comparison-character_2.f90
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec -Wconversion" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
include "dec-comparison-character_1.f90"
|
||||
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 8 }
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 9 }
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 10 }
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 11 }
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 12 }
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 13 }
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 14 }
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 15 }
|
||||
! { dg-warning "HOLLERITH to CHARACTER" " " { target *-*-* } 16 }
|
||||
|
||||
26
gcc/testsuite/gfortran.dg/dec-comparison-character_3.f90
Normal file
26
gcc/testsuite/gfortran.dg/dec-comparison-character_3.f90
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
! { dg-do compile }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
include "dec-comparison-character_1.f90"
|
||||
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 8 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 9 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 10 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 11 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 12 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 13 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 14 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 15 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 16 }
|
||||
! { dg-warning "Extension: Conversion from HOLLERITH to CHARACTER" " " { target *-*-* } 8 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 9 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 10 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 11 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 12 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 13 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 14 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 15 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 16 }
|
||||
|
||||
17
gcc/testsuite/gfortran.dg/dec-comparison-complex_1.f90
Normal file
17
gcc/testsuite/gfortran.dg/dec-comparison-complex_1.f90
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
program convert
|
||||
complex(4) :: a
|
||||
complex(4) :: b
|
||||
a = 8HABCDABCD
|
||||
b = transfer("ABCDABCD", b);
|
||||
! Hollerith constants
|
||||
if (a.ne.8HABCDABCD) stop 1
|
||||
if (a.eq.8HABCEABCE) stop 2
|
||||
if (8HABCDABCD.ne.b) stop 3
|
||||
if (8HABCEABCE.eq.b) stop 4
|
||||
end program
|
||||
14
gcc/testsuite/gfortran.dg/dec-comparison-complex_2.f90
Normal file
14
gcc/testsuite/gfortran.dg/dec-comparison-complex_2.f90
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec -Wconversion" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
include "dec-comparison-complex_1.f90"
|
||||
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 10 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 13 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 14 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 15 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 16 }
|
||||
|
||||
18
gcc/testsuite/gfortran.dg/dec-comparison-complex_3.f90
Normal file
18
gcc/testsuite/gfortran.dg/dec-comparison-complex_3.f90
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
! { dg-do compile }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
include "dec-comparison-complex_1.f90"
|
||||
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 10 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 13 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 14 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 15 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 16 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 10 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 13 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 14 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 15 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 16 }
|
||||
|
||||
22
gcc/testsuite/gfortran.dg/dec-comparison-int_1.f90
Normal file
22
gcc/testsuite/gfortran.dg/dec-comparison-int_1.f90
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
program convert
|
||||
integer(4) :: a
|
||||
integer(4) :: b
|
||||
a = 4HABCD
|
||||
b = transfer("ABCD", b)
|
||||
! Hollerith constants
|
||||
if (a.ne.4HABCD) stop 1
|
||||
if (a.eq.4HABCE) stop 2
|
||||
if (4HABCD.ne.b) stop 3
|
||||
if (4HABCE.eq.b) stop 4
|
||||
if (4HABCE.lt.a) stop 5
|
||||
if (a.gt.4HABCE) stop 6
|
||||
if (4HABCE.le.a) stop 7
|
||||
if (a.ge.4HABCE) stop 8
|
||||
end program
|
||||
|
||||
18
gcc/testsuite/gfortran.dg/dec-comparison-int_2.f90
Normal file
18
gcc/testsuite/gfortran.dg/dec-comparison-int_2.f90
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec -Wconversion" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
include "dec-comparison-int_1.f90"
|
||||
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 10 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 13 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 14 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 15 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 16 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 17 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 18 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 19 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 20 }
|
||||
|
||||
26
gcc/testsuite/gfortran.dg/dec-comparison-int_3.f90
Normal file
26
gcc/testsuite/gfortran.dg/dec-comparison-int_3.f90
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
! { dg-do compile }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
include "dec-comparison-int_1.f90"
|
||||
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 10 }
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 13 }
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 14 }
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 15 }
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 16 }
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 17 }
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 18 }
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 19 }
|
||||
! { dg-warning "Extension: Hollerith constant at" " " { target *-*-* } 20 }
|
||||
! { dg-warning "HOLLERITH to INTEGER" " " { target *-*-* } 10 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 13 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 14 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 15 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 16 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 17 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 18 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 19 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 20 }
|
||||
|
||||
22
gcc/testsuite/gfortran.dg/dec-comparison-real_1.f90
Normal file
22
gcc/testsuite/gfortran.dg/dec-comparison-real_1.f90
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
program convert
|
||||
real(4) :: a
|
||||
real(4) :: b
|
||||
a = 4HABCD
|
||||
b = transfer("ABCD", b)
|
||||
! Hollerith constants
|
||||
if (a.ne.4HABCD) stop 1
|
||||
if (a.eq.4HABCE) stop 2
|
||||
if (4HABCD.ne.b) stop 3
|
||||
if (4HABCE.eq.b) stop 4
|
||||
if (4HABCE.lt.a) stop 5
|
||||
if (a.gt.4HABCE) stop 6
|
||||
if (4HABCE.le.a) stop 7
|
||||
if (a.ge.4HABCE) stop 8
|
||||
end program
|
||||
|
||||
18
gcc/testsuite/gfortran.dg/dec-comparison-real_2.f90
Normal file
18
gcc/testsuite/gfortran.dg/dec-comparison-real_2.f90
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec -Wconversion" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
include "dec-comparison-real_1.f90"
|
||||
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 10 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 13 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 14 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 15 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 16 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 17 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 18 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 19 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 20 }
|
||||
|
||||
26
gcc/testsuite/gfortran.dg/dec-comparison-real_3.f90
Normal file
26
gcc/testsuite/gfortran.dg/dec-comparison-real_3.f90
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
! { dg-do compile }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
|
||||
include "dec-comparison-real_1.f90"
|
||||
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 10 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 13 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 14 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 15 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 16 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 17 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 18 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 19 }
|
||||
! { dg-warning "Legacy Extension: Hollerith constant at" " " { target *-*-* } 20 }
|
||||
! { dg-warning "Conversion from HOLLERITH" " " { target *-*-* } 10 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 13 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 14 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 15 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 16 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 17 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 18 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 19 }
|
||||
! { dg-error "Operands of comparison operator" " " { target *-*-* } 20 }
|
||||
|
||||
41
gcc/testsuite/gfortran.dg/dec-comparison.f90
Normal file
41
gcc/testsuite/gfortran.dg/dec-comparison.f90
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
! { dg-do run }
|
||||
! { dg-options "-fdec" }
|
||||
!
|
||||
! Test case contributed by Mark Eggleston <mark.eggleston@codethink.com>
|
||||
!
|
||||
! Hollerith constants and character literals are allowed in comparisons,
|
||||
! check that character variables can not be compared with numeric variables.
|
||||
|
||||
program convert
|
||||
character(4) :: a = 4hJMAC
|
||||
integer(4) :: b = "JMAC"
|
||||
real(4) :: c = "JMAC"
|
||||
complex(4) :: d = "JMACJMAC"
|
||||
! integers
|
||||
if (a.ne.b) stop 1 ! { dg-error "Operands of comparison" }
|
||||
if (b.eq.a) stop 2 ! { dg-error "Operands of comparison" }
|
||||
if (a.ge.b) stop 3 ! { dg-error "Operands of comparison" }
|
||||
if (b.ge.a) stop 4 ! { dg-error "Operands of comparison" }
|
||||
if (a.gt.b) stop 5 ! { dg-error "Operands of comparison" }
|
||||
if (b.gt.a) stop 6 ! { dg-error "Operands of comparison" }
|
||||
if (a.le.b) stop 3 ! { dg-error "Operands of comparison" }
|
||||
if (b.le.a) stop 4 ! { dg-error "Operands of comparison" }
|
||||
if (a.lt.b) stop 5 ! { dg-error "Operands of comparison" }
|
||||
if (b.lt.a) stop 6 ! { dg-error "Operands of comparison" }
|
||||
! reals
|
||||
if (a.ne.c) stop 7 ! { dg-error "Operands of comparison" }
|
||||
if (c.eq.a) stop 8 ! { dg-error "Operands of comparison" }
|
||||
if (a.ge.c) stop 9 ! { dg-error "Operands of comparison" }
|
||||
if (c.ge.a) stop 10 ! { dg-error "Operands of comparison" }
|
||||
if (a.gt.c) stop 11 ! { dg-error "Operands of comparison" }
|
||||
if (c.gt.a) stop 12 ! { dg-error "Operands of comparison" }
|
||||
if (a.le.c) stop 13 ! { dg-error "Operands of comparison" }
|
||||
if (c.le.a) stop 14 ! { dg-error "Operands of comparison" }
|
||||
if (a.lt.c) stop 15 ! { dg-error "Operands of comparison" }
|
||||
if (c.lt.a) stop 16 ! { dg-error "Operands of comparison" }
|
||||
! complexes
|
||||
a = "JMACJMAC"
|
||||
if (a.ne.d) stop 17 ! { dg-error "Operands of comparison" }
|
||||
if (d.eq.a) stop 18 ! { dg-error "Operands of comparison" }
|
||||
end program
|
||||
|
||||
Loading…
Add table
Reference in a new issue