diff options
| author | Robert Dewar <dewar@adacore.com> | 2010-10-08 12:34:08 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2010-10-08 14:34:08 +0200 |
| commit | 3786bbd19bb747859aac3bea0c1048b674e71727 (patch) | |
| tree | 4b3146f56cf873301154bb78b8f6d4bc6b2ec0a2 /gcc/ada/sem_aggr.adb | |
| parent | bcae2eaac7fe1533f7ef107aa41f0ff67db39631 (diff) | |
| download | gcc-3786bbd19bb747859aac3bea0c1048b674e71727.zip gcc-3786bbd19bb747859aac3bea0c1048b674e71727.tar.gz gcc-3786bbd19bb747859aac3bea0c1048b674e71727.tar.bz2 | |
sem_aggr.adb: Minor reformatting.
2010-10-08 Robert Dewar <dewar@adacore.com>
* sem_aggr.adb: Minor reformatting.
2010-10-08 Robert Dewar <dewar@adacore.com>
* exp_imgv.adb (Expand_Image_Attribute): Handle special calling
sequence for soft hyphen for Character'Image case.
* rtsfind.ads (Image_Character_05): New entry
* s-imgcha.adb (Image_Character_05): New procedurew
* s-imgcha.ads (Image_Character_05): New procedure
* s-imgwch.adb (Image_Wide_Character): Deal with Ada 2005 soft hyphen
case.
* s-valcha.adb (Value_Character): Recognize SOFT_HYPHEN for 16#AD#
* sem_attr.adb (Eval_Attribute, case Width): Handle soft_hyphen name
properly.
From-SVN: r165168
Diffstat (limited to 'gcc/ada/sem_aggr.adb')
| -rw-r--r-- | gcc/ada/sem_aggr.adb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb index 5a02199..5574f65 100644 --- a/gcc/ada/sem_aggr.adb +++ b/gcc/ada/sem_aggr.adb @@ -3654,10 +3654,11 @@ package body Sem_Aggr is (Aggr : Node_Id; Assoc_List : List_Id) is - Aggr_Type : constant Entity_Id := - Base_Type (Etype (Aggr)); - Def_Node : constant Node_Id := - Type_Definition (Declaration_Node (Aggr_Type)); + Aggr_Type : constant Entity_Id := + Base_Type (Etype (Aggr)); + Def_Node : constant Node_Id := + Type_Definition + (Declaration_Node (Aggr_Type)); Comp : Node_Id; Comp_Elmt : Elmt_Id; @@ -3666,7 +3667,7 @@ package body Sem_Aggr is Errors : Boolean; procedure Process_Component (Comp : Entity_Id); - -- Add one component with a box association to the + -- Add one component with a box association to the -- inner aggregate, and recurse if component is -- itself composite. @@ -3702,7 +3703,6 @@ package body Sem_Aggr is end Process_Component; begin - -- The component type may be a variant type, so -- collect the components that are ruled by the -- known values of the discriminants. @@ -3734,7 +3734,6 @@ package body Sem_Aggr is -- No variant part, iterate over all components else - Comp := First_Component (Etype (Aggr)); while Present (Comp) loop Process_Component (Comp); @@ -3753,15 +3752,16 @@ package body Sem_Aggr is end if; end Propagate_Discriminants; - -- Start of processing for Capture_Discriminants + -- Start of processing for Capture_Discriminants begin Expr := Make_Aggregate (Loc, New_List, New_List); Set_Etype (Expr, Ctyp); - -- If the enclosing type has discriminants, they - -- have been collected in the aggregate earlier, and - -- they may appear as constraints of subcomponents. + -- If the enclosing type has discriminants, they have + -- been collected in the aggregate earlier, and they + -- may appear as constraints of subcomponents. + -- Similarly if this component has discriminants, they -- might in turn be propagated to their components. @@ -3771,7 +3771,7 @@ package body Sem_Aggr is elsif Has_Discriminants (Ctyp) then Add_Discriminant_Values - (Expr, Component_Associations (Expr)); + (Expr, Component_Associations (Expr)); Propagate_Discriminants (Expr, Component_Associations (Expr)); |