From ccb072b172cc9d9f4161b52a9eed7bced1d28e63 Mon Sep 17 00:00:00 2001 From: charlet Date: Mon, 5 Sep 2011 13:12:33 +0000 Subject: [PATCH] 2011-09-05 Robert Dewar * sem_ch3.adb, sem_res.adb, par.adb, par-ch6.adb, g-comlin.adb, exp_ch6.adb, lib-xref-alfa.adb: Minor reformatting. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178536 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/exp_ch6.adb | 4 ++-- gcc/ada/g-comlin.adb | 2 +- gcc/ada/lib-xref-alfa.adb | 2 ++ gcc/ada/par-ch6.adb | 8 +++----- gcc/ada/par.adb | 8 +++++--- gcc/ada/sem_ch3.adb | 2 ++ gcc/ada/sem_res.adb | 1 + 8 files changed, 21 insertions(+), 11 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 26c5256..22d261d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2011-09-05 Robert Dewar + + * sem_ch3.adb, sem_res.adb, par.adb, par-ch6.adb, g-comlin.adb, + exp_ch6.adb, lib-xref-alfa.adb: Minor reformatting. + 2011-09-05 Gary Dismukes * exp_ch7.adb, exp_ch6.adb: Minor reformatting. diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb index fd794e4..75d06c5 100644 --- a/gcc/ada/exp_ch6.adb +++ b/gcc/ada/exp_ch6.adb @@ -179,7 +179,7 @@ package body Exp_Ch6 is procedure Expand_Non_Function_Return (N : Node_Id); -- Called by Expand_N_Simple_Return_Statement in case we're returning from -- a procedure body, entry body, accept statement, or extended return - -- statement. Note that all non-function returns are simple return + -- statement. Note that all non-function returns are simple return -- statements. function Expand_Protected_Object_Reference @@ -564,7 +564,7 @@ package body Exp_Ch6 is -- The return type in the function declaration may have been a limited -- view, and the extra formals for the function were not generated at - -- that point. At the point of call the full view must be available and + -- that point. At the point of call the full view must be available and -- the extra formals can be created. if No (Extra_Formal) then diff --git a/gcc/ada/g-comlin.adb b/gcc/ada/g-comlin.adb index 28c9d98..b0aa35a 100644 --- a/gcc/ada/g-comlin.adb +++ b/gcc/ada/g-comlin.adb @@ -902,7 +902,7 @@ package body GNAT.Command_Line is Parser.Section (Parser.Current_Argument); end if; - -- Until we have the start of another section + -- Exit from loop if we have the start of another section if Index = Parser.Section'Last or else Parser.Section (Index + 1) /= 0 diff --git a/gcc/ada/lib-xref-alfa.adb b/gcc/ada/lib-xref-alfa.adb index 2036dd8..9e154fd 100644 --- a/gcc/ada/lib-xref-alfa.adb +++ b/gcc/ada/lib-xref-alfa.adb @@ -618,6 +618,8 @@ package body Alfa is -- verification, and should therefore never appear in frame -- conditions. + -- What about E_Loop_Parameter??? + when E_In_Parameter | E_Constant => return False; diff --git a/gcc/ada/par-ch6.adb b/gcc/ada/par-ch6.adb index 100259e..7b200e7 100644 --- a/gcc/ada/par-ch6.adb +++ b/gcc/ada/par-ch6.adb @@ -682,15 +682,14 @@ package body Ch6 is if Token_Is_At_Start_Of_Line then declare - - -- The enclosing scope entry is a subprogram spec. + -- The enclosing scope entry is a subprogram spec Spec_Node : constant Node_Id := - Parent (Scope.Table (Scope.Last).Labl); + Parent + (Scope.Table (Scope.Last).Labl); Lib_Node : Node_Id := Spec_Node; begin - -- Check whether there is an enclosing scope that -- is a package declaration. @@ -706,7 +705,6 @@ package body Ch6 is Nkind (Spec_Node) = N_Function_Specification then null; - else return False; end if; diff --git a/gcc/ada/par.adb b/gcc/ada/par.adb index 4abc5b2..e054c19 100644 --- a/gcc/ada/par.adb +++ b/gcc/ada/par.adb @@ -473,9 +473,11 @@ function Par (Configuration_Pragmas : Boolean) return List_Id is -- program unit name. For task declarations and bodies, protected types -- and bodies, and accept statements the field hold the name of the type -- or operation. For if-statements, case-statements, and selects, the - -- field is initialized to Error, indicating that it is an error to have - -- a label on the end line. - -- (this is really a misuse of Error since there is no Error ???) + -- field is initialized to Error. + + -- Note: this is a bit of an odd (mis)use of Error, since there is no + -- Error, but we use this value as a place holder to indicate that it + -- is an error to have a label on the end line. -- Whenever the field is a name, it is attached to the parent node of -- the construct being parsed. Thus the parent node indicates the kind diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 3e5665f..9d9e62c 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -3320,6 +3320,8 @@ package body Sem_Ch3 is -- In SPARK, a declaration of unconstrained type is allowed -- only for constants of type string. + -- Isn't following check the wrong way round??? + if Nkind (E) = N_String_Literal then Check_SPARK_Restriction ("declaration of object of unconstrained type not allowed", diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 068e3fc..d28db8f 100644 --- a/gcc/ada/sem_res.adb +++ b/gcc/ada/sem_res.adb @@ -7174,6 +7174,7 @@ package body Sem_Res is then Arg1 := Convert_Operand (Left_Opnd (N)); -- Unchecked_Convert_To (Btyp, Left_Opnd (N)); + -- What on earth is this commented out fragment of code??? if Nkind (N) = N_Op_Expon then Arg2 := Unchecked_Convert_To (Standard_Integer, Right_Opnd (N)); -- 2.7.4