Skip to content

R
riscv-gcc-1
Commit 22243c12 by Robert Dewar Committed by Arnaud Charlet
Options

einfo.ads, [...]: Minor reformatting. 

2012-01-30  Robert Dewar  <dewar@adacore.com>

	* einfo.ads, sem_prag.adb, sem_attr.adb, aspects.ads,
	sem_cat.adb, sem_aggr.adb, exp_aggr.adb: Minor reformatting.

From-SVN: r183699
parent 25081892
Showing with 49 additions and 38 deletions
gcc/ada/ChangeLog
2012-01-30 Robert Dewar <dewar@adacore.com>
* einfo.ads, sem_prag.adb, sem_attr.adb, aspects.ads,
sem_cat.adb, sem_aggr.adb, exp_aggr.adb: Minor reformatting.
2012-01-30 Robert Dewar <dewar@adacore.com>
* a-cdlili.adb, a-cidlli.adb, a-cbdlli.adb: Minor reformatting.
2012-01-30 Olivier Hainque <hainque@adacore.com>
......
gcc/ada/aspects.ads
......@@ -301,7 +301,6 @@ package Aspects is
-----------------------------------------
-- Table linking aspect names and id's
-- Shouldn't this be automatically generated in Snames???
Aspect_Names : constant array (Aspect_Id) of Name_Id := (
No_Aspect => No_Name,
......
gcc/ada/einfo.ads
......@@ -2272,7 +2272,7 @@ package Einfo is
-- Is_Generic_Type (Flag13)
-- Present in all entities. Set for types which are generic formal types.
-- Such types have an Ekind that corresponds to their classification, so
-- the Ekind cannot be used to identify generic types.
-- the Ekind cannot be used to identify generic formal types.
-- Is_Generic_Unit (synthesized)
-- Applies to all entities. Yields True for a generic unit (generic
......@@ -2721,8 +2721,8 @@ package Einfo is
-- Present in all entities. Set in E_Package and E_Generic_Package
-- entities to which a pragma Remote_Types is applied, and also on
-- entities declared in the visible part of the spec of such a package.
-- Also set for generic formal types to which pragma Remote_Access_Type
-- applies.
-- Also set for types which are generic formal types to which the
-- pragma Remote_Access_Type applies.
-- Is_Renaming_Of_Object (Flag112)
-- Present in all entities, set only for a variable or constant for
......
gcc/ada/exp_aggr.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2011, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2012, 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- --
......@@ -244,8 +244,8 @@ package body Exp_Aggr is
Target : Node_Id) return List_Id;
-- This routine implements top-down expansion of nested aggregates. In
-- doing so, it avoids the generation of temporaries at each level. N is a
-- nested (record or array) aggregate that has been marked with 'Delay_
-- Expansion'. Typ is the expected type of the aggregate. Target is a
-- nested (record or array) aggregate that has been marked with Expansion_
-- Delayed. Typ is the expected type of the aggregate. Target is a
-- (duplicable) expression that will hold the result of the aggregate
-- expansion.
......@@ -5297,7 +5297,7 @@ package body Exp_Aggr is
-- Ada 2005 (AI-318-2): We need to convert to assignments if components
-- are build-in-place function calls. The assignments will each turn
-- into a build-in-place function call. If components are all static,
-- into a build-in-place function call. If components are all static,
-- we can pass the aggregate to the backend regardless of limitedness.
-- Extension aggregates, aggregates in extended return statements, and
......@@ -5547,16 +5547,16 @@ package body Exp_Aggr is
if Is_Tagged_Type (Typ) then
-- The tagged case, _parent and _tag component must be created
-- In the tagged case, _parent and _tag component must be created
-- Reset null_present unconditionally. tagged records always have
-- at least one field (the tag or the parent)
-- Reset Null_Present unconditionally. Tagged records always have
-- at least one field (the tag or the parent).
Set_Null_Record_Present (N, False);
-- When the current aggregate comes from the expansion of an
-- extension aggregate, the parent expr is replaced by an
-- aggregate formed by selected components of this expr
-- aggregate formed by selected components of this expr.
if Present (Parent_Expr)
and then Is_Empty_List (Comps)
......@@ -5596,12 +5596,14 @@ package body Exp_Aggr is
-- Compute the value for the Tag now, if the type is a root it
-- will be included in the aggregate right away, otherwise it will
-- be propagated to the parent aggregate
-- be propagated to the parent aggregate.
if Present (Orig_Tag) then
Tag_Value := Orig_Tag;
elsif not Tagged_Type_Expansion then
Tag_Value := Empty;
else
Tag_Value :=
New_Occurrence_Of
......@@ -5657,8 +5659,8 @@ package body Exp_Aggr is
-- Expand recursively the parent propagating the right Tag
Expand_Record_Aggregate (
Parent_Aggr, Tag_Value, Parent_Expr);
Expand_Record_Aggregate
(Parent_Aggr, Tag_Value, Parent_Expr);
end;
-- For a root type, the tag component is added (unless compiling
......
gcc/ada/sem_aggr.adb
......@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
-- Copyright (C) 1992-2011, Free Software Foundation, Inc. --
-- Copyright (C) 1992-2012, 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- --
......@@ -3185,14 +3185,18 @@ package body Sem_Aggr is
-- dynamic-sized aggregate in the code, something that gigi cannot
-- handle.
Relocate : Boolean;
-- Set to True if the resolved Expr node needs to be relocated
-- when attached to the newly created association list. This node
-- need not be relocated if its parent pointer is not set.
-- In fact in this case Expr is the output of a New_Copy_Tree call.
-- if Relocate is True then we have analyzed the expression node
-- in the original aggregate and hence it needs to be relocated
-- when moved over the new association list.
Relocate : Boolean;
-- Set to True if the resolved Expr node needs to be relocated when
-- attached to the newly created association list. This node need not
-- be relocated if its parent pointer is not set. In fact in this
-- case Expr is the output of a New_Copy_Tree call. If Relocate is
-- True then we have analyzed the expression node in the original
-- aggregate and hence it needs to be relocated when moved over to
-- the new association list.
---------------------------
-- Has_Expansion_Delayed --
---------------------------
function Has_Expansion_Delayed (Expr : Node_Id) return Boolean is
Kind : constant Node_Kind := Nkind (Expr);
......@@ -3205,7 +3209,7 @@ package body Sem_Aggr is
and then Has_Expansion_Delayed (Expression (Expr)));
end Has_Expansion_Delayed;
-- Start of processing for Resolve_Aggr_Expr
-- Start of processing for Resolve_Aggr_Expr
begin
-- If the type of the component is elementary or the type of the
......@@ -3315,8 +3319,8 @@ package body Sem_Aggr is
Set_Raises_Constraint_Error (N);
end if;
-- If the expression has been marked as requiring a range check,
-- then generate it here.
-- If the expression has been marked as requiring a range check, then
-- generate it here.
if Do_Range_Check (Expr) then
Set_Do_Range_Check (Expr, False);
......@@ -3396,10 +3400,10 @@ package body Sem_Aggr is
-- If the type has no components, then the aggregate should either
-- have "null record", or in Ada 2005 it could instead have a single
-- component association given by "others => <>". For Ada 95 we flag
-- an error at this point, but for Ada 2005 we proceed with checking
-- the associations below, which will catch the case where it's not
-- an aggregate with "others => <>". Note that the legality of a <>
-- component association given by "others => <>". For Ada 95 we flag an
-- error at this point, but for Ada 2005 we proceed with checking the
-- associations below, which will catch the case where it's not an
-- aggregate with "others => <>". Note that the legality of a <>
-- aggregate for a null record type was established by AI05-016.
elsif No (First_Entity (Typ))
......
gcc/ada/sem_attr.adb
......@@ -4638,19 +4638,19 @@ package body Sem_Attr is
if Is_Remote_Access_To_Class_Wide_Type (Base_Type (P_Type)) then
if not Is_Generic_Type (P_Type) then
-- For a real RACW [sub]type, use corresponding stub type
-- For a real RACW [sub]type, use corresponding stub type
if not Is_Generic_Type (P_Type) then
Rewrite (N,
New_Occurrence_Of
(Corresponding_Stub_Type (Base_Type (P_Type)), Loc));
else
-- For a generic type (that has been marked as an RACW using
-- the Remote_Access_Type aspect or pragma), use a generic RACW
-- stub type. Note that if the actual is not a remote access
-- type, the instantiation will fail.
-- For a generic type (that has been marked as an RACW using the
-- Remote_Access_Type aspect or pragma), use a generic RACW stub
-- type. Note that if the actual is not a remote access type, the
-- instantiation will fail.
else
-- Note: we go to the underlying type here because the view
-- returned by RTE (RE_RACW_Stub_Type) might be incomplete.
......
gcc/ada/sem_prag.adb
......@@ -12904,6 +12904,7 @@ package body Sem_Prag is
Check_Arg_Count (1);
Check_Optional_Identifier (Arg1, Name_Entity);
Check_Arg_Is_Local_Name (Arg1);
E := Entity (Get_Pragma_Arg (Arg1));
if Nkind (Parent (E)) = N_Formal_Type_Declaration
......
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