From 5e9d6f05dd961d83f8318e2c9001ccde2a18c219 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 20 Nov 2014 12:37:33 +0100 Subject: [PATCH] [multiple changes] 2014-11-20 Robert Dewar * freeze.adb, exp_dbug.adb, sem_ch13.adb: Minor reformatting. 2014-11-20 Thomas Quinot * einfo.ads: Fix minor typo in comment. From-SVN: r217844 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/einfo.ads | 2 +- gcc/ada/exp_dbug.adb | 18 +++++++++--------- gcc/ada/freeze.adb | 10 ++++------ gcc/ada/sem_ch13.adb | 3 +-- 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 826d174..244c744 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,13 @@ 2014-11-20 Robert Dewar + * freeze.adb, exp_dbug.adb, sem_ch13.adb: Minor reformatting. + +2014-11-20 Thomas Quinot + + * einfo.ads: Fix minor typo in comment. + +2014-11-20 Robert Dewar + * inline.adb, sem_util.adb: Minor reformatting. 2014-11-20 Pierre-Marie Derodat diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads index d20624d..5af839f 100644 --- a/gcc/ada/einfo.ads +++ b/gcc/ada/einfo.ads @@ -4159,7 +4159,7 @@ package Einfo is -- the full view of a private type T is derived from another private type -- with discriminants Td, the full view of T is also private, and there -- is no way to attach to it a further full view that would convey the --- structure of T to the backend. The Underlying_Full_ View is an +-- structure of T to the backend. The Underlying_Full_View is an -- attribute of the full view that is a subtype of Td with the same -- constraint as the declaration for T. The declaration for this subtype -- is built at the point of the declaration of T, either as completion, diff --git a/gcc/ada/exp_dbug.adb b/gcc/ada/exp_dbug.adb index fde8c78..80bf4ed 100644 --- a/gcc/ada/exp_dbug.adb +++ b/gcc/ada/exp_dbug.adb @@ -134,8 +134,9 @@ package body Exp_Dbug is -- used to determine whether encoding is required for a discrete type. function Is_Handled_Scale_Factor (U : Ureal) return Boolean; - -- Determine whether the back-end can handle some scale factor. When it - -- cannot, we have to output a GNAT encoding for the correspondig type. + -- The argument U is the Small_Value of a fixed-point type. This function + -- determines whether the back-end can handle this scale factor. When it + -- cannot, we have to output a GNAT encoding for the corresponding type. procedure Output_Homonym_Numbers_Suffix; -- If homonym numbers are stored, then output them into Name_Buffer @@ -547,17 +548,17 @@ package body Exp_Dbug is begin -- Keep in sync with gigi (see E_*_Fixed_Point_Type handling in -- decl.c:gnat_to_gnu_entity). + if UI_Eq (Numerator (U), Uint_1) then - if Rbase (U) = 2 - or else Rbase (U) = 10 - then + if Rbase (U) = 2 or else Rbase (U) = 10 then return True; end if; end if; return (UI_Is_In_Int_Range (Norm_Num (U)) - and then UI_Is_In_Int_Range (Norm_Den (U))); + and then + UI_Is_In_Int_Range (Norm_Den (U))); end Is_Handled_Scale_Factor; ---------------------- @@ -622,9 +623,8 @@ package body Exp_Dbug is -- know the back-end will not be able to handle the scale factor. if Is_Fixed_Point_Type (E) - and then - (GNAT_Encodings /= DWARF_GNAT_Encodings_Minimal - or else not Is_Handled_Scale_Factor (Small_Value (E))) + and then (GNAT_Encodings /= DWARF_GNAT_Encodings_Minimal + or else not Is_Handled_Scale_Factor (Small_Value (E))) then Get_External_Name (E, True, "XF_"); Add_Real_To_Buffer (Delta_Value (E)); diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 6d366f0..332c1dd 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -7701,15 +7701,13 @@ package body Freeze is if Is_Base_Type (T) and then (Is_Array_Type (T) - or else - (Is_Record_Type (T) - and then not (Is_Tagged_Type (T) - and then - Is_Derived_Type (T)))) + or else (Is_Record_Type (T) + and then not (Is_Tagged_Type (T) + and then Is_Derived_Type (T)))) then if ((Bytes_Big_Endian and then SSO_Set_Low_By_Default (T)) or else - ((not Bytes_Big_Endian) and then SSO_Set_High_By_Default (T))) + ((not Bytes_Big_Endian) and then SSO_Set_High_By_Default (T))) -- For a record type, if native bit order is specified explicitly, -- then never set reverse SSO from default. diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 9c119a3..0804fa0 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -3798,8 +3798,7 @@ package body Sem_Ch13 is ("variable indexing must return a reference type"); return; - elsif Is_Access_Constant - (Etype (First_Discriminant (Ret_Type))) + elsif Is_Access_Constant (Etype (First_Discriminant (Ret_Type))) then Illegal_Indexing ("variable indexing must return an access to variable"); -- 2.7.4