diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-12-16 16:01:19 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-12-16 16:01:19 +0000 |
| commit | 26ca4e0587542437e2aae4682a63efe50523d738 (patch) | |
| tree | f32fd42adbb51feb616e947fdf2d9db1e455b8a2 /gcc | |
| parent | bd810d637041dba49a5aca3d085504575374ac6f (diff) | |
| download | gcc-26ca4e0587542437e2aae4682a63efe50523d738.zip gcc-26ca4e0587542437e2aae4682a63efe50523d738.tar.gz gcc-26ca4e0587542437e2aae4682a63efe50523d738.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/decl.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gfortran.dg/pr88138.f90 | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 7220c9c..fa4cb4a 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -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> PF fortran/88364 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 1dd3225..83d9ac6 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -2793,14 +2793,14 @@ variable_decl (int elem) } /* 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. */ if (current_ts.type == BT_DERIVED && initializer && (gfc_numeric_ts (&initializer->ts) || initializer->ts.type == BT_LOGICAL || 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", gfc_typename (&initializer->ts)); m = MATCH_ERROR; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index f47385b..0f11c91ab 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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> PR fortran/88363 diff --git a/gcc/testsuite/gfortran.dg/pr88138.f90 b/gcc/testsuite/gfortran.dg/pr88138.f90 index 04b826c..c4019a6 100644 --- a/gcc/testsuite/gfortran.dg/pr88138.f90 +++ b/gcc/testsuite/gfortran.dg/pr88138.f90 @@ -3,7 +3,7 @@ program p type t character :: c = 'c' 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 end ! { dg-prune-output "has no IMPLICIT type" } |