Patchwork doubled words

login
register
mail settings
Submitter Jim Meyering
Date April 10, 2011, 8:42 p.m.
Message ID <87wrj1n8ip.fsf@rho.meyering.net>
Download mbox | patch
Permalink /patch/90544/
State New
Headers show

Comments

Jim Meyering - April 10, 2011, 8:42 p.m.
Mike Stump wrote:
> On Apr 10, 2011, at 4:54 AM, Jim Meyering wrote:
>> I've noticed/fixed a few occurrences of doubled words like "the the",
>
> I've fixed the obviously wrong ones in gcc/.* excluding ada and go.  I
> don't hate Ada and go, since I don't pretend to keep up on rules to
> their parts of the tree.  I did do java, but only gcc/java, as I think
> we still can put in obvious work there.  One or more of the ones you
> listed were spurious, I didn't change those.
>
> I'm skipping everything not gcc/.*, as I don't keep up on the various
> rules.  One disadvantage of having a multiplicity of rules.  :-(
> Longer term, would be nice to remove some of the multiplicity of
> rules.
>
> I also re-flowed a few of these to make them prettier and fixed the
> English on a few.

Thanks for the quick work.
I realized that I'd omitted a few short, common words
and have added "in", "on", "at" and "for".
Running this revised command shows a few new ones,
at least one is in a diagnostic, which means it shows up
also in each of the .po files.

git ls-files .|xargs perl -0777 -n \
  -e 'while (/\b(then?|in|on|if|at|but|f?or|and|to)\s+\1\b/gms)' \
  -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g; print "$ARGV:$n:$v\n"}'

Here are a few fixes:

Patch

diff --git a/gcc/config/alpha/vms-unwind.h b/gcc/config/alpha/vms-unwind.h
index ea2c3a3..71cb7b8 100644
--- a/gcc/config/alpha/vms-unwind.h
+++ b/gcc/config/alpha/vms-unwind.h
@@ -1,5 +1,5 @@ 
 /* Fallback frame unwinding for Alpha/VMS.
-   Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2009, 2010
+   Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2009, 2010, 2011
    Free Software Foundation, Inc.

    This file is part of GCC.
@@ -229,7 +229,7 @@  alpha_vms_fallback_frame_state (struct _Unwind_Context *context,

   /* If PV designates an exception dispatcher, we have to adjust the return
      address column to get at the signal occurrence point, and account for
-     for what the CHF context contains.  */
+     what the CHF context contains.  */

   if (DENOTES_EXC_DISPATCHER (pv))
     {
diff --git a/gcc/config/arm/unwind-arm.h b/gcc/config/arm/unwind-arm.h
index a9ba126..1a51d8d 100644
--- a/gcc/config/arm/unwind-arm.h
+++ b/gcc/config/arm/unwind-arm.h
@@ -1,5 +1,5 @@ 
 /* Header file for the ARM EABI unwinder
-   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
    Free Software Foundation, Inc.
    Contributed by Paul Brook

@@ -65,7 +65,7 @@  extern "C" {
     }
   _Unwind_State;

-  /* Provided only for for compatibility with existing code.  */
+  /* Provided only for compatibility with existing code.  */
   typedef int _Unwind_Action;
 #define _UA_SEARCH_PHASE	1
 #define _UA_CLEANUP_PHASE	2
diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
index 6ea5fa2..5796bc7 100644
--- a/gcc/config/microblaze/microblaze.c
+++ b/gcc/config/microblaze/microblaze.c
@@ -919,7 +919,7 @@  microblaze_rtx_costs (rtx x, int code, int outer_code ATTRIBUTE_UNUSED, int *tot
 	  {
 	    /* Add 1 to make shift slightly more expensive than add.  */
 	    *total = COSTS_N_INSNS (INTVAL (XEXP (x, 1))) + 1;
-	    /* Reduce shift costs for for special circumstances.  */
+	    /* Reduce shift costs for special circumstances.  */
 	    if (optimize_size && INTVAL (XEXP (x, 1)) > 5)
 	      *total -= 2;
 	    if (!optimize_size && INTVAL (XEXP (x, 1)) > 17)
diff --git a/gcc/config/sh/constraints.md b/gcc/config/sh/constraints.md
index 6b0e5d2..40d0d0b 100644
--- a/gcc/config/sh/constraints.md
+++ b/gcc/config/sh/constraints.md
@@ -1,5 +1,5 @@ 
 ;; Constraint definitions for Renesas / SuperH SH.
-;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2008, 2011 Free Software Foundation, Inc.
 ;;
 ;; This file is part of GCC.
 ;;
@@ -99,7 +99,7 @@ 
        (match_test "ival >= -128 && ival <= 127")))

 (define_constraint "I10"
-  "A signed 10-bit constant, as used in in SHmedia andi, ori."
+  "A signed 10-bit constant, as used in SHmedia andi, ori."
   (and (match_code "const_int")
        (match_test "ival >= -512 && ival <= 511")))

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 86274e9..e055d7d 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13979,7 +13979,7 @@  type_unification_real (tree tparms,
   gcc_assert (ntparms > 0);

   /* Reset the number of non-defaulted template arguments contained
-     in in TARGS.  */
+     in TARGS.  */
   NON_DEFAULT_TEMPLATE_ARGS_COUNT (targs) = NULL_TREE;

   switch (strict)
diff --git a/gcc/go/gofrontend/backend.h b/gcc/go/gofrontend/backend.h
index 01f3cfa..d112d1f 100644
--- a/gcc/go/gofrontend/backend.h
+++ b/gcc/go/gofrontend/backend.h
@@ -148,7 +148,7 @@  class Backend
   
   // Create a new label.  NAME will be empty if this is a label
   // created by the frontend for a loop construct.  The location is
-  // where the the label is defined.
+  // where the label is defined.
   virtual Blabel*
   label(Bfunction*, const std::string& name, source_location) = 0;

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index feeddad..a56c1b7 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -1,6 +1,6 @@ 
 /* Parser for Java(TM) .class files.
    Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.

 This file is part of GCC.

@@ -368,7 +368,7 @@  set_source_filename (JCF *jcf, int index)
    from the input class file into the output file.  We don't decode the
    data at all, merely rewriting constant indexes whenever we come
    across them: this is necessary because the constant pool in the
-   output file isn't the same as the constant pool in in the input.
+   output file isn't the same as the constant pool in the input.

    The main advantage of this technique is that the resulting
    annotation data is pointer-free, so it doesn't have to be relocated
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index fc8c940..3df4dcc 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1,6 +1,6 @@ 
 /* Control flow functions for trees.
    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-   2010  Free Software Foundation, Inc.
+   2010, 2011  Free Software Foundation, Inc.
    Contributed by Diego Novillo <dnovillo@redhat.com>

 This file is part of GCC.
@@ -2989,7 +2989,7 @@  verify_types_in_gimple_reference (tree expr, bool require_lvalue)
       if (!TMR_BASE (expr)
 	  || !is_gimple_mem_ref_addr (TMR_BASE (expr)))
 	{
-	  error ("invalid address operand in in TARGET_MEM_REF");
+	  error ("invalid address operand in TARGET_MEM_REF");
 	  return true;
 	}
       if (!TMR_OFFSET (expr)