]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
ada: Replace Preelaborable_Initialization pragmas with equivalent aspect specs
authorDenis Mazzucato <mazzucato@adacore.com>
Tue, 29 Jul 2025 11:12:29 +0000 (13:12 +0200)
committerMarc Poulhiès <dkm@gcc.gnu.org>
Tue, 9 Sep 2025 12:39:55 +0000 (14:39 +0200)
All Preelaborable_Initialization pragmas in the language-defined units are
replaced by the equivalent Preelaborable_Initialization aspect.

gcc/ada/ChangeLog:

* targparm.adb (Get_Target_Parameters): Address type declaration doesn't
ends anymore with a semicolon.
* libgnat/a-cdlili.ads: Replace Preelaborable_Initialization.
* libgnat/a-cidlli.ads: Likewise.
* libgnat/a-cihama.ads: Likewise.
* libgnat/a-cihase.ads: Likewise.
* libgnat/a-cimutr.ads: Likewise.
* libgnat/a-ciorma.ads: Likewise.
* libgnat/a-ciormu.ads: Likewise.
* libgnat/a-ciorse.ads: Likewise.
* libgnat/a-cohama.ads: Likewise.
* libgnat/a-cohase.ads: Likewise.
* libgnat/a-coinho.ads: Likewise.
* libgnat/a-coinho__shared.ads: Likewise.
* libgnat/a-coinve.ads: Likewise.
* libgnat/a-comutr.ads: Likewise.
* libgnat/a-convec.ads: Likewise.
* libgnat/a-coorma.ads: Likewise.
* libgnat/a-coormu.ads: Likewise.
* libgnat/a-coorse.ads: Likewise.
* libgnat/a-crdlli.ads: Likewise.
* libgnat/a-except.ads: Likewise.
* libgnat/a-finali.ads: Likewise.
* libgnat/a-ngcoty.ads: Likewise.
* libgnat/a-strbou.ads: Likewise.
* libgnat/a-stream.ads: Likewise.
* libgnat/a-strmap.ads: Likewise.
* libgnat/a-strunb.ads: Likewise.
* libgnat/a-strunb__shared.ads: Likewise.
* libgnat/a-ststio.ads: Likewise.
* libgnat/a-stwibo.ads: Likewise.
* libgnat/a-stwima.ads: Likewise.
* libgnat/a-stwiun.ads: Likewise.
* libgnat/a-stwiun__shared.ads: Likewise.
* libgnat/a-stzbou.ads: Likewise.
* libgnat/a-stzmap.ads: Likewise.
* libgnat/a-stzunb.ads: Likewise.
* libgnat/a-stzunb__shared.ads: Likewise.
* libgnat/a-tags.ads: Likewise.
* libgnat/i-cstrin.ads: Likewise.
* libgnat/s-stopoo.ads: Likewise.
* libgnat/s-stposu.ads: Likewise.
* libgnat/system-aix.ads: Likewise.
* libgnat/system-darwin-arm.ads: Likewise.
* libgnat/system-darwin-ppc.ads: Likewise.
* libgnat/system-darwin-x86.ads: Likewise.
* libgnat/system-djgpp.ads: Likewise.
* libgnat/system-dragonfly-x86_64.ads: Likewise.
* libgnat/system-freebsd.ads: Likewise.
* libgnat/system-gnu.ads: Likewise.
* libgnat/system-hpux-ia64.ads: Likewise.
* libgnat/system-hpux.ads: Likewise.
* libgnat/system-linux-alpha.ads: Likewise.
* libgnat/system-linux-arm.ads: Likewise.
* libgnat/system-linux-hppa.ads: Likewise.
* libgnat/system-linux-ia64.ads: Likewise.
* libgnat/system-linux-loongarch.ads: Likewise.
* libgnat/system-linux-m68k.ads: Likewise.
* libgnat/system-linux-mips.ads: Likewise.
* libgnat/system-linux-ppc.ads: Likewise.
* libgnat/system-linux-riscv.ads: Likewise.
* libgnat/system-linux-s390.ads: Likewise.
* libgnat/system-linux-sh4.ads: Likewise.
* libgnat/system-linux-sparc.ads: Likewise.
* libgnat/system-linux-x86.ads: Likewise.
* libgnat/system-lynxos178-ppc.ads: Likewise.
* libgnat/system-lynxos178-x86.ads: Likewise.
* libgnat/system-mingw.ads: Likewise.
* libgnat/system-qnx-arm.ads: Likewise.
* libgnat/system-rtems.ads: Likewise.
* libgnat/system-solaris-sparc.ads: Likewise.
* libgnat/system-solaris-x86.ads: Likewise.
* libgnat/system-vxworks-ppc-kernel.ads: Likewise.
* libgnat/system-vxworks-ppc-rtp-smp.ads: Likewise.
* libgnat/system-vxworks-ppc-rtp.ads: Likewise.
* libgnat/system-vxworks7-aarch64-rtp-smp.ads: Likewise.
* libgnat/system-vxworks7-aarch64.ads: Likewise.
* libgnat/system-vxworks7-arm-rtp-smp.ads: Likewise.
* libgnat/system-vxworks7-arm.ads: Likewise.
* libgnat/system-vxworks7-ppc-kernel.ads: Likewise.
* libgnat/system-vxworks7-ppc-rtp-smp.ads: Likewise.
* libgnat/system-vxworks7-ppc64-kernel.ads: Likewise.
* libgnat/system-vxworks7-ppc64-rtp-smp.ads: Likewise.
* libgnat/system-vxworks7-x86-kernel.ads: Likewise.
* libgnat/system-vxworks7-x86-rtp-smp.ads: Likewise.
* libgnat/system-vxworks7-x86_64-kernel.ads: Likewise.
* libgnat/system-vxworks7-x86_64-rtp-smp.ads: Likewise.

