[PATCH] doubled words

[PATCH] doubled words

[Jim Meyering]

Signed-off-by: Jim Meyering <meyering@redhat.com>
---
While most of these are in comments, the corrections
in gcc/tree-cfg.c and gcc/config/sh/constraints.md are in strings.
The former at least is marked for translation, and hence appears
in every .po file.

 gcc/config/alpha/vms-unwind.h      |    4 ++--
 gcc/config/arm/unwind-arm.h        |    4 ++--
 gcc/config/microblaze/microblaze.c |    2 +-
 gcc/config/sh/constraints.md       |    4 ++--
 gcc/cp/pt.c                        |    2 +-
 gcc/java/jcf-parse.c               |    4 ++--
 gcc/tree-cfg.c                     |    4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

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 3356e75..fc69a0c 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13980,7 +13980,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/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)
--
1.7.5.rc1.228.g86d60b

Re: [PATCH] doubled words

[Mike Stump]

On Apr 15, 2011, at 1:18 AM, Jim Meyering <jim@meyering.net> wrote:
> While most of these are in comments, the corrections
> in gcc/tree-cfg.c and gcc/config/sh/constraints.md are in strings.
> The former at least is marked for translation, and hence appears
> in every .po file.

I think these are obvious.
> 

Re: [PATCH] doubled words

[Gerald Pfeifer]

On Fri, 15 Apr 2011, Mike Stump wrote:
> I think these are obvious.

Which means that you can commit them without getting explicit approval,
Jim.

Gerald

Re: [PATCH] doubled words

[Mike Stump]

On Apr 16, 2011, at 4:04 AM, Gerald Pfeifer <gerald@pfeifer.com> wrote:
> On Fri, 15 Apr 2011, Mike Stump wrote:
>> I think these are obvious.
> 
> Which means that you can commit them without getting explicit approval

Well, technically, it means nothing...  It only means something if the maintainer agrees with me, which in general we won't know until they weighing.  Any person that checks in under that rule runs the risk of a, no it isn't.  Now, if we had an obviousness maintainer, they could just approve it; we'd only need a wave of a magic wand to get one.  :-)

Re: [PATCH] doubled words

[Jim Meyering]

Mike Stump wrote:
> On Apr 16, 2011, at 4:04 AM, Gerald Pfeifer <gerald@pfeifer.com> wrote:
>> On Fri, 15 Apr 2011, Mike Stump wrote:
>>> I think these are obvious.
>>
>> Which means that you can commit them without getting explicit approval
>
> Well, technically, it means nothing...  It only means something if the
> maintainer agrees with me, which in general we won't know until they
> weighing.  Any person that checks in under that rule runs the risk of
> a, no it isn't.  Now, if we had an obviousness maintainer, they could
> just approve it; we'd only need a wave of a magic wand to get one.
> :-)

Hi Mike,
If you hadn't said anything, I would have committed those typo fixes
by now, based on what I perceived as your review/approval and on my
reading of this part of http://gcc.gnu.org/svnwrite.html:

    Free for all

    The following changes can be made by everyone with SVN write access:

    Fixes for obvious typos in ChangeLog files, docs, web pages,
    comments and similar stuff. Just check in the fix and copy it
    to gcc-patches. We don't want to get overly anal-retentive about
    checkin policies.

If that policy is no longer in effect or does not apply here,
can you clarify or point to a more up to date policy?

Re: [PATCH] doubled words

[Ralf Wildenhues]

Hi Jim,

* Jim Meyering wrote on Mon, Apr 18, 2011 at 05:40:03PM CEST:
> Mike Stump wrote:
> > On Apr 16, 2011, at 4:04 AM, Gerald Pfeifer wrote:
> >> On Fri, 15 Apr 2011, Mike Stump wrote:
> >>> I think these are obvious.
> >>
> >> Which means that you can commit them without getting explicit approval
> >
> > Well, technically, it means nothing...

> If you hadn't said anything, I would have committed those typo fixes
> by now, based on what I perceived as your review/approval and on my
> reading of this part of http://gcc.gnu.org/svnwrite.html:
> 
>     Free for all
[...]
> If that policy is no longer in effect or does not apply here,
> can you clarify or point to a more up to date policy?

All I know, the policy hasn't changed.  I think there's been a bit of
splitting hairs involved.  There can be times when it is unclear whether
something is obvious or not.  Even when obvious, it can sometimes be
nice not to push forward when somebody is about to merge a big branch,
or even forbidden ("freeze" mode, e.g., to make a release).

Your changes are about as obvious as they can get.  Reviewers will
complain once obviousness-borderline gets visible (or an "obvious"
patch starts breaking a build ;-).  But we should remember that the
obviousness rule also exists so that reviewers don't even _need_ to
take a look; with "is this obvious?", effectively they do again,
eliminating that advantage.

Cheers, (and yes, all IMVHO)
Ralf

Re: [PATCH] doubled words

[Mike Stump]

