diff mbox

[1/5] Fix typos in fortran.

Message ID 20130723104020.GA6549@domone.kolej.mff.cuni.cz
State New
Headers show

Commit Message

Ondřej Bílka July 23, 2013, 10:40 a.m. UTC
Hi, this is next in series of typo fixing patches. 

I cleaned up http://kam.mff.cuni.cz/~ondra/gcc_misspells and fixed misspells
for letters a-d. I combined this list with what I done previously and here is result.

I according to Joseph suggestion split it by directory.
This is done with following two scripts.

https://github.com/neleai/stylepp/tree/master/maintained/gcc/split_patch
https://github.com/neleai/stylepp/tree/master/maintained/gcc/prepare_patch

To simplify review I added stylepp_strip_diff tool. It takes a diff and displays 
them in compact way. Here you often fix same typo ten times which is much easier to check
when you have them next to each other.

t counts and indices, including commas, asterices and brackets.  */
t counts and indices, including commas, asterisks and brackets.  */
                                        ^      ^
      -     for calling a ISO_C_BINDING becase c_loc and c_funloc
      +     for calling a ISO_C_BINDING because c_loc and c_funloc
                                        ^   ^
      -     for calling a ISO_C_BINDING becase c_loc and c_funloc
      +     for calling a ISO_C_BINDING because c_loc and c_funloc
                                        ^   ^
                  -      /* Handle wide chracters.  */
                  +      /* Handle wide characters.  */
                                        ^ ^
                  -      /* Handle wide chracters.  */
                  +      /* Handle wide characters.  */
                                        ^ ^
                    -   /* Set this for compatibilty with g77 for /dev/null.  */
                    +   /* Set this for compatibility with g77 for /dev/null.  */
                                        ^         ^
* Restore the saved locus. Only used in conjonction with
* Restore the saved locus. Only used in conjunction with
                                        ^   ^
     -  /* Temporarily disable namelist delimters.  */
     +  /* Temporarily disable namelist delimiters.  */
                                        ^    ^
         -  /* Obtain the umask without distroying the setting.  */
         +  /* Obtain the umask without destroying the setting.  */
                                        ^^
 -   type; otherwise the allocation and initialisation proceeds as for any
 +   type; otherwise the allocation and initialization proceeds as for any
                                        ^       ^
       parameters seem to be for making parameterized derived types.
       parameters seem to be for making parametrized derived types.
                                        ^     ^
                       -/* Status codes specifyed by the standard. */
                       +/* Status codes specified by the standard. */
                                        ^     ^
ould be an error.  If a GENERIC already targetted this binding, it may
ould be an error.  If a GENERIC already targeted this binding, it may
                                        ^   ^

Comments

Tobias Burnus July 23, 2013, 11:50 a.m. UTC | #1
Ondřej Bílka wrote:
> Hi, this is next in series of typo fixing patches.

