Skip to content

R
riscv-gcc-1
Commit a31945d7 by Arnaud Charlet
Options

[multiple changes] 

2011-11-04  Matthew Heaney  <heaney@adacore.com>

	* a-cdlili.ad[sb], a-cidlli.ad[sb], a-coorse.ad[sb], a-ciorse.ad[sb],
	a-coorma.ad[sb], a-ciorma.ad[sb], a-coormu.ad[sb], a-ciormu.ad[sb],
	a-cohama.ad[sb], a-cihama.ad[sb], a-cohase.ad[sb], a-cihase.ad[sb],
	a-convec.ad[sb], a-coinve.ad[sb] (Assign, Copy): New operations
	added to package.

2011-11-04  Robert Dewar  <dewar@adacore.com>

	* sem_ch12.adb: Minor reformatting

2011-11-04  Gary Dismukes  <dismukes@adacore.com>

	* bindgen.adb (Gen_Elab_Calls): In the case of the AAMP target,
	initialize elaboration entities to zero when specs are processed.

From-SVN: r180930
parent 1ba878a9
Showing with 672 additions and 16 deletions
gcc/ada/ChangeLog
2011-11-04 Matthew Heaney <heaney@adacore.com>
* a-cdlili.ad[sb], a-cidlli.ad[sb], a-coorse.ad[sb], a-ciorse.ad[sb],
a-coorma.ad[sb], a-ciorma.ad[sb], a-coormu.ad[sb], a-ciormu.ad[sb],
a-cohama.ad[sb], a-cihama.ad[sb], a-cohase.ad[sb], a-cihase.ad[sb],
a-convec.ad[sb], a-coinve.ad[sb] (Assign, Copy): New operations
added to package.
2011-11-04 Robert Dewar <dewar@adacore.com>
* sem_ch12.adb: Minor reformatting
2011-11-04 Gary Dismukes <dismukes@adacore.com>
* bindgen.adb (Gen_Elab_Calls): In the case of the AAMP target,
initialize elaboration entities to zero when specs are processed.
2011-10-28 Iain Sandoe <iains@gcc.gnu.org>
Eric Botcazou <ebotcazou@adacore.com>
......
gcc/ada/a-cdlili.adb
......@@ -146,6 +146,27 @@ package body Ada.Containers.Doubly_Linked_Lists is
Insert (Container, No_Element, New_Item, Count);
end Append;
------------
-- Assign --
------------
procedure Assign (Target : in out List; Source : List) is
Node : Node_Access;
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Node := Source.First;
while Node /= null loop
Target.Append (Node.Element);
Node := Node.Next;
end loop;
end Assign;
-----------
-- Clear --
-----------
......@@ -206,6 +227,17 @@ package body Ada.Containers.Doubly_Linked_Lists is
return Find (Container, Item) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy (Source : List) return List is
begin
return Target : List do
Target.Assign (Source);
end return;
end Copy;
------------
-- Delete --
------------
......
gcc/ada/a-cdlili.ads
......@@ -90,6 +90,10 @@ package Ada.Containers.Doubly_Linked_Lists is
Position : Cursor;
Process : not null access procedure (Element : in out Element_Type));
procedure Assign (Target : in out List; Source : List);
function Copy (Source : List) return List;
procedure Move
(Target : in out List;
Source : in out List);
......
gcc/ada/a-cidlli.adb
......@@ -171,6 +171,27 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is
Insert (Container, No_Element, New_Item, Count);
end Append;
------------
-- Assign --
------------
procedure Assign (Target : in out List; Source : List) is
Node : Node_Access;
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Node := Source.First;
while Node /= null loop
Target.Append (Node.Element.all);
Node := Node.Next;
end loop;
end Assign;
-----------
-- Clear --
-----------
......@@ -230,6 +251,17 @@ package body Ada.Containers.Indefinite_Doubly_Linked_Lists is
return Find (Container, Item) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy (Source : List) return List is
begin
return Target : List do
Target.Assign (Source);
end return;
end Copy;
------------
-- Delete --
------------
......
gcc/ada/a-cidlli.ads
......@@ -90,6 +90,10 @@ package Ada.Containers.Indefinite_Doubly_Linked_Lists is
Position : Cursor;
Process : not null access procedure (Element : in out Element_Type));
procedure Assign (Target : in out List; Source : List);
function Copy (Source : List) return List;
procedure Move
(Target : in out List;
Source : in out List);
......
gcc/ada/a-cihama.adb
......@@ -35,6 +35,8 @@ pragma Elaborate_All (Ada.Containers.Hash_Tables.Generic_Keys);
with Ada.Unchecked_Deallocation;
with System; use type System.Address;
package body Ada.Containers.Indefinite_Hashed_Maps is
procedure Free_Key is
......@@ -132,6 +134,41 @@ package body Ada.Containers.Indefinite_Hashed_Maps is
HT_Ops.Adjust (Container.HT);
end Adjust;
------------
-- Assign --
------------
procedure Assign (Target : in out Map; Source : Map) is
procedure Insert_Item (Node : Node_Access);
pragma Inline (Insert_Item);
procedure Insert_Items is new HT_Ops.Generic_Iteration (Insert_Item);
-----------------
-- Insert_Item --
-----------------
procedure Insert_Item (Node : Node_Access) is
begin
Target.Insert (Key => Node.Key.all, New_Item => Node.Element.all);
end Insert_Item;
-- Start of processing for Assign
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
if Target.Capacity < Source.Length then
Target.Reserve_Capacity (Source.Length);
end if;
Insert_Items (Target.HT);
end Assign;
--------------
-- Capacity --
--------------
......@@ -159,6 +196,34 @@ package body Ada.Containers.Indefinite_Hashed_Maps is
return Find (Container, Key) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy
(Source : Map;
Capacity : Count_Type := 0) return Map
is
C : Count_Type;
begin
if Capacity = 0 then
C := Source.Length;
elsif Capacity >= Source.Length then
C := Capacity;
else
raise Capacity_Error
with "Requested capacity is less than Source length";
end if;
return Target : Map do
Target.Reserve_Capacity (C);
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-cihama.ads
......@@ -134,6 +134,10 @@ package Ada.Containers.Indefinite_Hashed_Maps is
-- Calls Process with the key (with only a constant view) and element (with
-- a variable view) of the node designed by the cursor.
procedure Assign (Target : in out Map; Source : Map);
function Copy (Source : Map; Capacity : Count_Type := 0) return Map;
procedure Move (Target : in out Map; Source : in out Map);
-- Clears Target (if it's not empty), and then moves (not copies) the
-- buckets array and nodes from Source to Target.
......
gcc/ada/a-cihase.adb
......@@ -173,6 +173,16 @@ package body Ada.Containers.Indefinite_Hashed_Sets is
Free_Element (X);
end Assign;
procedure Assign (Target : in out Set; Source : Set) is
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Target.Union (Source);
end Assign;
--------------
-- Capacity --
--------------
......@@ -200,6 +210,34 @@ package body Ada.Containers.Indefinite_Hashed_Sets is
return Find (Container, Item) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy
(Source : Set;
Capacity : Count_Type := 0) return Set
is
C : Count_Type;
begin
if Capacity = 0 then
C := Source.Length;
elsif Capacity >= Source.Length then
C := Capacity;
else
raise Capacity_Error
with "Requested capacity is less than Source length";
end if;
return Target : Set do
Target.Reserve_Capacity (C);
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-cihase.ads
......@@ -153,6 +153,10 @@ package Ada.Containers.Indefinite_Hashed_Sets is
Position : Cursor)
return Constant_Reference_Type;
procedure Assign (Target : in out Set; Source : Set);
function Copy (Source : Set; Capacity : Count_Type := 0) return Set;
procedure Move (Target : in out Set; Source : in out Set);
-- Clears Target (if it's not empty), and then moves (not copies) the
-- buckets array and nodes from Source to Target.
......
gcc/ada/a-ciorma.adb
......@@ -35,6 +35,8 @@ pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Operations);
with Ada.Containers.Red_Black_Trees.Generic_Keys;
pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Keys);
with System; use type System.Address;
package body Ada.Containers.Indefinite_Ordered_Maps is
pragma Suppress (All_Checks);
......@@ -287,6 +289,37 @@ package body Ada.Containers.Indefinite_Ordered_Maps is
Adjust (Container.Tree);
end Adjust;
------------
-- Assign --
------------
procedure Assign (Target : in out Map; Source : Map) is
procedure Insert_Item (Node : Node_Access);
pragma Inline (Insert_Item);
procedure Insert_Items is
new Tree_Operations.Generic_Iteration (Insert_Item);
-----------------
-- Insert_Item --
-----------------
procedure Insert_Item (Node : Node_Access) is
begin
Target.Insert (Key => Node.Key.all, New_Item => Node.Element.all);
end Insert_Item;
-- Start of processing for Assign
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Insert_Items (Target.Tree);
end Assign;
-------------
-- Ceiling --
-------------
......@@ -340,6 +373,17 @@ package body Ada.Containers.Indefinite_Ordered_Maps is
return Find (Container, Key) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy (Source : Map) return Map is
begin
return Target : Map do
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-ciorma.ads
......@@ -96,6 +96,10 @@ package Ada.Containers.Indefinite_Ordered_Maps is
Process : not null access procedure (Key : Key_Type;
Element : in out Element_Type));
procedure Assign (Target : in out Map; Source : Map);
function Copy (Source : Map) return Map;
procedure Move (Target : in out Map; Source : in out Map);
procedure Insert
......
gcc/ada/a-ciormu.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2004-2010, Free Software Foundation, Inc. --
-- Copyright (C) 2004-2011, 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- --
......@@ -38,6 +38,8 @@ pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Keys);
with Ada.Containers.Red_Black_Trees.Generic_Set_Operations;
pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Set_Operations);
with System; use type System.Address;
package body Ada.Containers.Indefinite_Ordered_Multisets is
-----------------------------
......@@ -298,6 +300,20 @@ package body Ada.Containers.Indefinite_Ordered_Multisets is
Adjust (Container.Tree);
end Adjust;
------------
-- Assign --
------------
procedure Assign (Target : in out Set; Source : Set) is
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Target.Union (Source);
end Assign;
-------------
-- Ceiling --
-------------
......@@ -344,6 +360,17 @@ package body Ada.Containers.Indefinite_Ordered_Multisets is
return Find (Container, Item) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy (Source : Set) return Set is
begin
return Target : Set do
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-ciormu.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 2004-2010, Free Software Foundation, Inc. --
-- Copyright (C) 2004-2011, 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- --
......@@ -118,6 +118,10 @@ package Ada.Containers.Indefinite_Ordered_Multisets is
-- change the value of the element while Process is executing (to "tamper
-- with elements") will raise Program_Error.
procedure Assign (Target : in out Set; Source : Set);
function Copy (Source : Set) return Set;
procedure Move (Target : in out Set; Source : in out Set);
-- If Target denotes the same object as Source, the operation does
-- nothing. If either Target or Source is busy (cursor tampering is
......
gcc/ada/a-ciorse.adb
......@@ -38,6 +38,8 @@ pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Set_Operations);
with Ada.Unchecked_Deallocation;
with System; use type System.Address;
package body Ada.Containers.Indefinite_Ordered_Sets is
type Iterator is new
......@@ -321,6 +323,20 @@ package body Ada.Containers.Indefinite_Ordered_Sets is
Adjust (Container.Tree);
end Adjust;
------------
-- Assign --
------------
procedure Assign (Target : in out Set; Source : Set) is
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Target.Union (Source);
end Assign;
-------------
-- Ceiling --
-------------
......@@ -363,6 +379,17 @@ package body Ada.Containers.Indefinite_Ordered_Sets is
return Find (Container, Item) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy (Source : Set) return Set is
begin
return Target : Set do
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-ciorse.ads
......@@ -111,6 +111,10 @@ package Ada.Containers.Indefinite_Ordered_Sets is
(Position : Cursor;
Process : not null access procedure (Element : Element_Type));
procedure Assign (Target : in out Set; Source : Set);
function Copy (Source : Set) return Set;
procedure Move (Target : in out Set; Source : in out Set);
procedure Insert
......
gcc/ada/a-cohama.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2004-2010, Free Software Foundation, Inc. --
-- Copyright (C) 2004-2011, 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- --
......@@ -35,6 +35,8 @@ pragma Elaborate_All (Ada.Containers.Hash_Tables.Generic_Operations);
with Ada.Containers.Hash_Tables.Generic_Keys;
pragma Elaborate_All (Ada.Containers.Hash_Tables.Generic_Keys);
with System; use type System.Address;
package body Ada.Containers.Hashed_Maps is
type Iterator is new
......@@ -131,6 +133,41 @@ package body Ada.Containers.Hashed_Maps is
HT_Ops.Adjust (Container.HT);
end Adjust;
------------
-- Assign --
------------
procedure Assign (Target : in out Map; Source : Map) is
procedure Insert_Item (Node : Node_Access);
pragma Inline (Insert_Item);
procedure Insert_Items is new HT_Ops.Generic_Iteration (Insert_Item);
-----------------
-- Insert_Item --
-----------------
procedure Insert_Item (Node : Node_Access) is
begin
Target.Insert (Key => Node.Key, New_Item => Node.Element);
end Insert_Item;
-- Start of processing for Assign
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
if Target.Capacity < Source.Length then
Target.Reserve_Capacity (Source.Length);
end if;
Insert_Items (Target.HT);
end Assign;
--------------
-- Capacity --
--------------
......@@ -158,6 +195,34 @@ package body Ada.Containers.Hashed_Maps is
return Find (Container, Key) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy
(Source : Map;
Capacity : Count_Type := 0) return Map
is
C : Count_Type;
begin
if Capacity = 0 then
C := Source.Length;
elsif Capacity >= Source.Length then
C := Capacity;
else
raise Capacity_Error
with "Requested capacity is less than Source length";
end if;
return Target : Map do
Target.Reserve_Capacity (C);
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-cohama.ads
......@@ -148,6 +148,10 @@ package Ada.Containers.Hashed_Maps is
-- Calls Process with the key (with only a constant view) and element (with
-- a variable view) of the node designed by the cursor.
procedure Assign (Target : in out Map; Source : Map);
function Copy (Source : Map; Capacity : Count_Type := 0) return Map;
procedure Move (Target : in out Map; Source : in out Map);
-- Clears Target (if it's not empty), and then moves (not copies) the
-- buckets array and nodes from Source to Target.
......
gcc/ada/a-cohase.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2004-2010, Free Software Foundation, Inc. --
-- Copyright (C) 2004-2011, 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,6 +159,16 @@ package body Ada.Containers.Hashed_Sets is
Node.Element := Item;
end Assign;
procedure Assign (Target : in out Set; Source : Set) is
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Target.Union (Source);
end Assign;
--------------
-- Capacity --
--------------
......@@ -186,6 +196,34 @@ package body Ada.Containers.Hashed_Sets is
return Find (Container, Item) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy
(Source : Set;
Capacity : Count_Type := 0) return Set
is
C : Count_Type;
begin
if Capacity = 0 then
C := Source.Length;
elsif Capacity >= Source.Length then
C := Capacity;
else
raise Capacity_Error
with "Requested capacity is less than Source length";
end if;
return Target : Set do
Target.Reserve_Capacity (C);
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-cohase.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 2004-2010, Free Software Foundation, Inc. --
-- Copyright (C) 2004-2011, 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 --
......@@ -133,6 +133,10 @@ package Ada.Containers.Hashed_Sets is
-- Calls Process with the element (having only a constant view) of the node
-- designed by the cursor.
procedure Assign (Target : in out Set; Source : Set);
function Copy (Source : Set; Capacity : Count_Type := 0) return Set;
procedure Move (Target : in out Set; Source : in out Set);
-- Clears Target (if it's not empty), and then moves (not copies) the
-- buckets array and nodes from Source to Target.
......
gcc/ada/a-coinve.adb
......@@ -616,6 +616,20 @@ package body Ada.Containers.Indefinite_Vectors is
Count);
end Append;
------------
-- Assign --
------------
procedure Assign (Target : in out Vector; Source : Vector) is
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Target.Append (Source);
end Assign;
--------------
-- Capacity --
--------------
......@@ -698,6 +712,34 @@ package body Ada.Containers.Indefinite_Vectors is
return Find_Index (Container, Item) /= No_Index;
end Contains;
----------
-- Copy --
----------
function Copy
(Source : Vector;
Capacity : Count_Type := 0) return Vector
is
C : Count_Type;
begin
if Capacity = 0 then
C := Source.Length;
elsif Capacity >= Source.Length then
C := Capacity;
else
raise Capacity_Error
with "Requested capacity is less than Source length";
end if;
return Target : Vector do
Target.Reserve_Capacity (C);
Target.Assign (Source);
end return;
end Copy;
------------
-- Delete --
------------
......
gcc/ada/a-coinve.ads
......@@ -204,6 +204,10 @@ package Ada.Containers.Indefinite_Vectors is
Position : Cursor;
Process : not null access procedure (Element : in out Element_Type));
procedure Assign (Target : in out Vector; Source : Vector);
function Copy (Source : Vector; Capacity : Count_Type := 0) return Vector;
procedure Move (Target : in out Vector; Source : in out Vector);
procedure Insert
......
gcc/ada/a-convec.adb
......@@ -432,6 +432,20 @@ package body Ada.Containers.Vectors is
Count);
end Append;
------------
-- Assign --
------------
procedure Assign (Target : in out Vector; Source : Vector) is
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Target.Append (Source);
end Assign;
--------------
-- Capacity --
--------------
......@@ -471,6 +485,34 @@ package body Ada.Containers.Vectors is
return Find_Index (Container, Item) /= No_Index;
end Contains;
----------
-- Copy --
----------
function Copy
(Source : Vector;
Capacity : Count_Type := 0) return Vector
is
C : Count_Type;
begin
if Capacity = 0 then
C := Source.Length;
elsif Capacity >= Source.Length then
C := Capacity;
else
raise Capacity_Error
with "Requested capacity is less than Source length";
end if;
return Target : Vector do
Target.Reserve_Capacity (C);
Target.Assign (Source);
end return;
end Copy;
------------
-- Delete --
------------
......
gcc/ada/a-convec.ads
......@@ -202,7 +202,12 @@ package Ada.Containers.Vectors is
function Reference (Container : Vector; Position : Index_Type)
return Reference_Type;
procedure Assign (Target : in out Vector; Source : Vector);
function Copy (Source : Vector; Capacity : Count_Type := 0) return Vector;
procedure Move (Target : in out Vector; Source : in out Vector);
procedure Insert
(Container : in out Vector;
Before : Extended_Index;
......
gcc/ada/a-coorma.adb
......@@ -35,6 +35,8 @@ pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Operations);
with Ada.Containers.Red_Black_Trees.Generic_Keys;
pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Keys);
with System; use type System.Address;
package body Ada.Containers.Ordered_Maps is
type Iterator is new
......@@ -248,6 +250,37 @@ package body Ada.Containers.Ordered_Maps is
Adjust (Container.Tree);
end Adjust;
------------
-- Assign --
------------
procedure Assign (Target : in out Map; Source : Map) is
procedure Insert_Item (Node : Node_Access);
pragma Inline (Insert_Item);
procedure Insert_Items is
new Tree_Operations.Generic_Iteration (Insert_Item);
-----------------
-- Insert_Item --
-----------------
procedure Insert_Item (Node : Node_Access) is
begin
Target.Insert (Key => Node.Key, New_Item => Node.Element);
end Insert_Item;
-- Start of processing for Assign
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Insert_Items (Target.Tree);
end Assign;
-------------
-- Ceiling --
-------------
......@@ -304,6 +337,17 @@ package body Ada.Containers.Ordered_Maps is
return Find (Container, Key) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy (Source : Map) return Map is
begin
return Target : Map do
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-coorma.ads
......@@ -96,6 +96,10 @@ package Ada.Containers.Ordered_Maps is
Process : not null access
procedure (Key : Key_Type; Element : in out Element_Type));
procedure Assign (Target : in out Map; Source : Map);
function Copy (Source : Map) return Map;
procedure Move (Target : in out Map; Source : in out Map);
procedure Insert
......
gcc/ada/a-coormu.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 2004-2010, Free Software Foundation, Inc. --
-- Copyright (C) 2004-2011, 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- --
......@@ -38,6 +38,8 @@ pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Keys);
with Ada.Containers.Red_Black_Trees.Generic_Set_Operations;
pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Set_Operations);
with System; use type System.Address;
package body Ada.Containers.Ordered_Multisets is
-----------------------------
......@@ -266,6 +268,20 @@ package body Ada.Containers.Ordered_Multisets is
Adjust (Container.Tree);
end Adjust;
------------
-- Assign --
------------
procedure Assign (Target : in out Set; Source : Set) is
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Target.Union (Source);
end Assign;
-------------
-- Ceiling --
-------------
......@@ -312,6 +328,17 @@ package body Ada.Containers.Ordered_Multisets is
return Find (Container, Item) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy (Source : Set) return Set is
begin
return Target : Set do
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-coormu.ads
......@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
-- Copyright (C) 2004-2010, Free Software Foundation, Inc. --
-- Copyright (C) 2004-2011, 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- --
......@@ -117,6 +117,10 @@ package Ada.Containers.Ordered_Multisets is
-- change the value of the element while Process is executing (to "tamper
-- with elements") will raise Program_Error.
procedure Assign (Target : in out Set; Source : Set);
function Copy (Source : Set) return Set;
procedure Move (Target : in out Set; Source : in out Set);
-- If Target denotes the same object as Source, the operation does
-- nothing. If either Target or Source is busy (cursor tampering is
......
gcc/ada/a-coorse.adb
......@@ -38,6 +38,8 @@ pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Keys);
with Ada.Containers.Red_Black_Trees.Generic_Set_Operations;
pragma Elaborate_All (Ada.Containers.Red_Black_Trees.Generic_Set_Operations);
with System; use type System.Address;
package body Ada.Containers.Ordered_Sets is
type Iterator is new
......@@ -281,6 +283,20 @@ package body Ada.Containers.Ordered_Sets is
Adjust (Container.Tree);
end Adjust;
------------
-- Assign --
------------
procedure Assign (Target : in out Set; Source : Set) is
begin
if Target'Address = Source'Address then
return;
end if;
Target.Clear;
Target.Union (Source);
end Assign;
-------------
-- Ceiling --
-------------
......@@ -325,6 +341,17 @@ package body Ada.Containers.Ordered_Sets is
return Find (Container, Item) /= No_Element;
end Contains;
----------
-- Copy --
----------
function Copy (Source : Set) return Set is
begin
return Target : Set do
Target.Assign (Source);
end return;
end Copy;
---------------
-- Copy_Node --
---------------
......
gcc/ada/a-coorse.ads
......@@ -113,6 +113,10 @@ package Ada.Containers.Ordered_Sets is
(Position : Cursor;
Process : not null access procedure (Element : Element_Type));
procedure Assign (Target : in out Set; Source : Set);
function Copy (Source : Set) return Set;
procedure Move (Target : in out Set; Source : in out Set);
procedure Insert
......
gcc/ada/bindgen.adb
......@@ -1050,9 +1050,8 @@ package body Bindgen is
or else U.Unit_Kind /= 's')
then
-- The only case in which we have to do something is if this
-- is a body, with a separate spec, where the separate spec
-- has an elaboration entity defined. In that case, this is
-- In the case of a body with a separate spec, where the
-- separate spec has an elaboration entity defined, this is
-- where we increment the elaboration entity.
if U.Utype = Is_Body
......@@ -1065,6 +1064,23 @@ package body Bindgen is
Set_Unit_Number (Unum_Spec);
Set_String (" + 1;");
Write_Statement_Buffer;
-- In the special case where the target is AAMP and the unit is
-- a spec with a body, the elaboration entity is initialized
-- here. This is done because it's the only way to accomplish
-- initialization of such entities, because there's not any
-- mechanism provided to initialize global variables at load
-- time on AAMP. (Also note that there is no notion of shared
-- libraries for AAMP, so no possibility of reelaboration.)
elsif AAMP_On_Target
and then U.Utype = Is_Spec
and then Units.Table (Unum_Spec).Set_Elab_Entity
then
Set_String (" E");
Set_Unit_Number (Unum_Spec);
Set_String (" := 0;");
Write_Statement_Buffer;
end if;
-- Here if elaboration code is present. If binding a library
......@@ -1087,6 +1103,24 @@ package body Bindgen is
-- variables, only calls to 'Elab* subprograms.
else
-- In the special case where the target is AAMP and the unit is
-- a spec with a body, the elaboration entity is initialized
-- here. This is done because it's the only way to accomplish
-- initialization of such entities, because there's not any
-- mechanism provided to initialize global variables at load
-- time on AAMP. (Also note that there is no notion of shared
-- libraries for AAMP, so no possibility of reelaboration.)
if AAMP_On_Target
and then U.Utype = Is_Spec
and then Units.Table (Unum_Spec).Set_Elab_Entity
then
Set_String (" E");
Set_Unit_Number (Unum_Spec);
Set_String (" := 0;");
Write_Statement_Buffer;
end if;
Check_Elab_Flag :=
not CodePeer_Mode
and then (Force_Checking_Of_Elaboration_Flags
......
gcc/ada/sem_ch12.adb
......@@ -7549,16 +7549,14 @@ package body Sem_Ch12 is
Scop := Scope (Scop);
end loop;
if Scop = Par_I then
-- Previous instance encloses current instance
-- Previous instance encloses current instance
if Scop = Par_I then
null;
elsif Is_Generic_Instance (Scop) then
-- Current instance is within an unrelated instance
-- Current instance is within an unrelated instance
elsif Is_Generic_Instance (Scop) then
null;
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment