summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2012-07-16 10:49:46 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2012-07-16 10:49:46 +0000
commitf50256f3bc97b421fccd9820df6e2e4039c36583 (patch)
tree59bf343805c5796867dd24861bcced22dd664c28
parentc09d2734263365aeb7accc524d89c4b76018f587 (diff)
downloadgcc-f50256f3bc97b421fccd9820df6e2e4039c36583.tar.gz
2012-07-16 Robert Dewar <dewar@adacore.com>
* exp_pakd.adb, freeze.adb, sem_util.adb, vms_data.ads: Minor reformatting. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@189516 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/exp_pakd.adb21
-rw-r--r--gcc/ada/freeze.adb16
-rw-r--r--gcc/ada/sem_util.adb11
-rw-r--r--gcc/ada/vms_data.ads3
5 files changed, 32 insertions, 24 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a5237868850..0ce604e82fa 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-16 Robert Dewar <dewar@adacore.com>
+
+ * exp_pakd.adb, freeze.adb, sem_util.adb, vms_data.ads: Minor
+ reformatting.
+
2012-07-12 Vasiliy Fofanov <fofanov@adacore.com>
* vms_data.ads: Add VMS qualifiers for -gnatn1/2 switches.
diff --git a/gcc/ada/exp_pakd.adb b/gcc/ada/exp_pakd.adb
index b958383f933..0d9ed4ee19d 100644
--- a/gcc/ada/exp_pakd.adb
+++ b/gcc/ada/exp_pakd.adb
@@ -570,13 +570,12 @@ package body Exp_Pakd is
Swap_F := RTE (Swap_RE);
- return Unchecked_Convert_To
- (T,
- Make_Function_Call (Loc,
- Name =>
- New_Occurrence_Of (Swap_F, Loc),
- Parameter_Associations =>
- New_List (Unchecked_Convert_To (Etype (Swap_F), N))));
+ return
+ Unchecked_Convert_To (T,
+ Make_Function_Call (Loc,
+ Name => New_Occurrence_Of (Swap_F, Loc),
+ Parameter_Associations =>
+ New_List (Unchecked_Convert_To (Etype (Swap_F), N))));
end Byte_Swap;
------------------------------
@@ -1534,8 +1533,8 @@ package body Exp_Pakd is
Set_Etype (New_Rhs, T);
if Reverse_Storage_Order (Base_Type (Atyp))
- and then Esize (T) > 8
- and then not In_Reverse_Storage_Order_Object (Obj)
+ and then Esize (T) > 8
+ and then not In_Reverse_Storage_Order_Object (Obj)
then
Require_Byte_Swapping := True;
New_Rhs := Byte_Swap (New_Rhs);
@@ -2042,8 +2041,8 @@ package body Exp_Pakd is
-- in Expand_Bit_Packed_Element_Set).
if Reverse_Storage_Order (Atyp)
- and then Esize (Atyp) > 8
- and then not In_Reverse_Storage_Order_Object (Obj)
+ and then Esize (Atyp) > 8
+ and then not In_Reverse_Storage_Order_Object (Obj)
then
Obj := Byte_Swap (Obj);
end if;
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index c8547b1e524..7b5ecd9b9be 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -1046,9 +1046,8 @@ package body Freeze is
(Type_Definition (Declaration_Node (Encl_Type)));
end if;
- -- Note: the Reverse_Storage_Order flag is set on the base type,
- -- but the attribute definition clause is attached to the first
- -- subtype.
+ -- Note: the Reverse_Storage_Order flag is set on the base type, but
+ -- the attribute definition clause is attached to the first subtype.
Comp_Type := Base_Type (Comp_Type);
ADC := Get_Attribute_Definition_Clause
@@ -1057,16 +1056,17 @@ package body Freeze is
if (Is_Record_Type (Comp_Type) or else Is_Array_Type (Comp_Type))
and then
- (No (ADC) or else Reverse_Storage_Order (Encl_Type)
- /= Reverse_Storage_Order (Etype (Comp_Type)))
+ (No (ADC) or else Reverse_Storage_Order (Encl_Type) /=
+ Reverse_Storage_Order (Etype (Comp_Type)))
then
Error_Msg_N
("component type must have same scalar storage order as "
& "enclosing composite", Err_Node);
elsif Aliased_Present (Comp_Def) then
- Error_Msg_N ("aliased component not permitted for type with "
- & "explicit Scalar_Storage_Order", Err_Node);
+ Error_Msg_N
+ ("aliased component not permitted for type with "
+ & "explicit Scalar_Storage_Order", Err_Node);
end if;
end Check_Component_Storage_Order;
@@ -3746,7 +3746,7 @@ package body Freeze is
-- Check for scalar storage order
if Present (Get_Attribute_Definition_Clause
- (E, Attribute_Scalar_Storage_Order))
+ (E, Attribute_Scalar_Storage_Order))
then
Check_Component_Storage_Order (E, Empty);
end if;
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 721f958d683..bd53144c7eb 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -6312,11 +6312,11 @@ package body Sem_Util is
function In_Reverse_Storage_Order_Object (N : Node_Id) return Boolean is
Pref : Node_Id;
Btyp : Entity_Id := Empty;
- begin
- Pref := N;
+ begin
-- Climb up indexed components
+ Pref := N;
loop
case Nkind (Pref) is
when N_Selected_Component =>
@@ -6336,9 +6336,10 @@ package body Sem_Util is
Btyp := Base_Type (Etype (Pref));
end if;
- return Present (Btyp)
- and then (Is_Record_Type (Btyp) or else Is_Array_Type (Btyp))
- and then Reverse_Storage_Order (Btyp);
+ return
+ Present (Btyp)
+ and then (Is_Record_Type (Btyp) or else Is_Array_Type (Btyp))
+ and then Reverse_Storage_Order (Btyp);
end In_Reverse_Storage_Order_Object;
--------------------------------------
diff --git a/gcc/ada/vms_data.ads b/gcc/ada/vms_data.ads
index 20d92a06900..e7d93fffd8c 100644
--- a/gcc/ada/vms_data.ads
+++ b/gcc/ada/vms_data.ads
@@ -1826,6 +1826,9 @@ package VMS_Data is
-- (/OPTIMIZE=SOME) or higher (/OPTIMIZE=UNROLL_LOOPS)
-- levels of optimization.
--
+ -- PRAGMA_LEVEL_1/2 not documented ???
+ --
+ --
-- FULL Front end inlining. The front end inlining activated
-- by this switch is generally more extensive, and quite
-- often more effective than the standard PRAGMA inlining