I committed the this Fortran as Rev. 201162, skipping only the 
"parameterized"-to-"parametrized" change. That change was disputed at 
other parts of this patch series and Merriam-Webster lists the former as 
default entry and the "-trized" only as variant. (Same for Oxford's 
dictionary, while Thunderbird's spellchecker only knows the latter.)

I did include the -ise to -ize and the -tt- to -t- change to make the 
readers on the other side of the pond happy. (Admittedly, both are also 
the preferred spelling in the Oxford Dictionary of English.)

Tobias
Tobias Burnus July 23, 2013, 11:52 a.m. UTC | #2
Ondřej Bílka wrote:
> Hi, this is next in series of typo fixing patches.

I committed the this Fortran as Rev. 201162, skipping only the 
"parameterized"-to-"parametrized" change. That change was disputed at 
other parts of this patch series and Merriam-Webster lists the former as 
default entry and the "-trized" only as variant. (Same for Oxford's 
dictionary, while Thunderbird's spellchecker only knows the latter.)

I did include the -ise to -ize and the -tt- to -t- change to make the 
readers on the other side of the pond happy. (Admittedly, both are also 
the preferred spelling in the Oxford Dictionary of English.)

Tobias
diff mbox

Patch

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index c531d03..74ec79e 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@ 
+2013-07-23   Ondřej Bílka  <neleai@seznam.cz>
+
+	* decl.c: Fix typos in fortran.
+	* interface.c: Likewise.
+	* symbol.c: Likewise.
+	* trans-array.c: Likewise.
+	* trans.c: Likewise.
+
 2013-07-22  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/57906
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index f1aa31e..1525119 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -8255,7 +8255,7 @@  match_procedure_in_type (void)
 	}
 
       /* See if we already have a binding with this name in the symtree which
-	 would be an error.  If a GENERIC already targetted this binding, it may
+	 would be an error.  If a GENERIC already targeted this binding, it may
 	 be already there but then typebound is still NULL.  */
       stree = gfc_find_symtree (ns->tb_sym_root, name);
       if (stree && stree->n.tb)
diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c
index f06ecfe..8d31d1c 100644
--- a/gcc/fortran/interface.c
+++ b/gcc/fortran/interface.c
@@ -3170,7 +3170,7 @@  gfc_procedure_use (gfc_symbol *sym, gfc_actual_arglist **ap, locus *where)
   gfc_formal_arglist *dummy_args;
 
   /* Warn about calls with an implicit interface.  Special case
-     for calling a ISO_C_BINDING becase c_loc and c_funloc
+     for calling a ISO_C_BINDING because c_loc and c_funloc
      are pseudo-unknown.  Additionally, warn about procedures not
      explicitly declared at all if requested.  */
   if (sym->attr.if_source == IFSRC_UNKNOWN && ! sym->attr.is_iso_c)
@@ -3287,7 +3287,7 @@  void
 gfc_ppc_use (gfc_component *comp, gfc_actual_arglist **ap, locus *where)
 {
   /* Warn about calls with an implicit interface.  Special case
-     for calling a ISO_C_BINDING becase c_loc and c_funloc
+     for calling a ISO_C_BINDING because c_loc and c_funloc
      are pseudo-unknown.  */
   if (gfc_option.warn_implicit_interface
       && comp->attr.if_source == IFSRC_UNKNOWN
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index c72974d..6b46ee7 100644
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -3861,7 +3861,7 @@  verify_bind_c_derived_type (gfc_symbol *derived_sym)
         {
           /* This should be allowed; the draft says a derived-type can not
              have type parameters if it is has the BIND attribute.  Type
-             parameters seem to be for making parameterized derived types.
+             parameters seem to be for making parametrized derived types.
              There's no need to verify the type if it is c_ptr/c_funptr.  */
           retval = verify_bind_c_derived_type (curr_comp->ts.u.derived);
 	}
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c
index 0aac678..c269ea8 100644
--- a/gcc/fortran/trans-array.c
+++ b/gcc/fortran/trans-array.c
@@ -994,7 +994,7 @@  get_array_ref_dim_for_loop_dim (gfc_ss *ss, int loop_dim)
 
    'eltype' == NULL signals that the temporary should be a class object.
    The 'initial' expression is used to obtain the size of the dynamic
-   type; otherwise the allocation and initialisation proceeds as for any
+   type; otherwise the allocation and initialization proceeds as for any
    other expression
 
    PRE, POST, INITIAL, DYNAMIC and DEALLOC are as for
diff --git a/gcc/fortran/trans.c b/gcc/fortran/trans.c
index 53a0669..b7863b2 100644
--- a/gcc/fortran/trans.c
+++ b/gcc/fortran/trans.c
@@ -1568,7 +1568,7 @@  gfc_set_backend_locus (locus * loc)
 }
 
 
-/* Restore the saved locus. Only used in conjonction with
+/* Restore the saved locus. Only used in conjunction with
    gfc_save_backend_locus, to free the memory when we are done.  */
 
 void
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 0a035eb..d984d5d 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,11 @@ 
+2013-07-23   Ondřej Bílka  <neleai@seznam.cz>
+
+	* intrinsics/chmod.c: Fix typos in fortran.
+	* intrinsics/env.c: Likewise.
+	* io/file_pos.c: Likewise.
+	* io/transfer.c: Likewise.
+	* io/write.c: Likewise.
+
 2013-07-21   Ondřej Bílka  <neleai@seznam.cz>
 
 	* io/transfer.c: Fix comment typos.
diff --git a/libgfortran/intrinsics/chmod.c b/libgfortran/intrinsics/chmod.c
index eca3e6a..606e36b 100644
--- a/libgfortran/intrinsics/chmod.c
+++ b/libgfortran/intrinsics/chmod.c
@@ -116,7 +116,7 @@  chmod_func (char *name, char *mode, gfc_charlen_type name_len,
 #endif
 
 #ifdef HAVE_UMASK
-  /* Obtain the umask without distroying the setting.  */
+  /* Obtain the umask without destroying the setting.  */
   mode_mask = 0;
   mode_mask = umask (mode_mask);
   (void) umask (mode_mask);
diff --git a/libgfortran/intrinsics/env.c b/libgfortran/intrinsics/env.c
index b8d8e21..774bab2 100644
--- a/libgfortran/intrinsics/env.c
+++ b/libgfortran/intrinsics/env.c
@@ -79,7 +79,7 @@  PREFIX(getenv) (char * name, char * value, gfc_charlen_type name_len,
 /* GET_ENVIRONMENT_VARIABLE (name, [value, length, status, trim_name])
    is a F2003 intrinsic for getting an environment variable.  */
 
-/* Status codes specifyed by the standard. */
+/* Status codes specified by the standard. */
 #define GFC_SUCCESS 0
 #define GFC_VALUE_TOO_SHORT -1
 #define GFC_NAME_DOES_NOT_EXIST 1
diff --git a/libgfortran/io/file_pos.c b/libgfortran/io/file_pos.c
index 8b4fda3..30f4998 100644
--- a/libgfortran/io/file_pos.c
+++ b/libgfortran/io/file_pos.c
@@ -412,7 +412,7 @@  st_rewind (st_parameter_filepos *fpp)
 	  if (sseek (u->s, 0, SEEK_SET) < 0)
 	    generate_error (&fpp->common, LIBERROR_OS, NULL);
 
-	  /* Set this for compatibilty with g77 for /dev/null.  */
+	  /* Set this for compatibility with g77 for /dev/null.  */
 	  if (ssize (u->s) == 0)
 	    u->endfile = AT_ENDFILE;
 	  else
diff --git a/libgfortran/io/transfer.c b/libgfortran/io/transfer.c
index 0b1540c..3845797 100644
--- a/libgfortran/io/transfer.c
+++ b/libgfortran/io/transfer.c
@@ -995,7 +995,7 @@  unformatted_read (st_parameter_dt *dtp, bt type,
   if (unlikely (dtp->u.p.current_unit->flags.convert == GFC_CONVERT_SWAP)
       && kind != 1)
     {
-      /* Handle wide chracters.  */
+      /* Handle wide characters.  */
       if (type == BT_CHARACTER)
   	{
   	  nelems *= size;
@@ -1039,7 +1039,7 @@  unformatted_write (st_parameter_dt *dtp, bt type,
 
       p = source;
 
-      /* Handle wide chracters.  */
+      /* Handle wide characters.  */
       if (type == BT_CHARACTER && kind != 1)
 	{
 	  nelems *= size;
diff --git a/libgfortran/io/write.c b/libgfortran/io/write.c
index 153da2e..62213b0 100644
--- a/libgfortran/io/write.c
+++ b/libgfortran/io/write.c
@@ -1618,7 +1618,7 @@  list_formatted_write (st_parameter_dt *dtp, bt type, void *p, int kind,
    the list.  */
 
 /* A generous estimate of the number of characters needed to print
-   repeat counts and indices, including commas, asterices and brackets.  */
+   repeat counts and indices, including commas, asterisks and brackets.  */
 
 #define NML_DIGITS 20
 
@@ -1974,7 +1974,7 @@  namelist_write (st_parameter_dt *dtp)
 
   dtp->u.p.nml_delim = tmp_delim == DELIM_APOSTROPHE ? '\'' : '"';
 
-  /* Temporarily disable namelist delimters.  */
+  /* Temporarily disable namelist delimiters.  */
   dtp->u.p.current_unit->delim_status = DELIM_NONE;
 
   write_character (dtp, "&", 1, 1);