86 files changed:
gcc/ada/libgnat/a-cdlili.ads
gcc/ada/libgnat/a-cidlli.ads
gcc/ada/libgnat/a-cihama.ads
gcc/ada/libgnat/a-cihase.ads
gcc/ada/libgnat/a-cimutr.ads
gcc/ada/libgnat/a-ciorma.ads
gcc/ada/libgnat/a-ciormu.ads
gcc/ada/libgnat/a-ciorse.ads
gcc/ada/libgnat/a-cohama.ads
gcc/ada/libgnat/a-cohase.ads
gcc/ada/libgnat/a-coinho.ads
gcc/ada/libgnat/a-coinho__shared.ads
gcc/ada/libgnat/a-coinve.ads
gcc/ada/libgnat/a-comutr.ads
gcc/ada/libgnat/a-convec.ads
gcc/ada/libgnat/a-coorma.ads
gcc/ada/libgnat/a-coormu.ads
gcc/ada/libgnat/a-coorse.ads
gcc/ada/libgnat/a-crdlli.ads
gcc/ada/libgnat/a-except.ads
gcc/ada/libgnat/a-finali.ads
gcc/ada/libgnat/a-ngcoty.ads
gcc/ada/libgnat/a-strbou.ads
gcc/ada/libgnat/a-stream.ads
gcc/ada/libgnat/a-strmap.ads
gcc/ada/libgnat/a-strunb.ads
gcc/ada/libgnat/a-strunb__shared.ads
gcc/ada/libgnat/a-ststio.ads
gcc/ada/libgnat/a-stwibo.ads
gcc/ada/libgnat/a-stwima.ads
gcc/ada/libgnat/a-stwiun.ads
gcc/ada/libgnat/a-stwiun__shared.ads
gcc/ada/libgnat/a-stzbou.ads
gcc/ada/libgnat/a-stzmap.ads
gcc/ada/libgnat/a-stzunb.ads
gcc/ada/libgnat/a-stzunb__shared.ads
gcc/ada/libgnat/a-tags.ads
gcc/ada/libgnat/i-cstrin.ads
gcc/ada/libgnat/s-stopoo.ads
gcc/ada/libgnat/s-stposu.ads
gcc/ada/libgnat/system-aix.ads
gcc/ada/libgnat/system-darwin-arm.ads
gcc/ada/libgnat/system-darwin-ppc.ads
gcc/ada/libgnat/system-darwin-x86.ads
gcc/ada/libgnat/system-djgpp.ads
gcc/ada/libgnat/system-dragonfly-x86_64.ads
gcc/ada/libgnat/system-freebsd.ads
gcc/ada/libgnat/system-gnu.ads
gcc/ada/libgnat/system-hpux-ia64.ads
gcc/ada/libgnat/system-hpux.ads
gcc/ada/libgnat/system-linux-alpha.ads
gcc/ada/libgnat/system-linux-arm.ads
gcc/ada/libgnat/system-linux-hppa.ads
gcc/ada/libgnat/system-linux-ia64.ads
gcc/ada/libgnat/system-linux-loongarch.ads
gcc/ada/libgnat/system-linux-m68k.ads
gcc/ada/libgnat/system-linux-mips.ads
gcc/ada/libgnat/system-linux-ppc.ads
gcc/ada/libgnat/system-linux-riscv.ads
gcc/ada/libgnat/system-linux-s390.ads
gcc/ada/libgnat/system-linux-sh4.ads
gcc/ada/libgnat/system-linux-sparc.ads
gcc/ada/libgnat/system-linux-x86.ads
gcc/ada/libgnat/system-lynxos178-ppc.ads
gcc/ada/libgnat/system-lynxos178-x86.ads
gcc/ada/libgnat/system-mingw.ads
gcc/ada/libgnat/system-qnx-arm.ads
gcc/ada/libgnat/system-rtems.ads
gcc/ada/libgnat/system-solaris-sparc.ads
gcc/ada/libgnat/system-solaris-x86.ads
gcc/ada/libgnat/system-vxworks-ppc-kernel.ads
gcc/ada/libgnat/system-vxworks-ppc-rtp-smp.ads
gcc/ada/libgnat/system-vxworks-ppc-rtp.ads
gcc/ada/libgnat/system-vxworks7-aarch64-rtp-smp.ads
gcc/ada/libgnat/system-vxworks7-aarch64.ads
gcc/ada/libgnat/system-vxworks7-arm-rtp-smp.ads
gcc/ada/libgnat/system-vxworks7-arm.ads
gcc/ada/libgnat/system-vxworks7-ppc-kernel.ads
gcc/ada/libgnat/system-vxworks7-ppc-rtp-smp.ads
gcc/ada/libgnat/system-vxworks7-ppc64-kernel.ads
gcc/ada/libgnat/system-vxworks7-ppc64-rtp-smp.ads
gcc/ada/libgnat/system-vxworks7-x86-kernel.ads
gcc/ada/libgnat/system-vxworks7-x86-rtp-smp.ads
gcc/ada/libgnat/system-vxworks7-x86_64-kernel.ads
gcc/ada/libgnat/system-vxworks7-x86_64-rtp-smp.ads
gcc/ada/targparm.adb

