From 3df684e2a916fa5ed6e95469ac2cafcc597fa430 Mon Sep 17 00:00:00 2001 From: Daniel Kraft Date: Fri, 22 Aug 2008 12:53:40 +0200 Subject: gfortran.h (in_prefix): Removed from this header. 2008-08-22 Daniel Kraft * gfortran.h (in_prefix): Removed from this header. * match.h (gfc_matching_prefix): Moved and renamed from `in_prefix'. * decl.c (in_prefix): Removed from here. (gfc_match_prefix): Use new name of `gfc_matching_prefix'. * symbol.c (gfc_check_symbol_typed): Ditto. * expr.c (check_typed_ns): New helper variable. (expr_check_typed_help): New helper method. (gfc_expr_check_typed): Rewrote to use gfc_traverse_expr to do the work, fixing a minor problem. * match.c (gfc_matching_prefix): New variable. From-SVN: r139435 --- gcc/fortran/decl.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'gcc/fortran/decl.c') diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 892c8f3..04d25cc 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -3753,8 +3753,6 @@ cleanup: can be matched. Note that if nothing matches, MATCH_YES is returned (the null string was matched). */ -bool in_prefix = false; - match gfc_match_prefix (gfc_typespec *ts) { @@ -3763,8 +3761,8 @@ gfc_match_prefix (gfc_typespec *ts) gfc_clear_attr (¤t_attr); seen_type = 0; - gcc_assert (!in_prefix); - in_prefix = true; + gcc_assert (!gfc_matching_prefix); + gfc_matching_prefix = true; loop: if (!seen_type && ts != NULL @@ -3801,13 +3799,13 @@ loop: } /* At this point, the next item is not a prefix. */ - gcc_assert (in_prefix); - in_prefix = false; + gcc_assert (gfc_matching_prefix); + gfc_matching_prefix = false; return MATCH_YES; error: - gcc_assert (in_prefix); - in_prefix = false; + gcc_assert (gfc_matching_prefix); + gfc_matching_prefix = false; return MATCH_ERROR; } -- cgit v1.1