aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorGary Dismukes <dismukes@adacore.com>2014-02-24 16:01:26 +0000
committerArnaud Charlet <charlet@gcc.gnu.org>2014-02-24 17:01:26 +0100
commit97027f64df2958e3ec51605c7e2c6f892d2235bb (patch)
treed4cc7bf3b34f1596ebc49d571f6d67addb05429f /gcc
parent5f50020ac14244ded8437ae24f9d9a72fbbbf08d (diff)
downloadgcc-97027f64df2958e3ec51605c7e2c6f892d2235bb.zip
gcc-97027f64df2958e3ec51605c7e2c6f892d2235bb.tar.gz
gcc-97027f64df2958e3ec51605c7e2c6f892d2235bb.tar.bz2
sem_ch5.adb, [...]: Change spelling 'parametrization' to 'parameterization'.
2014-02-24 Gary Dismukes <dismukes@adacore.com> * sem_ch5.adb, sem_aux.ads, sem_ch12.adb, gnat_ugn.texi, par.adb, par-ch12.adb: Change spelling 'parametrization' to 'parameterization'. From-SVN: r208075
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/gnat_ugn.texi2
-rw-r--r--gcc/ada/par-ch12.adb2
-rw-r--r--gcc/ada/par.adb2
-rw-r--r--gcc/ada/sem_aux.ads2
-rw-r--r--gcc/ada/sem_ch12.adb46
-rw-r--r--gcc/ada/sem_ch5.adb2
7 files changed, 33 insertions, 28 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 9f4ee5e..2dfcb64 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-24 Gary Dismukes <dismukes@adacore.com>
+
+ * sem_ch5.adb, sem_aux.ads, sem_ch12.adb, gnat_ugn.texi, par.adb,
+ par-ch12.adb: Change spelling 'parametrization' to 'parameterization'.
+
2014-02-24 Ed Schonberg <schonberg@adacore.com>
* sinfo.ads, sinfo.adb: New attribute Generalized_Indexing, for
diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index d12c889..a57715a 100644
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -3927,7 +3927,7 @@ alignment in bits. The name is followed by at least two blanks, fields
are separated by at least one blank, and a LF character immediately
follows the alignment field.
-Here is an example of target parametrization file:
+Here is an example of a target parameterization file:
@smallexample
Bits_BE 0
diff --git a/gcc/ada/par-ch12.adb b/gcc/ada/par-ch12.adb
index cf75f04..e13216a 100644
--- a/gcc/ada/par-ch12.adb
+++ b/gcc/ada/par-ch12.adb
@@ -350,7 +350,7 @@ package body Ch12 is
if Token = Tok_Others then
if Ada_Version < Ada_2005 then
Error_Msg_SP
- ("partial parametrization of formal packages" &
+ ("partial parameterization of formal packages" &
" is an Ada 2005 extension");
Error_Msg_SP
("\unit must be compiled with -gnat05 switch");
diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb
index fc5e6ad..88720db 100644
--- a/gcc/ada/par.adb
+++ b/gcc/ada/par.adb
@@ -360,7 +360,7 @@ function Par (Configuration_Pragmas : Boolean) return List_Id is
Pbod : Boolean; -- True if proper body OK
Rnam : Boolean; -- True if renaming declaration OK
Stub : Boolean; -- True if body stub OK
- Pexp : Boolean; -- True if parametrized expression OK
+ Pexp : Boolean; -- True if parameterized expression OK
Fil2 : Boolean; -- Filler to fill to 8 bits
end record;
pragma Pack (Pf_Rec);
diff --git a/gcc/ada/sem_aux.ads b/gcc/ada/sem_aux.ads
index f5b71ee..6a3ebeb 100644
--- a/gcc/ada/sem_aux.ads
+++ b/gcc/ada/sem_aux.ads
@@ -282,7 +282,7 @@ package Sem_Aux is
function Is_Generic_Formal (E : Entity_Id) return Boolean;
-- Determine whether E is a generic formal parameter. In particular this is
-- used to set the visibility of generic formals of a generic package
- -- declared with a box or with partial parametrization.
+ -- declared with a box or with partial parameterization.
function Is_Indefinite_Subtype (Ent : Entity_Id) return Boolean;
-- Ent is any entity. Determines if given entity is an unconstrained array
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index 59fc323..a1107f8 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -244,9 +244,9 @@ package body Sem_Ch12 is
-- This should really be reset on encountering a new main unit, but in
-- practice we are not using multiple main units so it is not critical.
- -------------------------------------------------
- -- Formal packages and partial parametrization --
- -------------------------------------------------
+ --------------------------------------------------
+ -- Formal packages and partial parameterization --
+ --------------------------------------------------
-- When compiling a generic, a formal package is a local instantiation. If
-- declared with a box, its generic formals are visible in the enclosing
@@ -263,7 +263,7 @@ package body Sem_Ch12 is
-- In a generic, a formal package is treated like a special instantiation.
-- Our Ada 95 compiler handled formals with and without box in different
- -- ways. With partial parametrization, we use a single model for both.
+ -- ways. With partial parameterization, we use a single model for both.
-- We create a package declaration that consists of the specification of
-- the generic package, and a set of declarations that map the actuals
-- into local renamings, just as we do for bona fide instantiations. For
@@ -951,7 +951,7 @@ package body Sem_Ch12 is
Others_Present : Boolean := False;
Others_Choice : Node_Id := Empty;
- -- In Ada 2005, indicates partial parametrization of a formal
+ -- In Ada 2005, indicates partial parameterization of a formal
-- package. As usual an other association must be last in the list.
procedure Check_Overloaded_Formal_Subprogram (Formal : Entity_Id);
@@ -978,7 +978,7 @@ package body Sem_Ch12 is
-- but return Empty for the actual itself. In this case the code below
-- creates a corresponding declaration for the formal.
- function Partial_Parametrization return Boolean;
+ function Partial_Parameterization return Boolean;
-- Ada 2005: if no match is found for a given formal, check if the
-- association for it includes a box, or whether the associations
-- include an Others clause.
@@ -1168,15 +1168,15 @@ package body Sem_Ch12 is
return Act;
end Matching_Actual;
- -----------------------------
- -- Partial_Parametrization --
- -----------------------------
+ ------------------------------
+ -- Partial_Parameterization --
+ ------------------------------
- function Partial_Parametrization return Boolean is
+ function Partial_Parameterization return Boolean is
begin
return Others_Present
or else (Present (Found_Assoc) and then Box_Present (Found_Assoc));
- end Partial_Parametrization;
+ end Partial_Parameterization;
---------------------
-- Process_Default --
@@ -1289,7 +1289,7 @@ package body Sem_Ch12 is
if Present (Actuals) then
- -- Check for an Others choice, indicating a partial parametrization
+ -- Check for an Others choice, indicating a partial parameterization
-- for a formal package.
Actual := First (Actuals);
@@ -1388,7 +1388,7 @@ package body Sem_Ch12 is
Defining_Identifier (Formal),
Defining_Identifier (Analyzed_Formal));
- if No (Match) and then Partial_Parametrization then
+ if No (Match) and then Partial_Parameterization then
Process_Default (Formal);
else
Append_List
@@ -1403,7 +1403,7 @@ package body Sem_Ch12 is
Defining_Identifier (Analyzed_Formal));
if No (Match) then
- if Partial_Parametrization then
+ if Partial_Parameterization then
Process_Default (Formal);
else
@@ -1506,10 +1506,10 @@ package body Sem_Ch12 is
end if;
-- If there is no corresponding actual, this may be case of
- -- partial parametrization, or else the formal has a default
- -- or a box.
+ -- partial parameterization, or else the formal has a
+ -- default or a box.
- if No (Match) and then Partial_Parametrization then
+ if No (Match) and then Partial_Parameterization then
Process_Default (Formal);
if Nkind (I_Node) = N_Formal_Package_Declaration then
@@ -1571,7 +1571,7 @@ package body Sem_Ch12 is
Defining_Identifier (Original_Node (Analyzed_Formal)));
if No (Match) then
- if Partial_Parametrization then
+ if Partial_Parameterization then
Process_Default (Formal);
else
@@ -9089,11 +9089,11 @@ package body Sem_Ch12 is
-- actual parameter associations for later formals that depend on
-- actuals declared in the formal package.
- -- In Ada 2005, partial parametrization requires that we make visible
- -- the actuals corresponding to formals that were defaulted in the
- -- formal package. There formals are identified because they remain
- -- formal generics within the formal package, rather than being
- -- renamings of the actuals supplied.
+ -- In Ada 2005, partial parameterization requires that we make
+ -- visible the actuals corresponding to formals that were defaulted
+ -- in the formal package. There formals are identified because they
+ -- remain formal generics within the formal package, rather than
+ -- being renamings of the actuals supplied.
declare
Gen_Decl : constant Node_Id :=
diff --git a/gcc/ada/sem_ch5.adb b/gcc/ada/sem_ch5.adb
index 031ec24..491e97c 100644
--- a/gcc/ada/sem_ch5.adb
+++ b/gcc/ada/sem_ch5.adb
@@ -2525,7 +2525,7 @@ package body Sem_Ch5 is
-- Suppress the warning if inside a generic template or
-- instance, since in practice they tend to be dubious in these
- -- cases since they can result from intended parametrization.
+ -- cases since they can result from intended parameterization.
if not Inside_A_Generic and then not In_Instance then