index 93b63b31f7c83ae1f278c47479ca2eb99b16bdb4..323226cd574889e1f7e9a2531352d50353f127c6 100644 (file)
@@ -58,12 +58,12 @@ is
       Default_Iterator  => Iterate,
       Iterator_Element  => Element_Type,
       Aggregate         => (Empty       => Empty,
-                            Add_Unnamed => Append);
+                            Add_Unnamed => Append),
+      Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (List);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with
+      Preelaborable_Initialization;
 
    Empty_List : constant List;
 
index de7167f3567d30e3509f18489eff4a226fed8250..87b582d707c1cc79147e1ccb732a7a3cf87ecb51 100644 (file)
@@ -57,12 +57,11 @@ is
       Default_Iterator  => Iterate,
       Iterator_Element  => Element_Type,
       Aggregate         => (Empty       => Empty,
-                            Add_Unnamed => Append);
+                            Add_Unnamed => Append),
+      Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (List);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private with
+      Preelaborable_Initialization;
 
    Empty_List : constant List;
 
index fb6a65e4baddad8e11b1739a28dad26aa93d6214..8862bbbab9f27e4fd647c401bceffc59a0e59726 100644 (file)
@@ -59,12 +59,11 @@ is
       Default_Iterator  => Iterate,
       Iterator_Element  => Element_Type,
       Aggregate         => (Empty     => Empty,
-                            Add_Named => Insert);
+                            Add_Named => Insert),
+      Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Map);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private with
+      Preelaborable_Initialization;
 
    Empty_Map : constant Map;
    --  Map objects declared without an initialization expression are
index dbb42f1f8cf14336ae4b1293d78d628c7f2f647d..7efc9419bdc8d83dba806282808b40b445edeb94 100644 (file)
@@ -61,12 +61,11 @@ is
           Default_Iterator  => Iterate,
           Iterator_Element  => Element_Type,
           Aggregate         => (Empty       => Empty,
-                                Add_Unnamed => Include);
+                                Add_Unnamed => Include),
+          Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Set);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+     with Preelaborable_Initialization;
 
    Empty_Set : constant Set;
    --  Set objects declared without an initialization expression are
index b7e9b7cffb69d60f0e36e9ead4f36bb2e3e911c9..022ae5ed475cbd84c5a7be4a9fb5f58b845d23a7 100644 (file)
@@ -54,12 +54,11 @@ is
      with Constant_Indexing => Constant_Reference,
           Variable_Indexing => Reference,
           Default_Iterator  => Iterate,
-          Iterator_Element  => Element_Type;
+          Iterator_Element  => Element_Type,
+          Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Tree);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+     with Preelaborable_Initialization;
 
    Empty_Tree : constant Tree;
 
index 58e4f283435c3a38a7a6db32de63a669fb4ab6c6..acf86b6c70b319f188665d3bb69be89dffe87294 100644 (file)
@@ -60,12 +60,11 @@ is
         Default_Iterator  => Iterate,
         Iterator_Element  => Element_Type,
         Aggregate         => (Empty     => Empty,
-                              Add_Named => Insert);
+                              Add_Named => Insert),
+        Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Map);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with Preelaborable_Initialization;
 
    Empty_Map : constant Map;
 
index ddc2722a6a2b1a3d26b08c916a6496075dfc9dbe..894a4934671d882bfeeb1002c5e919a24f0498dd 100644 (file)
@@ -58,12 +58,11 @@ is
    type Set is tagged private
    with Constant_Indexing => Constant_Reference,
         Default_Iterator  => Iterate,
-        Iterator_Element  => Element_Type;
+        Iterator_Element  => Element_Type,
+        Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Set);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with Preelaborable_Initialization;
 
    Empty_Set : constant Set;
    --  The default value for set objects declared without an explicit
index c19e57e93d0c8a174b9e0cbcd988fd97e758fb9b..fcc1aa12e4ffd00fa289f279ae65af205002febe 100644 (file)
@@ -59,12 +59,11 @@ is
       Default_Iterator  => Iterate,
       Iterator_Element  => Element_Type,
       Aggregate         => (Empty       => Empty,
-                            Add_Unnamed => Include);
+                            Add_Unnamed => Include),
+      Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Set);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private with
+      Preelaborable_Initialization;
 
    Empty_Set : constant Set;
    function Empty  return Set;
index 2c2577c269ec43543485457ef81e4652748364b4..8f501e1c99f80f55f337fc0022cf20f6ba57b7b9 100644 (file)
@@ -103,12 +103,12 @@ is
       Default_Iterator  => Iterate,
       Iterator_Element  => Element_Type,
       Aggregate         => (Empty     => Empty,
-                            Add_Named => Insert);
+                            Add_Named => Insert),
+      Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Map);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with
+      Preelaborable_Initialization;
 
    function "=" (Left, Right : Cursor) return Boolean;
    --  The representation of cursors includes a component used to optimize
index fb7c944f4ad448d2e767217668e41f1baccff466..6eb5b0c992a3b90461725f9b093b6c5c4111ad4d 100644 (file)
@@ -62,12 +62,12 @@ is
       Default_Iterator  => Iterate,
       Iterator_Element  => Element_Type,
       Aggregate         => (Empty       => Empty,
-                            Add_Unnamed => Include);
+                            Add_Unnamed => Include),
+      Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Set);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with
+      Preelaborable_Initialization;
 
    function "=" (Left, Right : Cursor) return Boolean;
    --  The representation of cursors includes a component used to optimize
index c9a6aa71226e4b9a03a5ca7312337e02ea92267d..dcb5b0cddda3b02acae61053fd3762a1d63c9e7c 100644 (file)
@@ -42,8 +42,9 @@ package Ada.Containers.Indefinite_Holders is
    pragma Preelaborate (Indefinite_Holders);
    pragma Remote_Types (Indefinite_Holders);
 
