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

gcc/fortran/ChangeLog

+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

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;

gcc/testsuite/ChangeLog

+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

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" }