Commit 5ee96c9d by Thomas Quinot Committed by Arnaud Charlet

sem_elab.adb, [...]: Minor reformatting.

2013-01-04  Thomas Quinot  <quinot@adacore.com>

	* sem_elab.adb, sem_ch3.adb: Minor reformatting.

From-SVN: r194891
parent 7a1f1775
2013-01-04 Thomas Quinot <quinot@adacore.com>
* sem_elab.adb, sem_ch3.adb: Minor reformatting.
2013-01-04 Robert Dewar <dewar@adacore.com> 2013-01-04 Robert Dewar <dewar@adacore.com>
* table.adb: Minor reformatting. * table.adb: Minor reformatting.
......
...@@ -1406,8 +1406,7 @@ package body Sem_Ch3 is ...@@ -1406,8 +1406,7 @@ package body Sem_Ch3 is
Offset : Entity_Id; Offset : Entity_Id;
begin begin
pragma Assert (Is_Tagged_Type (Iface) pragma Assert (Is_Tagged_Type (Iface) and then Is_Interface (Iface));
and then Is_Interface (Iface));
-- This is a reasonable place to propagate predicates -- This is a reasonable place to propagate predicates
...@@ -1455,9 +1454,7 @@ package body Sem_Ch3 is ...@@ -1455,9 +1454,7 @@ package body Sem_Ch3 is
-- For this purpose we add a supplementary component just after the -- For this purpose we add a supplementary component just after the
-- field that contains the tag associated with each secondary DT. -- field that contains the tag associated with each secondary DT.
if Typ /= Etype (Typ) if Typ /= Etype (Typ) and then Has_Discriminants (Etype (Typ)) then
and then Has_Discriminants (Etype (Typ))
then
Def := Def :=
Make_Component_Definition (Loc, Make_Component_Definition (Loc,
Subtype_Indication => Subtype_Indication =>
...@@ -1789,18 +1786,14 @@ package body Sem_Ch3 is ...@@ -1789,18 +1786,14 @@ package body Sem_Ch3 is
-- so is the current type -- so is the current type
elsif Is_Limited_Record (R) elsif Is_Limited_Record (R)
and then and then (not Is_Interface (R) or else not Is_Limited_Interface (R))
(not Is_Interface (R)
or else not Is_Limited_Interface (R))
then then
return True; return True;
-- Else the type may have a limited interface progenitor, but a -- Else the type may have a limited interface progenitor, but a
-- limited record parent. -- limited record parent.
elsif R /= P elsif R /= P and then Is_Limited_Record (P) then
and then Is_Limited_Record (P)
then
return True; return True;
else else
...@@ -1969,9 +1962,7 @@ package body Sem_Ch3 is ...@@ -1969,9 +1962,7 @@ package body Sem_Ch3 is
-- Ada 2005 (AI-231): Propagate the null-excluding attribute and carry -- Ada 2005 (AI-231): Propagate the null-excluding attribute and carry
-- out some static checks. -- out some static checks.
if Ada_Version >= Ada_2005 if Ada_Version >= Ada_2005 and then Can_Never_Be_Null (T) then
and then Can_Never_Be_Null (T)
then
Null_Exclusion_Static_Checks (N); Null_Exclusion_Static_Checks (N);
end if; end if;
...@@ -2721,8 +2712,7 @@ package body Sem_Ch3 is ...@@ -2721,8 +2712,7 @@ package body Sem_Ch3 is
Get_First_Interp (E, Index, It); Get_First_Interp (E, Index, It);
while Present (It.Typ) loop while Present (It.Typ) loop
if (Is_Integer_Type (It.Typ) if (Is_Integer_Type (It.Typ) or else Is_Real_Type (It.Typ))
or else Is_Real_Type (It.Typ))
and then (Scope (Base_Type (It.Typ))) = Standard_Standard and then (Scope (Base_Type (It.Typ))) = Standard_Standard
then then
if T = Any_Type then if T = Any_Type then
...@@ -3012,9 +3002,8 @@ package body Sem_Ch3 is ...@@ -3012,9 +3002,8 @@ package body Sem_Ch3 is
-- A deferred constant can appear in a package body if its completion -- A deferred constant can appear in a package body if its completion
-- is by means of an interface pragma. -- is by means of an interface pragma.
if Constant_Present (N) if Constant_Present (N) and then No (E) then
and then No (E)
then
-- A deferred constant may appear in the declarative part of the -- A deferred constant may appear in the declarative part of the
-- following constructs: -- following constructs:
...@@ -3084,9 +3073,7 @@ package body Sem_Ch3 is ...@@ -3084,9 +3073,7 @@ package body Sem_Ch3 is
-- AI05-0303: the AI is in fact a binding interpretation, and thus -- AI05-0303: the AI is in fact a binding interpretation, and thus
-- applies to the '95 version of the language as well. -- applies to the '95 version of the language as well.
if Has_Interrupt_Handler (T) if Has_Interrupt_Handler (T) and then Ada_Version < Ada_95 then
and then Ada_Version < Ada_95
then
Error_Msg_N Error_Msg_N
("interrupt object can only be declared at library level", Id); ("interrupt object can only be declared at library level", Id);
end if; end if;
......
...@@ -2543,7 +2543,7 @@ package body Sem_Elab is ...@@ -2543,7 +2543,7 @@ package body Sem_Elab is
Elab_Unit : Entity_Id; Elab_Unit : Entity_Id;
-- Check whether this is a call to an Initialize subprogram for a -- Check whether this is a call to an Initialize subprogram for a
-- controlled type. Note that Call can also be a 'access attribute -- controlled type. Note that Call can also be a 'Access attribute
-- reference, which now generates an elaboration check. -- reference, which now generates an elaboration check.
Init_Call : constant Boolean := Init_Call : constant Boolean :=
......
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