-   type Holder is tagged private;
-   pragma Preelaborable_Initialization (Holder);
+   type Holder is tagged private
+   with
+      Preelaborable_Initialization;
 
    Empty_Holder : constant Holder;
 
index 904ae01065f439151de7aac0e1cd143115cd93aa..a8d0cff84ed48da542aa896fc5e78e9f33d693e8 100644 (file)
@@ -47,8 +47,9 @@ package Ada.Containers.Indefinite_Holders is
    pragma Preelaborate (Indefinite_Holders);
    pragma Remote_Types (Indefinite_Holders);
 
-   type Holder is tagged private;
-   pragma Preelaborable_Initialization (Holder);
+   type Holder is tagged private
+   with
+      Preelaborable_Initialization;
 
    Empty_Holder : constant Holder;
 
index 6d2df0cde6795bd13759ad5d3175b25be39d1fa1..65ff916c31cfa03dd12358bb85ef2921a92aac7a 100644 (file)
@@ -66,12 +66,12 @@ is
      Aggregate         => (Empty          => Empty,
                            Add_Unnamed    => Append,
                            New_Indexed    => New_Vector,
-                           Assign_Indexed => Replace_Element);
+                           Assign_Indexed => Replace_Element),
+     Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Vector);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with
+     Preelaborable_Initialization;
 
    Empty_Vector : constant Vector;
 
index adc2cad8e5e53db713c16967a01486e86be3c9a6..8291408a6130453908be240763b0bd4e8fb457eb 100644 (file)
@@ -54,11 +54,11 @@ is
      with Constant_Indexing => Constant_Reference,
           Variable_Indexing => Reference,
           Default_Iterator  => Iterate,
-          Iterator_Element  => Element_Type;
-   pragma Preelaborable_Initialization (Tree);
+          Iterator_Element  => Element_Type,
+          Preelaborable_Initialization;
 
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+     with Preelaborable_Initialization;
 
    Empty_Tree : constant Tree;
 
index 5f443798b893047896037966dc68c925e878ddda..8fad465a1f34fdd06529e9bd847bdc6754cc5aff 100644 (file)
@@ -97,15 +97,15 @@ is
       Aggregate         => (Empty          => Empty,
                             Add_Unnamed    => Append,
                             New_Indexed    => New_Vector,
-                            Assign_Indexed => Replace_Element);
-
-   pragma Preelaborable_Initialization (Vector);
+                            Assign_Indexed => Replace_Element),
+      Preelaborable_Initialization;
    --  Vector type, to be instantiated by users of this package. If an object
    --  of type Vector is not otherwise initialized, it is initialized to
    --  Empty_Vector.
 
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with
+      Preelaborable_Initialization;
    --  Cursor pointing into an instance of vector. If an object of type Cursor
    --  is not otherwise initialized, it is initialized to No_Element
 
index 4ec4d1705fbb2edc6de24c04e88b4eeb84a6e190..644895c808e4347db4054a667e579ae6d8075b95 100644 (file)
@@ -60,11 +60,12 @@ is
       Default_Iterator  => Iterate,
       Iterator_Element  => Element_Type,
       Aggregate         => (Empty     => Empty,
-                            Add_Named => Insert);
-   pragma Preelaborable_Initialization (Map);
+                            Add_Named => Insert),
+      Preelaborable_Initialization;
 
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with
+      Preelaborable_Initialization;
 
    Empty_Map : constant Map;
 
index 2dbaacbeee296f06bc34d3882e56cdda393ec85c..89e878dbfcff9feb0416050a5af685e6aa24edd4 100644 (file)
@@ -57,12 +57,11 @@ is
    type Set is tagged private
    with Constant_Indexing => Constant_Reference,
         Default_Iterator  => Iterate,
-        Iterator_Element  => Element_Type;
+        Iterator_Element  => Element_Type,
+        Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Set);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with Preelaborable_Initialization;
 
    Empty_Set : constant Set;
    --  The default value for set objects declared without an explicit
index aa76e7388f740bef03a6b754b86341f98b5dd980..c8c8bf04d60515c005e32d8abdd12527ca778f51 100644 (file)
@@ -59,12 +59,11 @@ is
         Default_Iterator  => Iterate,
         Iterator_Element  => Element_Type,
         Aggregate         => (Empty       => Empty,
-                              Add_Unnamed => Include);
+                              Add_Unnamed => Include),
+        Preelaborable_Initialization;
 
-   pragma Preelaborable_Initialization (Set);
-
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with Preelaborable_Initialization;
 
    function Has_Element (Position : Cursor) return Boolean;
 
index 858fecb08699331df4e09b35b376018b7024023b..1f415f6f148d1c98c91b654087c818d1e64e28de 100644 (file)
@@ -46,11 +46,11 @@ generic
 package Ada.Containers.Restricted_Doubly_Linked_Lists is
    pragma Pure;
 
-   type List (Capacity : Count_Type) is tagged limited private;
-   pragma Preelaborable_Initialization (List);
+   type List (Capacity : Count_Type) is tagged limited private
+   with Preelaborable_Initialization;
 
-   type Cursor is private;
-   pragma Preelaborable_Initialization (Cursor);
+   type Cursor is private
+   with Preelaborable_Initialization;
 
    Empty_List : constant List;
    --  The default value for list objects declared without an explicit
index b1f56d12578235b20a2ea8312df9b714d53fea44..603fb02cc5ed4267f9bc97fb64371ed1e2908da1 100644 (file)
@@ -45,13 +45,13 @@ package Ada.Exceptions is
    pragma Preelaborate;
    --  In accordance with Ada 2005 AI-362.
 
