diff options
author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-22 13:19:06 +0000 |
---|---|---|
committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-07-22 13:19:06 +0000 |
commit | aee081df0f4394566a5d68879502634d6900e311 (patch) | |
tree | 1edd1d72e20a2228a6757315146395eae0926b90 /gcc/fortran/primary.c | |
parent | 5f468e52abd922b178b97070738ae8e9185bd3d9 (diff) | |
download | gcc-aee081df0f4394566a5d68879502634d6900e311.tar.gz |
2008-07-22 Basile Starynkevitch <basile@starynkevitch.net>
MERGED WITH TRUNK rev138050
* gcc/compiler-probe.c: more C++ friendly.
* gcc/passes.c: merged with trunk.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@138056 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran/primary.c')
-rw-r--r-- | gcc/fortran/primary.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/fortran/primary.c b/gcc/fortran/primary.c index c67f2bd1873..ba8416376ec 100644 --- a/gcc/fortran/primary.c +++ b/gcc/fortran/primary.c @@ -2689,7 +2689,7 @@ gfc_match_rvalue (gfc_expr **result) } -/* Match a variable, ie something that can be assigned to. This +/* Match a variable, i.e. something that can be assigned to. This starts as a symbol, can be a structure component or an array reference. It can be a function if the function doesn't have a separate RESULT variable. If the symbol has not been previously @@ -2714,7 +2714,7 @@ match_variable (gfc_expr **result, int equiv_flag, int host_flag) we force the changed_symbols mechanism to work by setting host_flag to 0. This prevents valid symbols that have the name of keywords, such as 'end', being turned into variables by - failed matching to assignments for, eg., END INTERFACE. */ + failed matching to assignments for, e.g., END INTERFACE. */ if (gfc_current_state () == COMP_MODULE || gfc_current_state () == COMP_INTERFACE || gfc_current_state () == COMP_CONTAINS) @@ -2739,7 +2739,7 @@ match_variable (gfc_expr **result, int equiv_flag, int host_flag) switch (sym->attr.flavor) { case FL_VARIABLE: - if (sym->attr.protected && sym->attr.use_assoc) + if (sym->attr.is_protected && sym->attr.use_assoc) { gfc_error ("Assigning to PROTECTED variable at %C"); return MATCH_ERROR; |