git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR fortran/35030 (add type/kind information to pointer assignments) 

2008-02-19  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/35030
	* expr.c (gfc_check_pointer_assign): Add type and kind information
	to type-mismatch message.
	(gfc_check_assign): Unify error messages.

From-SVN: r132442
This commit is contained in:
Daniel Franke 2008-02-19 13:26:12 -05:00 committed by Daniel Franke
parent 9d5cee3d87
commit 606c2c03b0
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/fortran/ChangeLog
View File

@ -1,3 +1,10 @@
2008-02-19 Daniel Franke <franke.daniel@gmail.com>
PR fortran/35030
* expr.c (gfc_check_pointer_assign): Add type and kind information
to type-mismatch message.
(gfc_check_assign): Unify error messages.
2008-02-16 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org> 2008-02-16 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR fortran/34952 PR fortran/34952
@ -18,7 +25,7 @@
2008-02-10 Daniel Franke <franke.daniel@gmail.com> 2008-02-10 Daniel Franke <franke.daniel@gmail.com>
fortran/PR35019 PR fortran/35019
* lang.opt: Allow '-J<dir>' next to '-J <dir>', * lang.opt: Allow '-J<dir>' next to '-J <dir>',
likewise '-I <dir>' and '-I<dir>'. likewise '-I <dir>' and '-I<dir>'.

9
gcc/fortran/expr.c
View File

@ -2825,8 +2825,8 @@ gfc_check_assign (gfc_expr *lvalue, gfc_expr *rvalue, int conform)
if (lvalue->ts.type == BT_LOGICAL && rvalue->ts.type == BT_LOGICAL) if (lvalue->ts.type == BT_LOGICAL && rvalue->ts.type == BT_LOGICAL)
return SUCCESS; return SUCCESS;
gfc_error ("Incompatible types in assignment at %L, %s to %s", gfc_error ("Incompatible types in assignment at %L; attempted assignment "
&rvalue->where, gfc_typename (&rvalue->ts), "of %s to %s", &rvalue->where, gfc_typename (&rvalue->ts),
gfc_typename (&lvalue->ts)); gfc_typename (&lvalue->ts));
return FAILURE; return FAILURE;
@ -2909,8 +2909,9 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue)
if (!gfc_compare_types (&lvalue->ts, &rvalue->ts)) if (!gfc_compare_types (&lvalue->ts, &rvalue->ts))
{ {
gfc_error ("Different types in pointer assignment at %L", gfc_error ("Different types in pointer assignment at %L; attempted "
&lvalue->where); "assignment of %s to %s", &lvalue->where,
gfc_typename (&rvalue->ts), gfc_typename (&lvalue->ts));
return FAILURE; return FAILURE;
} }