diff options
Diffstat (limited to 'gcc/fortran/symbol.c')
| -rw-r--r-- | gcc/fortran/symbol.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c index 285c276..e98556d 100644 --- a/gcc/fortran/symbol.c +++ b/gcc/fortran/symbol.c @@ -251,6 +251,13 @@ gfc_set_default_type (gfc_symbol * sym, int error_flag, gfc_namespace * ns) #define conf(a, b) if (attr->a && attr->b) { a1 = a; a2 = b; goto conflict; } #define conf2(a) if (attr->a) { a2 = a; goto conflict; } +#define conf_std(a, b, std) if (attr->a && attr->b)\ + {\ + a1 = a;\ + a2 = b;\ + standard = std;\ + goto conflict_std;\ + } static try check_conflict (symbol_attribute * attr, const char * name, locus * where) @@ -268,6 +275,7 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where) static const char *threadprivate = "THREADPRIVATE"; const char *a1, *a2; + int standard; if (where == NULL) where = &gfc_current_locus; @@ -328,7 +336,7 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where) } conf (allocatable, pointer); - conf (allocatable, dummy); /* TODO: Allowed in Fortran 200x. */ + conf_std (allocatable, dummy, GFC_STD_F2003); conf (allocatable, function); /* TODO: Allowed in Fortran 200x. */ conf (allocatable, result); /* TODO: Allowed in Fortran 200x. */ conf (elemental, recursive); @@ -519,10 +527,25 @@ conflict: a1, a2, name, where); return FAILURE; + +conflict_std: + if (name == NULL) + { + return gfc_notify_std (standard, "In the selected standard, %s attribute " + "conflicts with %s attribute at %L", a1, a2, + where); + } + else + { + return gfc_notify_std (standard, "In the selected standard, %s attribute " + "conflicts with %s attribute in '%s' at %L", + a1, a2, name, where); + } } #undef conf #undef conf2 +#undef conf_std /* Mark a symbol as referenced. */ |