mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 08:00:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

interface.c (gfc_match_end_interface): Deal with user defined operators that...

Browse Source 
2010-09-24  Steven G. Kargl  < kargl@gcc.gnu.org>

	* fortran/interface.c (gfc_match_end_interface): Deal with user defined
	operators that overload rational operators and C1202.

2010-09-24  Steven G. Kargl  < kargl@gcc.gnu.org>

	* testsuite/gfortran.dg/operator_c1202.f90: New test.

From-SVN: r164616
This commit is contained in:
Steven G. Kargl 2010-09-25 05:55:59 +00:00
parent 3879ef2d2a
commit c6d6e62f3e
4 changed files with 111 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/fortran/ChangeLog
View File

@ -1,3 +1,8 @@
2010-09-24 Steven G. Kargl < kargl@gcc.gnu.org>
* fortran/interface.c (gfc_match_end_interface): Deal with user defined
operators that overload rational operators and C1202.
2010-09-24 Tobias Burnus <burnus@net-b.de>
* gfortran.texi: Add second space after end-of-sentence period;

38
gcc/fortran/interface.c
View File

@ -314,12 +314,42 @@ gfc_match_end_interface (void)
{
if (current_interface.op == INTRINSIC_ASSIGN)
gfc_error ("Expected 'END INTERFACE ASSIGNMENT (=)' at %C");
{
m = MATCH_ERROR;
gfc_error ("Expected 'END INTERFACE ASSIGNMENT (=)' at %C");
}
else
gfc_error ("Expecting 'END INTERFACE OPERATOR (%s)' at %C",
gfc_op2string (current_interface.op));
{
char *s1, *s2;
s1 = gfc_op2string (current_interface.op);
s2 = gfc_op2string (op);
m = MATCH_ERROR;
/* The following if-statements are used to enforce C1202
from F2003. */
if ((strcmp(s1, "==") == 0 && strcmp(s2, ".eq.") == 0)
|| (strcmp(s1, ".eq.") == 0 && strcmp(s2, "==") == 0))
break;
if ((strcmp(s1, "/=") == 0 && strcmp(s2, ".ne.") == 0)
|| (strcmp(s1, ".ne.") == 0 && strcmp(s2, "/=") == 0))
break;
if ((strcmp(s1, "<=") == 0 && strcmp(s2, ".le.") == 0)
|| (strcmp(s1, ".le.") == 0 && strcmp(s2, "<=") == 0))
break;
if ((strcmp(s1, "<") == 0 && strcmp(s2, ".lt.") == 0)
|| (strcmp(s1, ".lt.") == 0 && strcmp(s2, "<") == 0))
break;
if ((strcmp(s1, ">=") == 0 && strcmp(s2, ".ge.") == 0)
|| (strcmp(s1, ".ge.") == 0 && strcmp(s2, ">=") == 0))
break;
if ((strcmp(s1, ">") == 0 && strcmp(s2, ".gt.") == 0)
|| (strcmp(s1, ".gt.") == 0 && strcmp(s2, ">") == 0))
break;
m = MATCH_ERROR;
gfc_error ("Expecting 'END INTERFACE OPERATOR (%s)' at %C, "
"but got %s", s1, s2);
}
}
break;

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2010-09-24 Steven G. Kargl < kargl@gcc.gnu.org>
* testsuite/gfortran.dg/operator_c1202.f90: New test.
2010-09-24 Jan Hubicka <jh@suse.cz>
* gcc.dg/tree-ssa/leaf.c: New testcase.

68
gcc/testsuite/gfortran.dg/operator_c1202.f90 Normal file
View File

@ -0,0 +1,68 @@
! { dg-do compile }
module op
implicit none
type a
integer i
end type a
type b
real i
end type b
interface operator(==)
module procedure f1
end interface operator(.eq.)
interface operator(.eq.)
module procedure f2
end interface operator(==)
interface operator(/=)
module procedure f1
end interface operator(.ne.)
interface operator(.ne.)
module procedure f2
end interface operator(/=)
interface operator(<=)
module procedure f1
end interface operator(.le.)
interface operator(.le.)
module procedure f2
end interface operator(<=)
interface operator(<)
module procedure f1
end interface operator(.lt.)
interface operator(.lt.)
module procedure f2
end interface operator(<)
interface operator(>=)
module procedure f1
end interface operator(.ge.)
interface operator(.ge.)
module procedure f2
end interface operator(>=)
interface operator(>)
module procedure f1
end interface operator(.gt.)
interface operator(.gt.)
module procedure f2
end interface operator(>)
contains
function f2(x,y)
logical f2
type(a), intent(in) :: x, y
end function f2
function f1(x,y)
logical f1
type(b), intent(in) :: x, y
end function f1
end module op