-   type Exception_Id is private;
-   pragma Preelaborable_Initialization (Exception_Id);
+   type Exception_Id is private
+   with Preelaborable_Initialization;
 
    Null_Id : constant Exception_Id;
 
-   type Exception_Occurrence is limited private;
-   pragma Preelaborable_Initialization (Exception_Occurrence);
+   type Exception_Occurrence is limited private
+   with Preelaborable_Initialization;
 
    type Exception_Occurrence_Access is access all Exception_Occurrence;
 
index 6c7d0f4ab49a036ba1f771022dc88b1928ef92d2..5125af0a0d2e15737ce2c8fbb92041f9c0be4d17 100644 (file)
@@ -40,15 +40,15 @@ pragma Warnings (On);
 package Ada.Finalization is
    pragma Pure;
 
-   type Controlled is abstract tagged private;
-   pragma Preelaborable_Initialization (Controlled);
+   type Controlled is abstract tagged private
+   with Preelaborable_Initialization;
 
    procedure Initialize (Object : in out Controlled) is null;
    procedure Adjust     (Object : in out Controlled) is null;
    procedure Finalize   (Object : in out Controlled) is null;
 
-   type Limited_Controlled is abstract tagged limited private;
-   pragma Preelaborable_Initialization (Limited_Controlled);
+   type Limited_Controlled is abstract tagged limited private
+   with Preelaborable_Initialization;
 
    procedure Initialize (Object : in out Limited_Controlled) is null;
    procedure Finalize   (Object : in out Limited_Controlled) is null;
index 9974037c7938f73721422fa8499db59ce8976abe..f5ff0aa90a69e67406cbce48c5044b709558427c 100644 (file)
@@ -45,8 +45,8 @@ package Ada.Numerics.Generic_Complex_Types is
 
    pragma Complex_Representation (Complex);
 
-   type Imaginary is private;
-   pragma Preelaborable_Initialization (Imaginary);
+   type Imaginary is private
+   with Preelaborable_Initialization;
 
    i : constant Imaginary;
    j : constant Imaginary;
index c849dbea07eca26902372caf6935b8080781ad08..857a65fa9de5e3da34b4c4587667e8e72e3d6ce9 100644 (file)
@@ -75,8 +75,9 @@ is
 
       Max_Length : constant Positive := Max;
 
-      type Bounded_String is private;
-      pragma Preelaborable_Initialization (Bounded_String);
+      type Bounded_String is private
+      with
+        Preelaborable_Initialization;
 
       Null_Bounded_String : constant Bounded_String;
       --  Null_Bounded_String represents the null string. If an object of type
index b9a7b99f437beac60b36df7bd15dd6b7aec61088..e32219931d2273c295e8426cb03a46fa75cfe517 100644 (file)
@@ -36,8 +36,8 @@
 package Ada.Streams is
    pragma Pure;
 
-   type Root_Stream_Type is abstract tagged limited private;
-   pragma Preelaborable_Initialization (Root_Stream_Type);
+   type Root_Stream_Type is abstract tagged limited private
+   with Preelaborable_Initialization;
 
    type Stream_Element is mod 2 ** Standard'Storage_Unit;
 
index b963a63a82c1ddbb6922fb15e0d70fe2eea8b212..0b5dff32e02c68d569b80f1d36a50d03d6f2c993 100644 (file)
@@ -59,8 +59,8 @@ is
    -- Character Set Declarations --
    --------------------------------
 
-   type Character_Set is private;
-   pragma Preelaborable_Initialization (Character_Set);
+   type Character_Set is private
+   with Preelaborable_Initialization;
    --  An object of type Character_Set represents a set of characters.
 
    Null_Set : constant Character_Set;
@@ -256,8 +256,8 @@ is
    -- Character Mapping Declarations --
    ------------------------------------
 
-   type Character_Mapping is private;
-   pragma Preelaborable_Initialization (Character_Mapping);
+   type Character_Mapping is private
+   with Preelaborable_Initialization;
    --  An object of type Character_Mapping represents a Character-to-Character
    --  mapping.
 
index 60d57954e5c98eae960679d02d725b7e7d1cf57c..3f13b7f61ef903a9c1c56109c8e98e1f3642e8e2 100644 (file)
@@ -73,8 +73,8 @@ is
    subtype String_1 is String (1 .. <>) with Ghost;  --  Type used in contracts
 
    type Unbounded_String is private with
-     Default_Initial_Condition => Length (Unbounded_String) = 0;
-   pragma Preelaborable_Initialization (Unbounded_String);
+     Default_Initial_Condition => Length (Unbounded_String) = 0,
+     Preelaborable_Initialization;
 
    Null_Unbounded_String : constant Unbounded_String;
    --  Represents the null String. If an object of type Unbounded_String is not
index b731183df068364ee622c165ae1180201c1316b0..f4309083d5f16d05d87441d2b08266ec05295749 100644 (file)
@@ -103,8 +103,8 @@ is
    subtype String_1 is String (1 .. <>) with Ghost;  --  Type used in contracts
 
    type Unbounded_String is private with
-     Default_Initial_Condition => Length (Unbounded_String) = 0;
-   pragma Preelaborable_Initialization (Unbounded_String);
+     Default_Initial_Condition => Length (Unbounded_String) = 0,
+     Preelaborable_Initialization;
 
    Null_Unbounded_String : constant Unbounded_String;
 
index 8c43ecd6ec73373354ab206253d780daff03d6dc..be66bea6f7a477d5060172957b58b54f6a5849d6 100644 (file)
@@ -41,8 +41,9 @@ package Ada.Streams.Stream_IO is
 
    type Stream_Access is access all Root_Stream_Type'Class;
 
