Patchwork [Ada] Fix common misuses of the word "then" where "than" should be used in English.

login
register
mail settings
Submitter Arnaud Charlet
Date April 26, 2012, 10:04 a.m.
Message ID <20120426100406.GA9230@adacore.com>
Download mbox | patch
Permalink /patch/155222/
State New
Headers show

Comments

Arnaud Charlet - April 26, 2012, 10:04 a.m.
Tested on x86_64-pc-linux-gnu, committed on trunk

2012-04-26  Vasiliy Fofanov  <fofanov@adacore.com>

	* a-stzunb-shared.adb, gnat_ugn.texi, a-strunb-shared.adb,
	a-strunb-shared.ads, uintp.adb, a-stwiun-shared.adb,
	a-stwiun-shared.ads, a-cbhama.ads, vms_data.ads, a-cobove.adb,
	a-convec.adb, sem_ch13.adb, a-cbhase.ads: Fix common misuses of the
	word "then" where "than" should be used in English.

Patch

Index: a-stzunb-shared.adb
===================================================================
--- a-stzunb-shared.adb	(revision 186860)
+++ a-stzunb-shared.adb	(working copy)
@@ -6,7 +6,7 @@ 
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -889,7 +889,7 @@ 
          if Count < SR.Last then
             DR.Data (1 .. Count) := SR.Data (1 .. Count);
 
-         --  Length of the source string is less then requested, copy all
+         --  Length of the source string is less than requested, copy all
          --  contents and fill others by Pad character.
 
          else
@@ -943,13 +943,13 @@ 
       else
          DR := Allocate (Count);
 
-         --  Length of the source string is greater then requested, copy
+         --  Length of the source string is greater than requested, copy
          --  corresponding slice.
 
          if Count < SR.Last then
             DR.Data (1 .. Count) := SR.Data (1 .. Count);
 
-         --  Length of the source string is less the requested, copy all
+         --  Length of the source string is less than requested, copy all
          --  exists data and fill others by Pad character.
 
          else
Index: gnat_ugn.texi
===================================================================
--- gnat_ugn.texi	(revision 186869)
+++ gnat_ugn.texi	(working copy)
@@ -13390,7 +13390,7 @@ 
 @cindex @option{^--no-separate-is^/NO_SEPARATE_IS^} (@command{gnatpp})
 @item ^--no-separate-is^/NO_SEPARATE_IS^
 Do not place the keyword @code{is} on a separate line in a subprogram body in
-case if the spec occupies more then one line.
+case if the spec occupies more than one line.
 
 @cindex @option{^--separate-label^/SEPARATE_LABEL^} (@command{gnatpp})
 @item ^--separate-label^/SEPARATE_LABEL^
@@ -13465,7 +13465,7 @@ 
 Indentation level for continuation lines (relative to the line being
 continued), @var{nnn} from 1@dots{}9.
 The default
-value is one less then the (normal) indentation level, unless the
+value is one less than the (normal) indentation level, unless the
 indentation is set to 1 (in which case the default value for continuation
 line indentation is also 1)
 @end table
Index: a-strunb-shared.adb
===================================================================
--- a-strunb-shared.adb	(revision 186860)
+++ a-strunb-shared.adb	(working copy)
@@ -6,7 +6,7 @@ 
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -877,7 +877,7 @@ 
          if Count < SR.Last then
             DR.Data (1 .. Count) := SR.Data (1 .. Count);
 
-         --  Length of the source string is less then requested, copy all
+         --  Length of the source string is less than requested, copy all
          --  contents and fill others by Pad character.
 
          else
@@ -931,13 +931,13 @@ 
       else
          DR := Allocate (Count);
 
-         --  Length of the source string is greater then requested, copy
+         --  Length of the source string is greater than requested, copy
          --  corresponding slice.
 
          if Count < SR.Last then
             DR.Data (1 .. Count) := SR.Data (1 .. Count);
 
-         --  Length of the source string is less the requested, copy all
+         --  Length of the source string is less than requested, copy all
          --  existing data and fill remaining positions with Pad characters.
 
          else
Index: a-strunb-shared.ads
===================================================================
--- a-strunb-shared.ads	(revision 186860)
+++ a-strunb-shared.ads	(working copy)
@@ -6,7 +6,7 @@ 
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -56,7 +56,7 @@ 
    --     reallocation when all of the following requirements are met:
    --      - the shared data object is no longer used by anyone else;
    --      - the size is sufficient to store the new value;
-   --      - the gap after reuse is less then a defined threshold.
+   --      - the gap after reuse is less than a defined threshold.
 
    --   - Memory preallocation. Most of used memory allocation algorithms
    --     align allocated segments on the some boundary, thus some amount of
Index: uintp.adb
===================================================================
--- uintp.adb	(revision 186860)
+++ uintp.adb	(working copy)
@@ -6,7 +6,7 @@ 
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2010, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -159,7 +159,7 @@ 
 
    function Sum_Digits (Left : Uint; Sign : Int) return Int;
    --  If Sign = 1 return the sum of the "digits" of Abs (Left). If the total
-   --  has more then one digit then return Sum_Digits of total.
+   --  has more than one digit then return Sum_Digits of total.
 
    function Sum_Double_Digits (Left : Uint; Sign : Int) return Int;
    --  Same as above but work in New_Base = Base * Base
@@ -1270,8 +1270,6 @@ 
       Discard_Quotient  : Boolean := False;
       Discard_Remainder : Boolean := False)
    is
