diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-01 14:37:10 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2011-08-01 14:37:10 +0200 |
| commit | e7d897b851a301c69124a1c94a13d3d766649757 (patch) | |
| tree | 10b80c95922155a511235ebfec7c842f9c6b184e | |
| parent | 460b171de54de807c8d139da4803bd0fae500622 (diff) | |
| download | gcc-e7d897b851a301c69124a1c94a13d3d766649757.zip gcc-e7d897b851a301c69124a1c94a13d3d766649757.tar.gz gcc-e7d897b851a301c69124a1c94a13d3d766649757.tar.bz2 | |
[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
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/atree.ads | 6 | ||||
| -rw-r--r-- | gcc/ada/exp_ch4.adb | 6 | ||||
| -rw-r--r-- | gcc/ada/sem_cat.adb | 6 |
4 files changed, 17 insertions, 9 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 100a298..984e7b3 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,13 @@ 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. * par-ch13.adb (P_Aspect_Specifications): Check misspelled aspect name. * par.adb: Add with for Namet.Sp. diff --git a/gcc/ada/atree.ads b/gcc/ada/atree.ads index 386dcef..40d4d8e 100644 --- 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 3256cc4..2213ec5 100644 --- 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 e262dc7..83d3d6a 100644 --- 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 |