-   type File_Type is limited private with Default_Initial_Condition;
-   pragma Preelaborable_Initialization (File_Type);
+   type File_Type is limited private
+   with Default_Initial_Condition,
+        Preelaborable_Initialization;
 
    type File_Mode is (In_File, Out_File, Append_File);
 
index 996dc33f0b3884cf0d3dec488e67e35e20938446..c22722b3642b10a858aeab25a9886aa84dc608af 100644 (file)
@@ -47,8 +47,8 @@ package Ada.Strings.Wide_Bounded is
 
       Max_Length : constant Positive := Max;
 
-      type Bounded_Wide_String is private;
-      pragma Preelaborable_Initialization (Bounded_Wide_String);
+      type Bounded_Wide_String is private
+      with Preelaborable_Initialization;
 
       Null_Bounded_Wide_String : constant Bounded_Wide_String;
 
index be5c7fb56846f66c095d9a4620442107a4ae6f4a..1d4fc8acf594c3c6d8ccc86590f911e6e4f33922 100644 (file)
@@ -42,8 +42,8 @@ package Ada.Strings.Wide_Maps is
    -- Wide Character Set Declarations --
    -------------------------------------
 
-   type Wide_Character_Set is private;
-   pragma Preelaborable_Initialization (Wide_Character_Set);
+   type Wide_Character_Set is private
+   with Preelaborable_Initialization;
    --  Representation for a set of Wide_Character values:
 
    Null_Set : constant Wide_Character_Set;
@@ -120,8 +120,8 @@ package Ada.Strings.Wide_Maps is
    -- Wide Character Mapping Declarations --
    -----------------------------------------
 
-   type Wide_Character_Mapping is private;
-   pragma Preelaborable_Initialization (Wide_Character_Mapping);
+   type Wide_Character_Mapping is private
+   with Preelaborable_Initialization;
    --  Representation for a wide character to wide character mapping:
 
    function Value
index a57739946e3c514afd2c2455d4afc062c82ef6b8..285b5d35a3cd58cfe7143db84c3fdac4d0dfc0eb 100644 (file)
@@ -39,8 +39,8 @@ with Ada.Finalization;
 package Ada.Strings.Wide_Unbounded is
    pragma Preelaborate;
 
-   type Unbounded_Wide_String is private;
-   pragma Preelaborable_Initialization (Unbounded_Wide_String);
+   type Unbounded_Wide_String is private
+   with Preelaborable_Initialization;
 
    Null_Unbounded_Wide_String : constant Unbounded_Wide_String;
 
index 00cfbdb75cca0df7f642c6b17da3d8927cb994bf..2f0927898262cdd69c9b4a54353d88b1409f50a8 100644 (file)
@@ -48,8 +48,8 @@ private with System.Atomic_Counters;
 package Ada.Strings.Wide_Unbounded is
    pragma Preelaborate;
 
-   type Unbounded_Wide_String is private;
-   pragma Preelaborable_Initialization (Unbounded_Wide_String);
+   type Unbounded_Wide_String is private
+   with Preelaborable_Initialization;
 
    Null_Unbounded_Wide_String : constant Unbounded_Wide_String;
 
index b0ca520d0c030fbf5ba62de6eae3d1e2190ff004..278875f68ff948c7c8d96391a853839300db67f8 100644 (file)
@@ -47,8 +47,8 @@ package Ada.Strings.Wide_Wide_Bounded is
 
       Max_Length : constant Positive := Max;
 
-      type Bounded_Wide_Wide_String is private;
-      pragma Preelaborable_Initialization (Bounded_Wide_Wide_String);
+      type Bounded_Wide_Wide_String is private
+      with Preelaborable_Initialization;
 
       Null_Bounded_Wide_Wide_String : constant Bounded_Wide_Wide_String;
 
index 201ed713d8255b5be0eda644d5a44effc2e32d62..c0ad1643122dba385002b8f71b8f1c703270c5b7 100644 (file)
@@ -42,8 +42,8 @@ package Ada.Strings.Wide_Wide_Maps is
    -- Wide_Wide_Character Set Declarations --
    ------------------------------------------
 
-   type Wide_Wide_Character_Set is private;
-   pragma Preelaborable_Initialization (Wide_Wide_Character_Set);
+   type Wide_Wide_Character_Set is private
+   with Preelaborable_Initialization;
    --  Representation for a set of Wide_Wide_Character values:
 
    Null_Set : constant Wide_Wide_Character_Set;
@@ -120,8 +120,8 @@ package Ada.Strings.Wide_Wide_Maps is
    -- Wide_Wide_Character Mapping Declarations --
    ----------------------------------------------
 
-   type Wide_Wide_Character_Mapping is private;
-   pragma Preelaborable_Initialization (Wide_Wide_Character_Mapping);
+   type Wide_Wide_Character_Mapping is private
+   with Preelaborable_Initialization;
    --  Representation for a wide character to wide character mapping:
 
    function Value
index 8cecbcde1fbae32a4ba78e03f7bbf5c4db030503..34e41e15a9610439a39a7297f039bea3aad59201 100644 (file)
@@ -39,8 +39,8 @@ with Ada.Finalization;
 package Ada.Strings.Wide_Wide_Unbounded is
    pragma Preelaborate;
 
-   type Unbounded_Wide_Wide_String is private;
-   pragma Preelaborable_Initialization (Unbounded_Wide_Wide_String);
+   type Unbounded_Wide_Wide_String is private
+   with Preelaborable_Initialization;
 
    Null_Unbounded_Wide_Wide_String : constant Unbounded_Wide_Wide_String;
 
