diff options
| author | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-25 05:55:59 +0000 |
|---|---|---|
| committer | kargl <kargl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-09-25 05:55:59 +0000 |
| commit | ed951961502296b13693af0cd8d80290d767a1e4 (patch) | |
| tree | 6a6e24a82a64416d1e9b911053664b619ba7717e /gcc/fortran/interface.c | |
| parent | 1613e8b81c9ac6420a9706063fc783d80a6f0408 (diff) | |
| download | gcc-ed951961502296b13693af0cd8d80290d767a1e4.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164616 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/interface.c')
| -rw-r--r-- | gcc/fortran/interface.c | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 5024fe86bdf..896ad75565e 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -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); + + /* 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; + m = MATCH_ERROR; + gfc_error ("Expecting 'END INTERFACE OPERATOR (%s)' at %C, " + "but got %s", s1, s2); + } + } break; |