aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran/decl.c
diff options
context:
space:
mode:
authorTobias Schlüter <tobi@gcc.gnu.org>2006-01-18 21:54:49 +0100
committerTobias Schlüter <tobi@gcc.gnu.org>2006-01-18 21:54:49 +0100
commit5cf54585496004fc5b65991d0a7f586bbe9d4a89 (patch)
treed82509409506532bc64cf462617e77ad272677ad /gcc/fortran/decl.c
parent61da04bdada39d393c0ca6cd006099db7ada4ced (diff)
downloadgcc-5cf54585496004fc5b65991d0a7f586bbe9d4a89.zip
gcc-5cf54585496004fc5b65991d0a7f586bbe9d4a89.tar.gz
gcc-5cf54585496004fc5b65991d0a7f586bbe9d4a89.tar.bz2
re PR fortran/18540 (Jumping into blocks gives error rather than warning)
PR fortran/18540 PR fortran/18937 * gfortran.h (BBT_HEADER): Move definition up. (gfc_st_label): Add BBT_HEADER, remove 'prev' and 'next'. * io.c (format_asterisk): Adapt initializer. * resolve.c (resolve_branch): Allow FORTRAN 66 cross-block GOTOs as extension. * symbol.c (compare_st_labels): New function. (gfc_free_st_label, free_st_labels, gfc_get_st_label): Convert to using balanced binary tree. * decl.c (match_char_length, gfc_match_old_kind_spec): Do away with 'cnt'. (warn_unused_label): Adapt to binary tree. * match.c (gfc_match_small_literal_int): Only set cnt if non-NULL. * primary.c (match_kind_param): Do away with cnt. Also converted the ChangeLog to use latin1 characters. From-SVN: r109914
Diffstat (limited to 'gcc/fortran/decl.c')
-rw-r--r--gcc/fortran/decl.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index 91e5820..e786b31 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -1,5 +1,5 @@
/* Declaration statement matcher
- Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
Contributed by Andy Vaught
This file is part of GCC.
@@ -508,15 +508,14 @@ char_len_param_value (gfc_expr ** expr)
static match
match_char_length (gfc_expr ** expr)
{
- int length, cnt;
+ int length;
match m;
m = gfc_match_char ('*');
if (m != MATCH_YES)
return m;
- /* cnt is unused, here. */
- m = gfc_match_small_literal_int (&length, &cnt);
+ m = gfc_match_small_literal_int (&length, NULL);
if (m == MATCH_ERROR)
return m;
@@ -1280,13 +1279,12 @@ match
gfc_match_old_kind_spec (gfc_typespec * ts)
{
match m;
- int original_kind, cnt;
+ int original_kind;
if (gfc_match_char ('*') != MATCH_YES)
return MATCH_NO;
- /* cnt is unsed, here. */
- m = gfc_match_small_literal_int (&ts->kind, &cnt);
+ m = gfc_match_small_literal_int (&ts->kind, NULL);
if (m != MATCH_YES)
return MATCH_ERROR;