index 1d57510baf86a3b817f24734b362e25faf4c2912..f56043b47a329372966c4d6dbdffc7c306fc530a 100644 (file)
@@ -48,8 +48,8 @@ private with System.Atomic_Counters;
 package Ada.Strings.Wide_Wide_Unbounded is
    pragma Preelaborate;
 
-   type Unbounded_Wide_Wide_String is private;
-   pragma Preelaborable_Initialization (Unbounded_Wide_Wide_String);
+   type Unbounded_Wide_Wide_String is private
+   with Preelaborable_Initialization;
 
    Null_Unbounded_Wide_Wide_String : constant Unbounded_Wide_Wide_String;
 
index aec3a268c3bbcafbff9c4371d54a332d8867eb27..fecd2ba6077cab4b4a4355b00774ca29971c9d41 100644 (file)
@@ -71,8 +71,8 @@ package Ada.Tags is
    pragma Preelaborate;
    --  In accordance with Ada 2005 AI-362
 
-   type Tag is private;
-   pragma Preelaborable_Initialization (Tag);
+   type Tag is private
+   with Preelaborable_Initialization;
 
    No_Tag : constant Tag;
 
index 5939fe041a47eab54f5838c180bbbcf5cac1d0cc..4396690eed94435ad5f393d822333260d639a29b 100644 (file)
@@ -62,8 +62,9 @@ is
    --  coming from who knows where, it seems a good idea to turn off any
    --  strict aliasing assumptions for this type.
 
-   type chars_ptr is private;
-   pragma Preelaborable_Initialization (chars_ptr);
+   type chars_ptr is private
+   with
+     Preelaborable_Initialization;
 
    type chars_ptr_array is array (size_t range <>) of aliased chars_ptr;
 
index e5153dc00b1d04e56a5ecb6a4678719e2248c1db..015bd3ed0bd44230098abcfee6fe8bc61705d425 100644 (file)
@@ -40,8 +40,9 @@ package System.Storage_Pools
   with Pure
 is
    type Root_Storage_Pool is abstract
