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

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7220c9cb5816973edf07270e4baf5734ac3c6dfc..fa4cb4ac0b2e5c0a3e2ccaba2d4e36ec44827613 100644 (file)
--- 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 1dd3225d4860811dc06e6fb7c926d6d09319af1b..83d9ac6caf275ff242c1cfc5e7682fdd20331fa8 100644 (file)
--- 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 f47385bb761bbda6aa88345b1ea6764460bb88ce..0f11c91ab136af8571042ecce920d7b2a671f397 100644 (file)
--- 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 04b826c8cbeffa6617ad4012b8297e4a6438ff54..c4019a6ca2e344b8f5c2d8ff8acb421954e41554 100644 (file)
--- 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" }