summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-21 09:26:02 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2016-04-21 09:26:02 +0000
commitfda1b8b5d86ce32cb429faeb2e1c27e13831d0a8 (patch)
treec5cd442b61c09ac23e9348beedcfe0d36cc7ca92
parentadf0828888e30a855cdd5a725c647b2e58e1ff46 (diff)
downloadgcc-fda1b8b5d86ce32cb429faeb2e1c27e13831d0a8.tar.gz
2016-04-21 Hristian Kirtchev <kirtchev@adacore.com>
* sem_ch3.adb, exp_attr.adb, exp_ch6.adb, exp_aggr.adb: Minor reformatting. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235322 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ada/ChangeLog5
-rw-r--r--gcc/ada/exp_aggr.adb3
-rw-r--r--gcc/ada/exp_attr.adb4
-rw-r--r--gcc/ada/exp_ch6.adb3
-rw-r--r--gcc/ada/sem_ch3.adb5
5 files changed, 14 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 2fc027e453f..b89c2fac533 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-21 Hristian Kirtchev <kirtchev@adacore.com>
+
+ * sem_ch3.adb, exp_attr.adb, exp_ch6.adb, exp_aggr.adb: Minor
+ reformatting.
+
2016-04-21 Javier Miranda <miranda@adacore.com>
* exp_aggr.adb (Component_Check): Extend
diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb
index 6d6e1a25263..75359fc029d 100644
--- a/gcc/ada/exp_aggr.adb
+++ b/gcc/ada/exp_aggr.adb
@@ -564,7 +564,6 @@ package body Exp_Aggr is
---------------------
function Component_Check (N : Node_Id; Index : Node_Id) return Boolean is
-
function Ultimate_Original_Expression (N : Node_Id) return Node_Id;
-- Given a type conversion or an unchecked type conversion N, return
-- its innermost original expression.
@@ -590,6 +589,8 @@ package body Exp_Aggr is
Expr : Node_Id;
+ -- Start of processing for Component_Check
+
begin
-- Checks 1: (no component associations)
diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index 28e1f65f646..b00d8ea8d89 100644
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -583,13 +583,15 @@ package body Exp_Attr is
end if;
end Make_VS_If;
- -- Local Declarations
+ -- Local variables
Def : constant Node_Id := Parent (R_Type);
Comps : constant Node_Id := Component_List (Type_Definition (Def));
Stmts : constant List_Id := New_List;
Pspecs : constant List_Id := New_List;
+ -- Start of processing for Build_Record_VS_Func
+
begin
Append_To (Pspecs,
Make_Parameter_Specification (Loc,
diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index 599e46235c4..613f2b42ab6 100644
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -8477,8 +8477,7 @@ package body Exp_Ch6 is
if not Comes_From_Source (Orig_Func)
and then Etype (Orig_Func) /= Etype (Func_Id)
then
- Last_Actual :=
- Unchecked_Convert_To (Etype (Func_Id), Last_Actual);
+ Last_Actual := Unchecked_Convert_To (Etype (Func_Id), Last_Actual);
end if;
Append_To (Actuals,
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 19f4844a6bc..611edbaf5ba 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -5071,11 +5071,12 @@ package body Sem_Ch3 is
and then Has_Predicates (T)
and then Present (Predicate_Function (T))
then
+ -- ??? This is dangerous, it may clobber the invariant procedure
+
Set_Subprograms_For_Type (Id, Subprograms_For_Type (T));
if Has_Static_Predicate (T) then
- Set_Static_Discrete_Predicate (Id,
- Static_Discrete_Predicate (T));
+ Set_Static_Discrete_Predicate (Id, Static_Discrete_Predicate (T));
end if;
end if;