2007-07-26 Steven G. Kargl <kargl@gcc.gnu.org>

	PR fortran/32899
	* resolve.c (resolve_operator): Add INTRINSIC_EQ_OS comparison.

2007-07-26  Steven G. Kargl  <kargl@gcc.gnu.org>

	PR fortran/32899
	* gfortran.dg/logical_comp.f90: Update dg-error strings.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126985 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7759da7a6a2f8768628b9038e07e7176a4217de3..1a17c519405305f97ed945754ec651f9946b1fe3 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-26  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/32899
+       * resolve.c (resolve_operator): Add INTRINSIC_EQ_OS comparison.
+
 2007-07-27  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
            Daniel Franke  <franke.daniel@gmail.com>
 

diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 7580d805e471fb0c83150729db6b4636b6c3a58f..1a5c0011fd8c6b65bc2827afa56ac0dbf4201056 100644 (file)
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -2830,8 +2830,9 @@ resolve_operator (gfc_expr *e)
       if (op1->ts.type == BT_LOGICAL && op2->ts.type == BT_LOGICAL)
        sprintf (msg,
                 _("Logicals at %%L must be compared with %s instead of %s"),
-                e->value.op.operator == INTRINSIC_EQ ? ".eqv." : ".neqv.",
-                gfc_op2string (e->value.op.operator));
+                (e->value.op.operator == INTRINSIC_EQ 
+                 || e->value.op.operator == INTRINSIC_EQ_OS)
+                ? ".eqv." : ".neqv.", gfc_op2string (e->value.op.operator));
       else
        sprintf (msg,
                 _("Operands of comparison operator '%s' at %%L are %s/%s"),

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cdfbcb8ddcd42855f1e5762a2f1d56a885481229..cc8cfc270d1d6ecf3fd142fb072abb1c1d4c3d58 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-26  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+       PR fortran/32899
+       * gfortran.dg/logical_comp.f90: Update dg-error strings.
+
 2007-07-27  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR fortran/32760

diff --git a/gcc/testsuite/gfortran.dg/logical_comp.f90 b/gcc/testsuite/gfortran.dg/logical_comp.f90
index 208cc4a9e660e9569d9729e7240f94620459244c..bbf81260ba645b150d95a656e84f0c244d6f7e02 100644 (file)
--- a/gcc/testsuite/gfortran.dg/logical_comp.f90
+++ b/gcc/testsuite/gfortran.dg/logical_comp.f90
@@ -1,9 +1,9 @@
 ! { dg-do compile }
-! PR fortran/22503
+! PR fortran/22503, PR fortran/32899
 ! Suggest use of appropriate comparison operator
 
 program foo
   logical :: b
-  b = b .eq. b  ! { dg-error ".eqv. instead of .eq." }
-  b = b .ne. b  ! { dg-error ".neqv. instead of .ne." }
+  b = b .eq. b  ! { dg-error "must be compared with" }
+  b = b .ne. b  ! { dg-error "must be compared with" }
 end program