[multiple changes]

2011-08-29  Yannick Moy  <moy@adacore.com>

	* sem_ch3.adb (Array_Type_Declaration): Insert a subtype declaration
	for every index type and component type that is not a subtype_mark.
	(Process_Subtype): Set Etype of subtype.

2011-08-29  Robert Dewar  <dewar@adacore.com>

	* a-cbmutr.adb, a-cimutr.adb, a-comutr.adb, prj-nmsc.adb: Minor code
	reorganization.  Minor reformatting.

From-SVN: r178159
This commit is contained in:
Arnaud Charlet 2011-08-29 10:30:02 +02:00
parent 7cc83cd8a5
commit cf161d6620
6 changed files with 1089 additions and 1031 deletions

View File

@ -1,3 +1,14 @@
2011-08-29 Yannick Moy <moy@adacore.com>
* sem_ch3.adb (Array_Type_Declaration): Insert a subtype declaration
for every index type and component type that is not a subtype_mark.
(Process_Subtype): Set Etype of subtype.
2011-08-29 Robert Dewar <dewar@adacore.com>
* a-cbmutr.adb, a-cimutr.adb, a-comutr.adb, prj-nmsc.adb: Minor code
reorganization. Minor reformatting.
2011-08-29 Steve Baird <baird@adacore.com> 2011-08-29 Steve Baird <baird@adacore.com>
* exp_ch4.adb (Expand_N_Op_Expon): Suppress N_Op_Expon node expansion * exp_ch4.adb (Expand_N_Op_Expon): Suppress N_Op_Expon node expansion

View File

@ -435,14 +435,14 @@ package body Ada.Containers.Bounded_Multiway_Trees is
begin begin
if Parent = No_Element then if Parent = No_Element then
return 0; return 0;
end if;
if Parent.Container.Count = 0 then elsif Parent.Container.Count = 0 then
pragma Assert (Is_Root (Parent)); pragma Assert (Is_Root (Parent));
return 0; return 0;
end if;
return Child_Count (Parent.Container.all, Parent.Node); else
return Child_Count (Parent.Container.all, Parent.Node);
end if;
end Child_Count; end Child_Count;
function Child_Count function Child_Count

View File

@ -303,9 +303,9 @@ package body Ada.Containers.Indefinite_Multiway_Trees is
begin begin
if Parent = No_Element then if Parent = No_Element then
return 0; return 0;
else
return Child_Count (Parent.Node.Children);
end if; end if;
return Child_Count (Parent.Node.Children);
end Child_Count; end Child_Count;
function Child_Count (Children : Children_Type) return Count_Type is function Child_Count (Children : Children_Type) return Count_Type is

View File

@ -299,9 +299,9 @@ package body Ada.Containers.Multiway_Trees is
begin begin
if Parent = No_Element then if Parent = No_Element then
return 0; return 0;
else
return Child_Count (Parent.Node.Children);
end if; end if;
return Child_Count (Parent.Node.Children);
end Child_Count; end Child_Count;
function Child_Count (Children : Children_Type) return Count_Type is function Child_Count (Children : Children_Type) return Count_Type is

File diff suppressed because it is too large Load Diff

View File

@ -4741,6 +4741,47 @@ package body Sem_Ch3 is
Make_Index (Index, P, Related_Id, Nb_Index); Make_Index (Index, P, Related_Id, Nb_Index);
-- In formal verification mode, create an explicit subtype for every
-- index if not already a subtype_mark, and replace the existing type
-- of index by this new type. Why are we doing this ???
if ALFA_Mode
and then not Nkind_In (Index, N_Identifier, N_Expanded_Name)
then
declare
Loc : constant Source_Ptr := Sloc (Def);
New_E : Entity_Id;
Decl : Entity_Id;
Sub_Ind : Node_Id;
begin
New_E :=
New_External_Entity
(E_Void, Current_Scope, Sloc (P), Related_Id, 'D',
Nb_Index, 'T');
if Nkind (Index) = N_Subtype_Indication then
Sub_Ind := Relocate_Node (Index);
else
Sub_Ind :=
Make_Subtype_Indication (Loc,
Subtype_Mark =>
New_Occurrence_Of (Base_Type (Etype (Index)), Loc),
Constraint =>
Make_Range_Constraint (Loc,
Range_Expression => Relocate_Node (Index)));
end if;
Decl :=
Make_Subtype_Declaration (Loc,
Defining_Identifier => New_E,
Subtype_Indication => Sub_Ind);
Insert_Action (Parent (Def), Decl);
Set_Etype (Index, New_E);
end;
end if;
-- Check error of subtype with predicate for index type -- Check error of subtype with predicate for index type
Bad_Predicated_Subtype_Use Bad_Predicated_Subtype_Use
@ -4756,7 +4797,36 @@ package body Sem_Ch3 is
-- Process subtype indication if one is present -- Process subtype indication if one is present
if Present (Component_Typ) then if Present (Component_Typ) then
Element_Type := Process_Subtype (Component_Typ, P, Related_Id, 'C');
-- In formal verification mode, create an explicit subtype for the
-- component type if not already a subtype_mark. Why do this ???
if ALFA_Mode
and then Nkind (Component_Typ) = N_Subtype_Indication
then
declare
Loc : constant Source_Ptr := Sloc (Def);
Decl : Entity_Id;
begin
Element_Type :=
New_External_Entity
(E_Void, Current_Scope, Sloc (P), Related_Id, 'C', 0, 'T');
Decl :=
Make_Subtype_Declaration (Loc,
Defining_Identifier => Element_Type,
Subtype_Indication => Relocate_Node (Component_Typ));
Insert_Action (Parent (Def), Decl);
end;
else
Element_Type :=
Process_Subtype (Component_Typ, P, Related_Id, 'C');
end if;
Set_Etype (Component_Typ, Element_Type);
if not Nkind_In (Component_Typ, N_Identifier, N_Expanded_Name) then if not Nkind_In (Component_Typ, N_Identifier, N_Expanded_Name) then
Check_SPARK_Restriction ("subtype mark required", Component_Typ); Check_SPARK_Restriction ("subtype mark required", Component_Typ);