2009-07-15 Robert Dewar <dewar@adacore.com>

	* exp_aggr.adb, tbuild.ads, tbuild.adb: Minor reformatting
	Minor code reorganization

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149665 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a3162c2..ddcd42c 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-15  Robert Dewar  <dewar@adacore.com>
+
+       * exp_aggr.adb, tbuild.ads, tbuild.adb: Minor reformatting
+       Minor code reorganization
+
 2009-07-14  Taras Glek  <tglek@mozilla.com>
            Rafael Espindola  <espindola@google.com>
 

diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index 1117461..6946638 100644 (file)
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -2976,21 +2976,22 @@ package body Exp_Aggr is
                   declare
                      SubE : constant Entity_Id :=
                               Make_Defining_Identifier (Loc,
-                                New_Internal_Name ('T'));
+                                Chars => New_Internal_Name ('T'));
 
                      SubD : constant Node_Id :=
                               Make_Subtype_Declaration (Loc,
-                                Defining_Identifier =>
-                                  SubE,
+                                Defining_Identifier => SubE,
                                 Subtype_Indication  =>
                                   Make_Subtype_Indication (Loc,
-                                    Subtype_Mark => New_Reference_To (
-                                      Etype (Comp_Type), Loc),
+                                    Subtype_Mark =>
+                                      New_Reference_To
+                                        (Etype (Comp_Type), Loc),
                                     Constraint =>
-                                      Make_Index_Or_Discriminant_Constraint (
-                                        Loc, Constraints => New_List (
-                                          New_Copy_Tree (Aggregate_Bounds (
-                                            Expr_Q))))));
+                                      Make_Index_Or_Discriminant_Constraint
+                                        (Loc,
+                                         Constraints => New_List (
+                                          New_Copy_Tree
+                                            (Aggregate_Bounds (Expr_Q))))));
 
                      --  Create a temporary array of the above subtype which
                      --  will be used to capture the aggregate assignments.

diff --git a/gcc/ada/tbuild.adb b/gcc/ada/tbuild.adb
index be88205..9049827 100644 (file)
--- a/gcc/ada/tbuild.adb
+++ b/gcc/ada/tbuild.adb
@@ -436,14 +436,17 @@ package body Tbuild is
           Strval => End_String);
    end Make_String_Literal;
 
+   --------------------
+   -- Make_Temporary --
+   --------------------
+
    function Make_Temporary
-     (Loc  :  Source_Ptr;
-      Id   :  Name_Id;
+     (Loc          : Source_Ptr;
+      Id           : Name_Id;
       Related_Node : Node_Id := Empty) return Node_Id
    is
-      Temp : Node_Id;
+      Temp : constant Node_Id := Make_Defining_Identifier (Loc, Id);
    begin
-      Temp := Make_Defining_Identifier (Loc, Id);
       Set_Related_Expression (Temp, Related_Node);
       return Temp;
    end Make_Temporary;

diff --git a/gcc/ada/tbuild.ads b/gcc/ada/tbuild.ads
index f12b616..d02f7ac 100644 (file)
--- a/gcc/ada/tbuild.ads
+++ b/gcc/ada/tbuild.ads
@@ -176,8 +176,8 @@ package Tbuild is
    --  is given as a normal string instead of a String_Id value.
 
    function Make_Temporary
-     (Loc :   Source_Ptr;
-      Id  :  Name_Id;
+     (Loc          : Source_Ptr;
+      Id           : Name_Id;
       Related_Node : Node_Id := Empty) return Node_Id;
    --  Create a defining identifier to capture the value of an expression
    --  or aggregate, and link it to the expression that it replaces, in