[multiple changes]

2011-09-05  Gary Dismukes  <dismukes@adacore.com>

	* exp_ch7.adb, exp_ch6.adb: Minor reformatting.

2011-09-05  Johannes Kanig  <kanig@adacore.com>

	* lib-xref-alfa.adb: Update comments.

2011-09-05  Thomas Quinot  <quinot@adacore.com>

	* sem_res.adb: Minor reformatting

From-SVN: r178535

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index f7e2e850b7681cfb7196e5b801396f9b6b00ac92..26c5256fcc14f17284dcb3a28a47d0769be704ca 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,15 @@
+2011-09-05  Gary Dismukes  <dismukes@adacore.com>
+
+       * exp_ch7.adb, exp_ch6.adb: Minor reformatting.
+
+2011-09-05  Johannes Kanig  <kanig@adacore.com>
+
+       * lib-xref-alfa.adb: Update comments.
+
+2011-09-05  Thomas Quinot  <quinot@adacore.com>
+
+       * sem_res.adb: Minor reformatting
+
 2011-09-05  Ed Schonberg  <schonberg@adacore.com>
 
        * exp_ch6.adb (Build_In_Place_Formal): If extra formals are not

diff --git a/gcc/ada/exp_ch6.adb b/gcc/ada/exp_ch6.adb
index a9a2c42c9d8f467f3c1d992fa595f34233911314..fd794e4305aabbcff96933a2d9f0d29743e1aaf4 100644 (file)
--- a/gcc/ada/exp_ch6.adb
+++ b/gcc/ada/exp_ch6.adb
@@ -7236,7 +7236,7 @@ package body Exp_Ch6 is
          Add_Finalization_Master_Actual_To_Build_In_Place_Call
            (Func_Call, Function_Id, Acc_Type);
 
-         --  Is access type has a master entity, pass a reference to it.
+         --  If access type has a master entity, pass a reference to it
 
          if Present (Master_Id (Acc_Type)) then
             Add_Task_Actuals_To_Build_In_Place_Call

diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index 59d2cb18dc96ab0951d662e2d973f101bf1d588f..f36e29e294edabd8c12c8d637e5b960940327a43 100644 (file)
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -3042,7 +3042,7 @@ package body Exp_Ch7 is
               Parameter_Associations =>
                 New_List (New_Reference_To (Data.E_Id, Data.Loc)));
 
-      --  Restricted runtime: exception messages are not supported and hence
+      --  Restricted run-time: exception messages are not supported and hence
       --  Raise_From_Controlled_Operation is not supported. Raise Program_Error
       --  instead.
 
@@ -3890,10 +3890,10 @@ package body Exp_Ch7 is
          No_Body := True;
       end if;
 
-      --  For a nested instance, delay processing until freeze point.
+      --  For a nested instance, delay processing until freeze point
 
       if Has_Delayed_Freeze (Id)
-       and then Nkind (Parent (N)) /= N_Compilation_Unit
+        and then Nkind (Parent (N)) /= N_Compilation_Unit
       then
          return;
       end if;
@@ -7284,7 +7284,7 @@ package body Exp_Ch7 is
       --  Procedure call or raise statement
 
    begin
-      --  Standard runtime, .NET/JVM targets: add choice parameter E and pass
+      --  Standard run-time, .NET/JVM targets: add choice parameter E and pass
       --  it to Raise_From_Controlled_Operation so that the original exception
       --  name and message can be recorded in the exception message for
       --  Program_Error.
@@ -7299,7 +7299,7 @@ package body Exp_Ch7 is
              Parameter_Associations => New_List (
                New_Reference_To (E_Occ, Loc)));
 
-      --  Restricted runtime: exception messages are not supported
+      --  Restricted run-time: exception messages are not supported
 
       else
          E_Occ := Empty;
@@ -7538,7 +7538,7 @@ package body Exp_Ch7 is
               Attribute_Name => Name_Unrestricted_Access)));
 
       --  In the case of build-in-place functions, protect the call to ensure
-      --  we have a master at runtime. Generate:
+      --  we have a master at run time. Generate:
 
       --    if <Ptr_Typ>FM /= null then
       --       <Call>;

diff --git a/gcc/ada/lib-xref-alfa.adb b/gcc/ada/lib-xref-alfa.adb
index dd3c78cb2dd555603d39f4e291d7715f6b5f3c3e..2036dd83d737dad43fafbc3b980e10b936b5d62c 100644 (file)
--- a/gcc/ada/lib-xref-alfa.adb
+++ b/gcc/ada/lib-xref-alfa.adb
@@ -612,11 +612,11 @@ package body Alfa is
                when Overloadable_Kind =>
                   return Typ = 's';
 
-               --  References to IN parameters are not considered in Alfa
-               --  section, as these will be translated as constants in the
-               --  intermediate language for formal verification.
-
-               --  Above comment is incomplete??? what about E_Constant case
+               --  References to IN parameters and constants are not
+               --  considered in Alfa section, as these will be translated
+               --  as constants in the intermediate language for formal
+               --  verification, and should therefore never appear in frame
+               --  conditions.
 
                when E_In_Parameter | E_Constant =>
                   return False;

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 1d3c018ec5ae9e1ea5b4d1f4730166fa81e53d58..068e3fc88afaebbb49d1e3a73c21d6dd7b4a118a 100644 (file)
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -7145,7 +7145,7 @@ package body Sem_Res is
          return Res;
       end Convert_Operand;
 
-      --  Start of processing for Resolve_Intrinsic_Operator
+   --  Start of processing for Resolve_Intrinsic_Operator
 
    begin
       --  We must preserve the original entity in a generic setting, so that