-      pragma Warnings (Off, Quotient);
-      pragma Warnings (Off, Remainder);
    begin
       pragma Assert (Right /= Uint_0);
 
Index: a-stwiun-shared.adb
===================================================================
--- a-stwiun-shared.adb	(revision 186860)
+++ a-stwiun-shared.adb	(working copy)
@@ -6,7 +6,7 @@ 
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -883,7 +883,7 @@ 
          if Count < SR.Last then
             DR.Data (1 .. Count) := SR.Data (1 .. Count);
 
-         --  Length of the source string is less then requested, copy all
+         --  Length of the source string is less than requested, copy all
          --  contents and fill others by Pad character.
 
          else
@@ -937,13 +937,13 @@ 
       else
          DR := Allocate (Count);
 
-         --  Length of the source string is greater then requested, copy
+         --  Length of the source string is greater than requested, copy
          --  corresponding slice.
 
          if Count < SR.Last then
             DR.Data (1 .. Count) := SR.Data (1 .. Count);
 
-         --  Length of the source string is less the requested, copy all
+         --  Length of the source string is less than requested, copy all
          --  exists data and fill others by Pad character.
 
          else
Index: a-stwiun-shared.ads
===================================================================
--- a-stwiun-shared.ads	(revision 186860)
+++ a-stwiun-shared.ads	(working copy)
@@ -6,7 +6,7 @@ 
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2012, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -463,7 +463,7 @@ 
    --     reallocation when all of the following requirements are meat:
    --      - shared data object don't used anywhere longer;
    --      - its size is sufficient to store new value;
-   --      - the gap after reuse is less then some threshold.
+   --      - the gap after reuse is less than some threshold.
 
    --   - memory preallocation. Most of used memory allocation algorithms
    --     aligns allocated segment on the some boundary, thus some amount of
Index: a-cbhama.ads
===================================================================
--- a-cbhama.ads	(revision 186860)
+++ a-cbhama.ads	(working copy)
@@ -162,7 +162,7 @@ 
 
    procedure Assign (Target : in out Map; Source : Map);
    --  If Target denotes the same object as Source, then the operation has no
-   --  effect. If the Target capacity is less then the Source length, then
+   --  effect. If the Target capacity is less than the Source length, then
    --  Assign raises Capacity_Error.  Otherwise, Assign clears Target and then
    --  copies the (active) elements from Source to Target.
 
Index: vms_data.ads
===================================================================
--- vms_data.ads	(revision 186860)
+++ vms_data.ads	(working copy)
@@ -5996,7 +5996,7 @@ 
    --        /CONTINUATION_INDENT=nnn
    --
    --   Indentation level for continuation lines, nnn from 1 .. 9.
-   --   The default value is one less then the (normal) indentation level,
+   --   The default value is one less than the (normal) indentation level,
    --   unless the indentation is set to 1: in that case the default value for
    --   continuation line indentation is also 1.
 
@@ -6005,7 +6005,7 @@ 
    --        /NO_SEPARATE_IS
    --
    --   Do not place the IS keyword on a separate line in a subprogram body in
-   --   case if the specification occupies more then one line.
+   --   case if the specification occupies more than one line.
 
    S_Pretty_Sep_Label : aliased constant S := "/SEPARATE_LABEL "           &
                                                     "--separate-label";
Index: a-cobove.adb
===================================================================
--- a-cobove.adb	(revision 186860)
+++ a-cobove.adb	(working copy)
@@ -2368,7 +2368,7 @@ 
    begin
       --  Set_Length allows the user to set the length explicitly, instead of
       --  implicitly as a side-effect of deletion or insertion. If the
-      --  requested length is less then the current length, this is equivalent
+      --  requested length is less than the current length, this is equivalent
       --  to deleting items from the back end of the vector. If the requested
       --  length is greater than the current length, then this is equivalent to
       --  inserting "space" (nonce items) at the end.
Index: a-convec.adb
===================================================================
--- a-convec.adb	(revision 186860)
+++ a-convec.adb	(working copy)
@@ -3199,7 +3199,7 @@ 
    begin
       --  Set_Length allows the user to set the length explicitly, instead
       --  of implicitly as a side-effect of deletion or insertion. If the
-      --  requested length is less then the current length, this is equivalent
+      --  requested length is less than the current length, this is equivalent
       --  to deleting items from the back end of the vector. If the requested
       --  length is greater than the current length, then this is equivalent
       --  to inserting "space" (nonce items) at the end.
Index: sem_ch13.adb
===================================================================
--- sem_ch13.adb	(revision 186860)
+++ sem_ch13.adb	(working copy)
@@ -3187,7 +3187,7 @@ 
 
             elsif Small > Delta_Value (U_Ent) then
                Error_Msg_N
-                 ("small value must not be greater then delta value", Nam);
+                 ("small value must not be greater than delta value", Nam);
 
             else
                Set_Small_Value (U_Ent, Small);
Index: a-cbhase.ads
===================================================================
--- a-cbhase.ads	(revision 186860)
+++ a-cbhase.ads	(working copy)
@@ -153,7 +153,7 @@ 
 
    procedure Assign (Target : in out Set; Source : Set);
    --  If Target denotes the same object as Source, then the operation has no
-   --  effect. If the Target capacity is less then the Source length, then
+   --  effect. If the Target capacity is less than the Source length, then
    --  Assign raises Capacity_Error.  Otherwise, Assign clears Target and then
    --  copies the (active) elements from Source to Target.