[multiple changes]

2011-08-01  Robert Dewar  <dewar@adacore.com>

	* exp_ch4.adb, sem_cat.adb: Minor reformatting.

2011-08-01  Geert Bosch  <bosch@adacore.com>

	* atree.ads: Fix comment.

From-SVN: r177023

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 100a29807794a4a60cab3203868184dbdac8761c..984e7b3450b178e54b42f1add5f1d2fa02962bd5 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-01  Robert Dewar  <dewar@adacore.com>
+
+       * exp_ch4.adb, sem_cat.adb: Minor reformatting.
+
+2011-08-01  Geert Bosch  <bosch@adacore.com>
+
+       * atree.ads: Fix comment.
+
 2011-08-01  Robert Dewar  <dewar@adacore.com>
 
        * aspects.ads, aspects.adb (Aspect_Names): Moved from body to spec.

diff --git a/gcc/ada/atree.ads b/gcc/ada/atree.ads
index 386dcefa8207db76f5a2ca499f2ea69bf068b54a..40d4d8e5d3a073af8340af12305120272ff120d5 100644 (file)
--- a/gcc/ada/atree.ads
+++ b/gcc/ada/atree.ads
@@ -819,9 +819,9 @@ package Atree is
 
    function Is_Rewrite_Insertion (Node : Node_Id) return Boolean;
    pragma Inline (Is_Rewrite_Insertion);
-   --  Tests whether the given node was marked using Set_Rewrite_Insert. This
-   --  is used in reconstructing the original tree (where such nodes are to
-   --  be eliminated from the reconstructed tree).
+   --  Tests whether the given node was marked using Mark_Rewrite_Insertion.
+   --  This is used in reconstructing the original tree (where such nodes are
+   --  to be eliminated from the reconstructed tree).
 
    procedure Rewrite (Old_Node, New_Node : Node_Id);
    --  This is used when a complete subtree is to be replaced. Old_Node is the

diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index 3256cc4d779b36c7ef5c8d824f86c86fdf805e04..2213ec5840b215d557437133194e641b7226844b 100644 (file)
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -7693,7 +7693,7 @@ package body Exp_Ch4 is
                   --  copy. We don't want to copy complex expressions, and
                   --  indeed to do so can cause trouble (before we put in
                   --  this guard, a discriminant expression containing an
-                  --  AND THEN was copied, causing problems to coverage
+                  --  AND THEN was copied, causing problems for coverage
                   --  analysis tools).
 
                   if Disc = Entity (Selector_Name (N))
@@ -7723,8 +7723,8 @@ package body Exp_Ch4 is
                      --  fact incorrect.
 
                      elsif Is_Entity_Name (Dval)
-                       and then Nkind (Parent (Entity (Dval)))
-                                  = N_Object_Declaration
+                       and then Nkind (Parent (Entity (Dval))) =
+                                                      N_Object_Declaration
                        and then Present (Expression (Parent (Entity (Dval))))
                        and then
                          not Is_Static_Expression

diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index e262dc71835ac03116e0fd7188ccac35f290681b..83d3d6a1c5bddd346be3fd76ca8f98284f1378f8 100644 (file)
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -1271,9 +1271,9 @@ package body Sem_Cat is
                --  For controlled type or type with controlled component, check
                --  preelaboration flag, as there may be a non-null Initialize
                --  primitive. For language versions earlier than Ada 2005,
-               --  there is no notion of preelaborable initialization, and the
-               --  rules for controlled objects are enforced in
-               --  Validate_Controlled_Object.
+               --  there is no notion of preelaborable initialization, and
+               --  Validate_Controlled_Object is used to enforce rules for
+               --  controlled objects.
 
                if (Is_Controlled (ET) or else Has_Controlled_Component (ET))
                     and then Ada_Version >= Ada_2005