aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ada/ChangeLog8
-rw-r--r--gcc/ada/inline.adb2
-rw-r--r--gcc/ada/sem_ch4.ads56
-rw-r--r--gcc/ada/sem_ch6.adb5
-rw-r--r--gcc/ada/sem_ch8.adb9
-rw-r--r--gcc/ada/stand.ads3
6 files changed, 45 insertions, 38 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 7330a20..ece9717 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-02 Robert Dewar <dewar@adacore.com>
+
+ * inline.adb, stand.ads, sem_ch6.adb, sem_ch8.adb: Minor reformatting.
+
+2011-08-02 Yannick Moy <moy@adacore.com>
+
+ * sem_ch4.ads: minor formatting.
+
2011-08-02 Yannick Moy <moy@adacore.com>
* sem_aggr.adb, err_vars.ads, sem_ch3.adb, sem_ch5.adb, sem_ch9.adb,
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
index 68e53a5..d85e086 100644
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -344,7 +344,7 @@ package body Inline is
elsif not Is_Inlined (Pack)
and then
(not Has_Completion (E)
- or else Is_Expression_Function (E))
+ or else Is_Expression_Function (E))
then
Set_Is_Inlined (Pack);
Inlined_Bodies.Increment_Last;
diff --git a/gcc/ada/sem_ch4.ads b/gcc/ada/sem_ch4.ads
index 4f95545..96550f2 100644
--- a/gcc/ada/sem_ch4.ads
+++ b/gcc/ada/sem_ch4.ads
@@ -6,7 +6,7 @@
-- --
-- S p e c --
-- --
--- Copyright (C) 1992-2010, Free Software Foundation, Inc. --
+-- Copyright (C) 1992-2011, Free Software Foundation, Inc. --
-- --
-- GNAT is free software; you can redistribute it and/or modify it under --
-- terms of the GNU General Public License as published by the Free Soft- --
@@ -26,34 +26,34 @@
with Types; use Types;
package Sem_Ch4 is
- procedure Analyze_Aggregate (N : Node_Id);
- procedure Analyze_Allocator (N : Node_Id);
- procedure Analyze_Arithmetic_Op (N : Node_Id);
- procedure Analyze_Call (N : Node_Id);
- procedure Analyze_Case_Expression (N : Node_Id);
- procedure Analyze_Comparison_Op (N : Node_Id);
- procedure Analyze_Concatenation (N : Node_Id);
- procedure Analyze_Conditional_Expression (N : Node_Id);
- procedure Analyze_Equality_Op (N : Node_Id);
- procedure Analyze_Explicit_Dereference (N : Node_Id);
- procedure Analyze_Expression_With_Actions (N : Node_Id);
- procedure Analyze_Logical_Op (N : Node_Id);
- procedure Analyze_Membership_Op (N : Node_Id);
- procedure Analyze_Negation (N : Node_Id);
- procedure Analyze_Null (N : Node_Id);
- procedure Analyze_Qualified_Expression (N : Node_Id);
- procedure Analyze_Quantified_Expression (N : Node_Id);
- procedure Analyze_Range (N : Node_Id);
- procedure Analyze_Reference (N : Node_Id);
- procedure Analyze_Selected_Component (N : Node_Id);
- procedure Analyze_Short_Circuit (N : Node_Id);
- procedure Analyze_Slice (N : Node_Id);
- procedure Analyze_Type_Conversion (N : Node_Id);
- procedure Analyze_Unary_Op (N : Node_Id);
- procedure Analyze_Unchecked_Expression (N : Node_Id);
- procedure Analyze_Unchecked_Type_Conversion (N : Node_Id);
+ procedure Analyze_Aggregate (N : Node_Id);
+ procedure Analyze_Allocator (N : Node_Id);
+ procedure Analyze_Arithmetic_Op (N : Node_Id);
+ procedure Analyze_Call (N : Node_Id);
+ procedure Analyze_Case_Expression (N : Node_Id);
+ procedure Analyze_Comparison_Op (N : Node_Id);
+ procedure Analyze_Concatenation (N : Node_Id);
+ procedure Analyze_Conditional_Expression (N : Node_Id);
+ procedure Analyze_Equality_Op (N : Node_Id);
+ procedure Analyze_Explicit_Dereference (N : Node_Id);
+ procedure Analyze_Expression_With_Actions (N : Node_Id);
+ procedure Analyze_Logical_Op (N : Node_Id);
+ procedure Analyze_Membership_Op (N : Node_Id);
+ procedure Analyze_Negation (N : Node_Id);
+ procedure Analyze_Null (N : Node_Id);
+ procedure Analyze_Qualified_Expression (N : Node_Id);
+ procedure Analyze_Quantified_Expression (N : Node_Id);
+ procedure Analyze_Range (N : Node_Id);
+ procedure Analyze_Reference (N : Node_Id);
+ procedure Analyze_Selected_Component (N : Node_Id);
+ procedure Analyze_Short_Circuit (N : Node_Id);
+ procedure Analyze_Slice (N : Node_Id);
+ procedure Analyze_Type_Conversion (N : Node_Id);
+ procedure Analyze_Unary_Op (N : Node_Id);
+ procedure Analyze_Unchecked_Expression (N : Node_Id);
+ procedure Analyze_Unchecked_Type_Conversion (N : Node_Id);
- procedure Analyze_Indexed_Component_Form (N : Node_Id);
+ procedure Analyze_Indexed_Component_Form (N : Node_Id);
-- Prior to semantic analysis, an indexed component node can denote any
-- of the following syntactic constructs:
-- a) An indexed component of an array
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 3c8f02e..87b6a0c 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -279,7 +279,7 @@ package body Sem_Ch6 is
begin
-- This is one of the occasions on which we transform the tree during
- -- semantic analysis. If this is a completion, transform the expression
+ -- semantic analysis. If this is a completion, transform the expression
-- function into an equivalent subprogram body, and analyze it.
-- Expression functions are inlined unconditionally. The back-end will
@@ -631,8 +631,7 @@ package body Sem_Ch6 is
Analyze_And_Resolve (Expr, R_Type);
Check_Limited_Return (Expr);
- -- The only RETURN allowed in SPARK is as the last statement of the
- -- function.
+ -- RETURN only allowed in SPARK is as the last statement function
if Nkind (Parent (N)) /= N_Handled_Sequence_Of_Statements
and then
diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index 20b64a7..67a53e3 100644
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -1580,10 +1580,10 @@ package body Sem_Ch8 is
---------------------------------
procedure Analyze_Subprogram_Renaming (N : Node_Id) is
- Formal_Spec : constant Node_Id := Corresponding_Formal_Spec (N);
- Is_Actual : constant Boolean := Present (Formal_Spec);
+ Formal_Spec : constant Node_Id := Corresponding_Formal_Spec (N);
+ Is_Actual : constant Boolean := Present (Formal_Spec);
- CW_Actual : Boolean := False;
+ CW_Actual : Boolean := False;
-- True if the renaming is for a defaulted formal subprogram when the
-- actual for a related formal type is class-wide. For AI05-0071.
@@ -2440,9 +2440,8 @@ package body Sem_Ch8 is
-- no check for mode conformance, given that the signatures don't
-- match (the source mentions T but the actual mentions T'class).
- if CW_Actual then
+ if CW_Actual then
null;
-
else
Check_Mode_Conformant (New_S, Old_S);
end if;
diff --git a/gcc/ada/stand.ads b/gcc/ada/stand.ads
index 40c51d0..07c86b6 100644
--- a/gcc/ada/stand.ads
+++ b/gcc/ada/stand.ads
@@ -313,7 +313,8 @@ package Stand is
Boolean_Literals : array (Boolean) of Entity_Id;
-- Entities for the two boolean literals, used by the expander
- -- Standard types which are in ALFA are associated to True
+ -- Standard types which are in ALFA are associated set to True
+
Standard_Type_Is_In_ALFA : array (S_Types) of Boolean :=
(S_Boolean => True,