OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR fortran/34325 (Wrong error message for syntax error) 

2008-05-16  Jerry DeLisle  <jvdelisle@gcc.gnu.org>

    PR fortran/34325
    * decl.c (match_attr_spec): Check for matching pairs of parenthesis.
    * expr.c (gfc_specification_expr): Supplement the error message with the
    type that was found.
    * resolve.c (gfc_resolve_index): Likewise.
    * match.c (gfc_match_parens): Clarify error message with "at or before".
    (gfc_match_do): Check for matching pairs of parenthesis.

From-SVN: r135428
This commit is contained in:
Jerry DeLisle 2008-05-16 16:44:28 +00:00
parent d132593258
commit acb388a0cb
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gcc/fortran/ChangeLog
View File

@ -1,3 +1,13 @@
2008-05-16 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR fortran/34325
* decl.c (match_attr_spec): Check for matching pairs of parenthesis.
* expr.c (gfc_specification_expr): Supplement the error message with the
type that was found.
* resolve.c (gfc_resolve_index): Likewise.
* match.c (gfc_match_parens): Clarify error message with "at or before".
(gfc_match_do): Check for matching pairs of parenthesis.
2008-05-16 Tobias Burnus <burnus@net-b.de
* intrinsic.texi: Write Fortran 77/90/95 instead of F77/90/95;

7
gcc/fortran/decl.c
View File

@ -2934,6 +2934,13 @@ match_attr_spec (void)
goto cleanup;
}
/* Check to make sure any parens are paired up correctly. */
if (gfc_match_parens () == MATCH_ERROR)
{
m = MATCH_ERROR;
goto cleanup;
}
seen[d]++;
seen_at[d] = gfc_current_locus;

3
gcc/fortran/expr.c
View File

@ -2573,7 +2573,8 @@ gfc_specification_expr (gfc_expr *e)
if (e->ts.type != BT_INTEGER)
{
gfc_error ("Expression at %L must be of INTEGER type", &e->where);
gfc_error ("Expression at %L must be of INTEGER type, found %s",
&e->where, gfc_basic_typename (e->ts.type));
return FAILURE;
}

10
gcc/fortran/match.c
View File

@ -153,12 +153,12 @@ gfc_match_parens (void)
if (count > 0)
{
gfc_error ("Missing ')' in statement before %L", &where);
gfc_error ("Missing ')' in statement at or before %L", &where);
return MATCH_ERROR;
}
if (count < 0)
{
gfc_error ("Missing '(' in statement before %L", &where);
gfc_error ("Missing '(' in statement at or before %L", &where);
return MATCH_ERROR;
}
@ -553,7 +553,6 @@ gfc_match_name (char *buffer)
return MATCH_ERROR;
}
buffer[i] = '\0';
gfc_current_locus = old_loc;
@ -1749,6 +1748,11 @@ gfc_match_do (void)
if (gfc_match_char (',') != MATCH_YES && gfc_match ("% ") != MATCH_YES)
return MATCH_NO;
/* Check for balanced parens. */
if (gfc_match_parens () == MATCH_ERROR)
return MATCH_ERROR;
/* See if we have a DO WHILE. */
if (gfc_match (" while ( %e )%t", &iter.end) == MATCH_YES)
{

4
gcc/fortran/resolve.c
View File

@ -3510,8 +3510,8 @@ gfc_resolve_index (gfc_expr *index, int check_scalar)
if (index->ts.type != BT_INTEGER && index->ts.type != BT_REAL)
{
gfc_error ("Array index at %L must be of INTEGER type",
&index->where);
gfc_error ("Array index at %L must be of INTEGER type, found %s",
&index->where, gfc_basic_typename (index->ts.type));
return FAILURE;
}