On Apr 18, 2011, at 8:40 AM, Jim Meyering wrote:
> If you hadn't said anything, I would have committed those typo fixes
> by now, based on what I perceived as your review/approval and on my
> reading of this part of http://gcc.gnu.org/svnwrite.html:
> 
>    Free for all
> 
>    The following changes can be made by everyone with SVN write access:
> 
>    Fixes for obvious typos in ChangeLog files, docs, web pages,
>    comments and similar stuff. Just check in the fix and copy it
>    to gcc-patches. We don't want to get overly anal-retentive about
>    checkin policies.
> 
> If that policy is no longer in effect or does not apply here,
> can you clarify or point to a more up to date policy?

No.  Doesn't exist.  The webpage isn't maintained with the actual details...   I'd say that, yes, the last bunch is fine to check in, IMHO.  For the lib* and the */ changes, you'd need to break these down and have someone that knows just what to do with each hunk review it.  So, for example, the go changes should go to Ian, and he can say, yes check them in, or more likely, please submit/check them into the master go repo.  The one in gcc is a shadow of the master.

Just ping any patch you don't get approval for once a week, every week, until approved or rejected.

Re: [PATCH] doubled words

[Diego Novillo]

On Mon, Apr 18, 2011 at 11:40, Jim Meyering <jim@meyering.net> wrote:
> Mike Stump wrote:
>> On Apr 16, 2011, at 4:04 AM, Gerald Pfeifer <gerald@pfeifer.com> wrote:
>>> On Fri, 15 Apr 2011, Mike Stump wrote:
>>>> I think these are obvious.
>>>
>>> Which means that you can commit them without getting explicit approval
>>
>> Well, technically, it means nothing...  It only means something if the
>> maintainer agrees with me, which in general we won't know until they
>> weighing.  Any person that checks in under that rule runs the risk of
>> a, no it isn't.  Now, if we had an obviousness maintainer, they could
>> just approve it; we'd only need a wave of a magic wand to get one.
>> :-)
>
> Hi Mike,
> If you hadn't said anything, I would have committed those typo fixes
> by now, based on what I perceived as your review/approval and on my
> reading of this part of http://gcc.gnu.org/svnwrite.html:
>
>    Free for all
>
>    The following changes can be made by everyone with SVN write access:
>
>    Fixes for obvious typos in ChangeLog files, docs, web pages,
>    comments and similar stuff. Just check in the fix and copy it
>    to gcc-patches. We don't want to get overly anal-retentive about
>    checkin policies.
>
> If that policy is no longer in effect or does not apply here,
> can you clarify or point to a more up to date policy?

It means exactly that.  If the change falls under the obvious rule,
you don't really need a review.  Simply send the patch to gcc-patches,
make sure you haven't broken anything and commit.

Feel free to commit any of the patches in this series of typo fixes
you just posted.


Diego.

Re: [PATCH] doubled words

[Jim Meyering]

Diego Novillo wrote:
...
> Feel free to commit any of the patches in this series of typo fixes
> you just posted.

Thanks.
Done, with this:

From 7d5f43492809f2d96149853941bc8e0a9e7ecd10 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 18 Apr 2011 22:31:36 +0200
Subject: [PATCH] fix doubled-word typos in comments and strings: e.g., s/in
 in/in/

---
 gcc/ChangeLog                      |    9 +++++++++
 gcc/config/alpha/vms-unwind.h      |    4 ++--
 gcc/config/arm/unwind-arm.h        |    4 ++--
 gcc/config/microblaze/microblaze.c |    2 +-
 gcc/config/sh/constraints.md       |    4 ++--
 gcc/cp/ChangeLog                   |    4 ++++
 gcc/cp/pt.c                        |    2 +-
 gcc/java/ChangeLog                 |    4 ++++
 gcc/java/jcf-parse.c               |    4 ++--
 gcc/tree-cfg.c                     |    4 ++--
 10 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a56f9a..62bed57 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-04-18  Jim Meyering  <meyering@redhat.com>
+
+	fix doubled-word typos in comments and strings
+	* config/alpha/vms-unwind.h: s/for for/for/
+	* config/arm/unwind-arm.h: Likewise.
+	* config/microblaze/microblaze.c: Likewise.
+	* config/sh/constraints.md: s/in in/in/
+	* tree-cfg.c (verify_types_in_gimple_reference): Likewise.
+
 2011-04-18  Uros Bizjak  <ubizjak@gmail.com>

 	* config/i386/i386.h (SSE_VEC_FLOAT_MODE_P): Remove.
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/ChangeLog b/gcc/cp/ChangeLog
index 1037348..672485e 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-18  Jim Meyering  <meyering@redhat.com>
+
+	* pt.c (type_unification_real): Fix typo in comment: s/in in/in/.
+
 2011-04-17  Jan Hubicka  <jh@suse.cz>

 	* semantics.c (finish_goto_stmt): Do set UNINLINABLE flag on computed
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 3356e75..fc69a0c 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -13980,7 +13980,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/java/ChangeLog b/gcc/java/ChangeLog
index a96b507..5ddbc9d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-18  Jim Meyering  <meyering@redhat.com>
+
+	* jcf-parse.c: Fix typo in comment.
+
 2011-04-14  Nathan Froyd  <froydnj@codesourcery.com>

 	* decl.c (poplevel): Use BLOCK_CHAIN and block_chainon.
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)
--
1.7.5.rc2.295.g19c42