a-envvar.adb, [...]: Minor reformatting.
2013-04-23 Robert Dewar <dewar@adacore.com> * a-envvar.adb, a-envvar.ads, exp_util.adb, sem_ch12.adb: Minor reformatting. From-SVN: r198180
This commit is contained in:
parent
9a7049fd64
commit
872c2f3768
|
@ -1,3 +1,8 @@
|
||||||
|
2013-04-23 Robert Dewar <dewar@adacore.com>
|
||||||
|
|
||||||
|
* a-envvar.adb, a-envvar.ads, exp_util.adb, sem_ch12.adb: Minor
|
||||||
|
reformatting.
|
||||||
|
|
||||||
2013-04-23 Ed Schonberg <schonberg@adacore.com>
|
2013-04-23 Ed Schonberg <schonberg@adacore.com>
|
||||||
|
|
||||||
* sem_ch3.adb (Analyze_Object_Declarations): Undo previous patch.
|
* sem_ch3.adb (Analyze_Object_Declarations): Undo previous patch.
|
||||||
|
|
|
@ -225,11 +225,7 @@ package body Ada.Environment_Variables is
|
||||||
|
|
||||||
function Value (Name : String; Default : String) return String is
|
function Value (Name : String; Default : String) return String is
|
||||||
begin
|
begin
|
||||||
if Exists (Name) then
|
return (if Exists (Name) then Value (Name) else Default);
|
||||||
return Value (Name);
|
|
||||||
|
|
||||||
else
|
|
||||||
return Default;
|
|
||||||
end if;
|
|
||||||
end Value;
|
end Value;
|
||||||
|
|
||||||
end Ada.Environment_Variables;
|
end Ada.Environment_Variables;
|
||||||
|
|
|
@ -13,6 +13,9 @@
|
||||||
-- --
|
-- --
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-- The implementation of this package is as defined in the Ada 2012 RM, but
|
||||||
|
-- it is available in Ada 95 and Ada 2005 modes as well.
|
||||||
|
|
||||||
package Ada.Environment_Variables is
|
package Ada.Environment_Variables is
|
||||||
pragma Preelaborate (Environment_Variables);
|
pragma Preelaborate (Environment_Variables);
|
||||||
|
|
||||||
|
@ -38,9 +41,11 @@ package Ada.Environment_Variables is
|
||||||
-- then Set first clears any existing environment variable with the given
|
-- then Set first clears any existing environment variable with the given
|
||||||
-- name, and then defines a single new environment variable with the given
|
-- name, and then defines a single new environment variable with the given
|
||||||
-- name and value. Otherwise Program_Error is propagated.
|
-- name and value. Otherwise Program_Error is propagated.
|
||||||
|
--
|
||||||
-- If implementation-defined circumstances prohibit the definition of an
|
-- If implementation-defined circumstances prohibit the definition of an
|
||||||
-- environment variable with the given name and value, then
|
-- environment variable with the given name and value, then exception
|
||||||
-- Constraint_Error is propagated.
|
-- Constraint_Error is propagated.
|
||||||
|
--
|
||||||
-- It is implementation defined whether there exist values for which the
|
-- It is implementation defined whether there exist values for which the
|
||||||
-- call Set (Name, Value) has the same effect as Clear (Name).
|
-- call Set (Name, Value) has the same effect as Clear (Name).
|
||||||
|
|
||||||
|
|
|
@ -2041,10 +2041,9 @@ package body Exp_Util is
|
||||||
Literal_Typ => Exp_Typ)))));
|
Literal_Typ => Exp_Typ)))));
|
||||||
|
|
||||||
-- If the type of the expression is an internally generated type it
|
-- If the type of the expression is an internally generated type it
|
||||||
-- may not be necessary to create a new subtype. However there are
|
-- may not be necessary to create a new subtype. However there are two
|
||||||
-- two exceptions : references to the current instances, and aliased
|
-- exceptions: references to the current instances, and aliased array
|
||||||
-- array object declarations, for which the back-end needs to create
|
-- object declarations for which the backend needs to create a template.
|
||||||
-- a template.
|
|
||||||
|
|
||||||
elsif Is_Constrained (Exp_Typ)
|
elsif Is_Constrained (Exp_Typ)
|
||||||
and then not Is_Class_Wide_Type (Unc_Type)
|
and then not Is_Class_Wide_Type (Unc_Type)
|
||||||
|
@ -2233,8 +2232,7 @@ package body Exp_Util is
|
||||||
return First_Elmt (Access_Disp_Table (Typ));
|
return First_Elmt (Access_Disp_Table (Typ));
|
||||||
|
|
||||||
else
|
else
|
||||||
ADT :=
|
ADT := Next_Elmt (Next_Elmt (First_Elmt (Access_Disp_Table (Typ))));
|
||||||
Next_Elmt (Next_Elmt (First_Elmt (Access_Disp_Table (Typ))));
|
|
||||||
while Present (ADT)
|
while Present (ADT)
|
||||||
and then Present (Related_Type (Node (ADT)))
|
and then Present (Related_Type (Node (ADT)))
|
||||||
and then Related_Type (Node (ADT)) /= Iface
|
and then Related_Type (Node (ADT)) /= Iface
|
||||||
|
|
|
@ -3247,6 +3247,7 @@ package body Sem_Ch12 is
|
||||||
if Get_Aspect_Id (Aspect) /= Aspect_Warnings then
|
if Get_Aspect_Id (Aspect) /= Aspect_Warnings then
|
||||||
Analyze (Expression (Aspect));
|
Analyze (Expression (Aspect));
|
||||||
end if;
|
end if;
|
||||||
|
|
||||||
Next (Aspect);
|
Next (Aspect);
|
||||||
end loop;
|
end loop;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue