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

decl.c (variable_decl): Typo fixes. 

2018-12-16  Steven G. Kargl  <kargl@gcc.gnu.org>

	* decl.c (variable_decl): Typo fixes.

2018-12-16  Steven G. Kargl  <kargl@gcc.gnu.org>

	* gfortran.dg/pr88138.f90: Remove extraneous 's' in comment.

From-SVN: r267188
This commit is contained in:
Steven G. Kargl 2018-12-16 16:01:19 +00:00
parent bd810d6370
commit 26ca4e0587
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/fortran/ChangeLog
View File

@ -1,3 +1,7 @@
2018-12-16 Steven G. Kargl <kargl@gcc.gnu.org>
* decl.c (variable_decl): Typo fixes in comment and error messsage.
2018-12-16 Thomas Koenig <tkoenig@gcc.gnu.org> 2018-12-16 Thomas Koenig <tkoenig@gcc.gnu.org>
PF fortran/88364 PF fortran/88364

4
gcc/fortran/decl.c
View File

@ -2793,14 +2793,14 @@ variable_decl (int elem)
} }
/* Before adding a possible initilizer, do a simple check for compatibility /* Before adding a possible initilizer, do a simple check for compatibility
of lhs and rhs types. Assigning a REAL value to a derive type is not a of lhs and rhs types. Assigning a REAL value to a derived type is not a
good thing. */ good thing. */
if (current_ts.type == BT_DERIVED && initializer if (current_ts.type == BT_DERIVED && initializer
&& (gfc_numeric_ts (&initializer->ts) && (gfc_numeric_ts (&initializer->ts)
|| initializer->ts.type == BT_LOGICAL || initializer->ts.type == BT_LOGICAL
|| initializer->ts.type == BT_CHARACTER)) || initializer->ts.type == BT_CHARACTER))
{ {
gfc_error ("Incompatible initialization between a derive type " gfc_error ("Incompatible initialization between a derived type "
"entity and an entity with %qs type at %C", "entity and an entity with %qs type at %C",
gfc_typename (&initializer->ts)); gfc_typename (&initializer->ts));
m = MATCH_ERROR; m = MATCH_ERROR;

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2018-12-16 Steven G. Kargl <kargl@gcc.gnu.org>
* gfortran.dg/pr88138.f90: Remove extraneous 's' in comment.
2018-12-16 Thomas Koenig <tkoenig@gcc.gnu.org> 2018-12-16 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/88363 PR fortran/88363

2
gcc/testsuite/gfortran.dg/pr88138.f90
View File

@ -3,7 +3,7 @@ program p
type t type t
character :: c = 'c' character :: c = 'c'
end type end type
type(t), parameter :: x = 1.e1 ! { dg-error "Incompatible initialization between a" }s type(t), parameter :: x = 1.e1 ! { dg-error "Incompatible initialization between a" }
print *, 'a' // x%c print *, 'a' // x%c
end end
! { dg-prune-output "has no IMPLICIT type" } ! { dg-prune-output "has no IMPLICIT type" }