-     new Ada.Finalization.Limited_Controlled with private;
-   pragma Preelaborable_Initialization (Root_Storage_Pool);
+     new Ada.Finalization.Limited_Controlled with private
+   with
+     Preelaborable_Initialization;
 
    procedure Allocate
      (Pool                     : in out Root_Storage_Pool;
index fda350126d84b51c60af22bd78a73ea57e2f6baf..97aba7658580963081f231ffd5cd24985c86b1a7 100644 (file)
@@ -41,15 +41,17 @@ package System.Storage_Pools.Subpools is
    pragma Preelaborate;
 
    type Root_Storage_Pool_With_Subpools is abstract
-     new Root_Storage_Pool with private;
-   pragma Preelaborable_Initialization (Root_Storage_Pool_With_Subpools);
+     new Root_Storage_Pool with private
+   with
+     Preelaborable_Initialization;
    --  The base for all implementations of Storage_Pool_With_Subpools. This
    --  type is Limited_Controlled by derivation. To use subpools, an access
    --  type must be associated with an implementation descending from type
    --  Root_Storage_Pool_With_Subpools.
 
-   type Root_Subpool is abstract tagged limited private;
-   pragma Preelaborable_Initialization (Root_Subpool);
+   type Root_Subpool is abstract tagged limited private
+   with
+     Preelaborable_Initialization;
    --  The base for all implementations of Subpool. Objects of this type are
    --  managed by the pool_with_subpools.
 
index 5129fbda8d8cd81f365a9e13c71d21b314910799..b8e9adb07fb778321b62f4da34e3415437d1e493 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index f4a14279a51e34fd7e934a41025e52106427ccc0..a5e6a425758d298bdca05ceaed4c0961a038240c 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 9c2393b8d3a891da88b1949ea5f51da07ba4e0df..f1421c4e86f2a5f43b33da7d3681772a4c6f31e0 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index c6bcffc7b5a8c68ca06052338dc25bc6a1a22890..9c142760dba181b60bed02743e2a36c1f67828b6 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 9241e0c96fa0c91cc2542f2e1797874e8f85aece..18ed31bbd4203f9302ba85730bfc91376bb32d73 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 0222746b2c63867ccd4f8425fc74e4015366e659..5496518df87cb85b4ed9b72d7913257fac164163 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 6b20133d4e9ed66816ea2ab6d63d710452c74194..3d3ad8a22382fde836e8b62e4cd8bc9720d0f319 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 5049ab88856ef7582165cad692767bfc54e277f1..ff6afc64701d112ddc030094a690420473123085 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 0279aba44becce8be6224973ed4c3a8997d51a71..f7dfa0ddbf6285a9f2669964dd9532778cfed9ca 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 02ba0dcf46efa0b2e107b83ab7108def0751b9c0..d33fa2faab85f343c505779c893c3c1d6431e3e6 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 8bd0567b27c7a83303a8bf1b9a3b3b7adf88809b..3b5f1c741d7de1597a6ddf7659ae5e6d51cb340e 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 68d3bdebcb0005edf03191805c861026cd6722dd..c8fadfbef8eb39ebc8ea770da8ed023977b12489 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 49bf98544a42ccfa9ff698b53c7f102097dcc62d..edabc481f4182277b6ef623736ec0fda32c7e046 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 5fccde5d521aff7fcf66375b29e3aef1126060e1..eba85790784fdad2ecd3d528820d2f51ed86386e 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 683b7a4415588e49ac01025cdf6770d9711318d7..32d58e90b5ef348a4259809acda3aca9f0a0054c 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index caa8359dea0fff7fbe42b4125a4ad804d1f0b97a..82c1d0741e7a4b08b64de6a2db745ed3f71c56bc 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 729ffdd4f9f3efb989bce9f94c9177f3ec18e920..abb76e370296c230ede384c3a887f5e6ec544141 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 5b0c2dcd39c3c78d9ff2569df4eab3ef8b04ab89..9f3c57efb309531c3957b2c0e795da6ae5de8c2e 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index b7aeb6bd7bef9897b9f952f709431679f0ae25d8..0b917cfbed16943a37b2d1b42113e294876d6734 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 6d3cbc394dd5b79845e0ed27bcae16be312e69ba..bbba48f90c6bff3256fc35660b6558597304fbb7 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index ccbbc7490b4c3be9dc03c7c3291706497cf300e6..85aade09dfa6b756ec8f7377b051f19de0c277b3 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 6f9f1a045064dc315c8a1df022701c939b00eac8..159e0c891d019dc980c18281f57ea4f59bc49b14 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 325783ceccc563cbaedf026838fefc6dd9faa927..75bcc0854c84a05d46a4eb6eb90039597d284a52 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index ae1762173c8a0e9cc443b514426fa1e9794a7b4a..061a17f1f65915eac55dd3e045d5fd3a08f0d7b3 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 8549120f75e472735cd34ae51988c29177deeaf9..13a310a71aa82cebd03d50a5bb5fca026c1cd703 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index a0633b3f4d62cb30c485447e2a25c637de1eded9..d0df352e4809f0dffdf1b26ad0b7ba98e5ba5bc6 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index a271612b88bbe4d9839f5f1fa46ca3e61a8a9f59..2513a1d1340a350cdaf69ccf231b06f63f8ccf8a 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 99e14febc5b02a9a0e054617646b4d32cea0198f..48b7beb84f2f759368417fa5abf7c1b7dae52c45 100644 (file)
@@ -68,8 +68,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := Standard'Storage_Unit;
index 9599bc009fd3ed0478c1757d79d380e619f481fd..0d8ae8750601c954d8c88e4e1f4329400e28c2aa 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 4b331c6f8164e0520f9d890c19b4bcf22135be06..c60939272b41d12e64bcba27797607a4dd4649ff 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index f95db4a41f881828c85d5081810fa39ba9d3afb1..2f9c0b48af87b1caa545f8715be292bad6d4f3e3 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 6890caeb9feadff548b21a06815c66b2522a845c..e266b4b6fa9e2b93b095be0f3f2cdc79abc0bf4e 100644 (file)
@@ -66,8 +66,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index a4607df5b248e58e856f7c8ef24aec56f6c60d7a..a205140bf11b8cd9bbf240b41d0cdd18eab0c92c 100644 (file)
@@ -66,8 +66,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index a2aabccf748cc67116ac84eaf80e72467f629e35..1a96736cec18ee231946e19af88a25521943b85c 100644 (file)
@@ -66,8 +66,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 7a94e40e02c7be554ea998eb3d936ed8f61ef139..12db85ff63a93ca632aeabbd0d4d40b041ae501f 100644 (file)
@@ -66,8 +66,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index b7581c25d6080d96e7299eb3f8dea1a334fa830a..9b5c9b5712e207d37d0956c517c8489a63f00f5a 100644 (file)
@@ -66,8 +66,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 875f4be421b83c8a8555d0e0b2eec782a05133f0..0b7b68c72f0b9e5f05a91391e620618b186edbdc 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 356c1c568220845825f75f492417aba587b97fe7..a89e71cc54e37e5e9fd433d5e6c75ac335773ac3 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 7a5cce0061ad3239932f6f862702e045272f0b80..862062f8e7c54dce11956e146f135387ac2e1cc3 100644 (file)
@@ -66,8 +66,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 6a12d2dac8fffa517da5dcac19c63c4bf96f2680..fb15358aedcc4ddbb32c4e96ed126d48f5737c75 100644 (file)
@@ -66,8 +66,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 7670c1b79232a91c8fcb70613a1b6c68f3f63db4..e289495b7203ffd8d44989f5986537edea28050c 100644 (file)
@@ -66,8 +66,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 9a11ed6b6a37d69b6dde211b2740462ef6657f7d..7a9baa920a2a4bdf7a7d68f9d2838ea8b555444f 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 771c2aed4e2cf2afcc34876a226ecbfacd469723..9d73cee9720ff3c7b31a28cb7875814134113d2e 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 6689f2dedf5496e80e365be255360b408c87e2d4..6567a26c8391a4f140d3c35c85cc0fd035d2c820 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index a34aba4974a20539f6241f7447267739da862cf7..3c82efd8e2135cceb63982035690a0dfc4829bde 100644 (file)
@@ -64,8 +64,8 @@ package System is
 
    --  Storage-related Declarations
 
-   type Address is private;
-   pragma Preelaborable_Initialization (Address);
+   type Address is private
+   with Preelaborable_Initialization;
    Null_Address : constant Address;
 
    Storage_Unit : constant := 8;
index 9496d538b68ae9874a2f33a1af74f92342509250..d284e61a013f719fca3b8c0df26c1be9e27db5f9 100644 (file)
@@ -307,7 +307,7 @@ package body Targparm is
 
          --  Test for type Address is private
 
-         elsif Looking_At_Skip ("   type Address is private;") then
+         elsif Looking_At_Skip ("   type Address is private") then
             Opt.Address_Is_Private := True;
             goto Line_Loop_Continue;