exp_ch9.ads, [...]: Minor comment fixes.

2014-07-30  Bob Duff  <duff@adacore.com>

	* exp_ch9.ads, sem_prag.adb, exp_ch4.adb, sem_ch13.adb: Minor comment
	fixes.
	* treepr.ads, treepr.adb (ppp): Make this debugging routine
	accept any type covered by Union_Id.

From-SVN: r213248

7 files changed, 37 insertions, 54 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index dea492c..868ddbb 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-30  Bob Duff  <duff@adacore.com>
+
+	* exp_ch9.ads, sem_prag.adb, exp_ch4.adb, sem_ch13.adb: Minor comment
+	fixes.
+	* treepr.ads, treepr.adb (ppp): Make this debugging routine
+	accept any type covered by Union_Id.
+
 2014-07-30  Robert Dewar  <dewar@adacore.com>
 
 	* sem_ch4.adb (Analyze_If_Expression): Resolve condition before
diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index e9487f0..72e47d8 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -4529,7 +4529,7 @@ package body Exp_Ch4 is
       --  type of the access type is a task or contains tasks. In this case
       --  the call to Init (Temp.all ...) is replaced by code that ensures
       --  that tasks get activated (see Exp_Ch9.Build_Task_Allocate_Block
-      --  for details). In addition, if the type T is a task T, then the
+      --  for details). In addition, if the type T is a task type, then the
       --  first argument to Init must be converted to the task record type.
 
       declare
diff --git a/gcc/ada/exp_ch9.ads b/gcc/ada/exp_ch9.ads
index abbd4e7..d9fa7d6 100644
--- a/gcc/ada/exp_ch9.ads
+++ b/gcc/ada/exp_ch9.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2013, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2014, 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- --
@@ -173,7 +173,8 @@ package Exp_Ch9 is
    --  allocated aggregates with default initialized components. Init_Stmts
    --  contains the list of statements required to initialize the allocated
    --  aggregate. It replaces the call to Init (Args) done by
-   --  Build_Task_Allocate_Block.
+   --  Build_Task_Allocate_Block. Also used to expand allocators containing
+   --  build-in-place function calls.
 
    function Build_Wrapper_Spec
      (Subp_Id : Entity_Id;
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index f6a8707..1336e21 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -2007,7 +2007,7 @@ package body Sem_Ch13 is
                      --  the supported profile) to make sure that one of these
                      --  packages is implicitly with'ed, since we need to have
                      --  the tasking run time active for the pragma Priority to
-                     --  have any effect. Previously with with'ed the package
+                     --  have any effect. Previously we with'ed the package
                      --  System.Tasking, but this package does not trigger the
                      --  required initialization of the run-time library.
 
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 5c22206..68b9748 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -18342,9 +18342,9 @@ package body Sem_Prag is
                --  supported profile) to make sure that one of these packages
                --  is implicitly with'ed, since we need to have the tasking
                --  run time active for the pragma Priority to have any effect.
-               --  Previously with with'ed the package System.Tasking, but
-               --  this package does not trigger the required initialization
-               --  of the run-time library.
+               --  Previously we with'ed the package System.Tasking, but this
+               --  package does not trigger the required initialization of the
+               --  run-time library.
 
                declare
                   Discard : Entity_Id;
diff --git a/gcc/ada/treepr.adb b/gcc/ada/treepr.adb
index 5bc09a7..4adf382 100644
--- a/gcc/ada/treepr.adb
+++ b/gcc/ada/treepr.adb
@@ -237,15 +237,6 @@ package body Treepr is
    end p;
 
    --------
-   -- pe --
-   --------
-
-   procedure pe (E : Elist_Id) is
-   begin
-      Print_Tree_Elist (E);
-   end pe;
-
-   --------
    -- pl --
    --------
 
@@ -323,15 +314,6 @@ package body Treepr is
       end case;
    end pn;
 
-   --------
-   -- pp --
-   --------
-
-   procedure pp (N : Union_Id) is
-   begin
-      pn (N);
-   end pp;
-
    ----------------
    -- Print_Char --
    ----------------
@@ -1583,20 +1565,20 @@ package body Treepr is
    -- pt --
    --------
 
-   procedure pt (N : Node_Id) is
+   procedure pt (N : Union_Id) is
    begin
-      Print_Node_Subtree (N);
+      case N is
+         when List_Low_Bound .. List_High_Bound - 1 =>
+            Print_List_Subtree (List_Id (N));
+         when Node_Range =>
+            Print_Node_Subtree (Node_Id (N));
+         when Elist_Range =>
+            Print_Elist_Subtree (Elist_Id (N));
+         when others =>
+            pp (N);
+      end case;
    end pt;
 
-   ---------
-   -- ppp --
-   ---------
-
-   procedure ppp (N : Node_Id) is
-   begin
-      pt (N);
-   end ppp;
-
    -------------------
    -- Serial_Number --
    -------------------
diff --git a/gcc/ada/treepr.ads b/gcc/ada/treepr.ads
index 2d1fb93..b913014 100644
--- a/gcc/ada/treepr.ads
+++ b/gcc/ada/treepr.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2013, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2014, 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- --
@@ -73,20 +73,12 @@ package Treepr is
    --  the definition of Union_Id. Historically this was only for printing
    --  nodes, hence the name.
 
-   procedure pp (N : Union_Id);
-   pragma Export (Ada, pp);
-   --  Identical to pn, present for historical reasons
-
-   procedure ppp (N : Node_Id);
-   pragma Export (Ada, ppp);
-   --  Same as Print_Node_Subtree
-
-   --  The following are no longer really needed, now that pn will print
-   --  anything you throw at it.
-
-   procedure pe (E : Elist_Id);
-   pragma Export (Ada, pe);
-   --  Same as Print_Tree_Elist
+   procedure pt (N : Union_Id);
+   pragma Export (Ada, pt);
+   --  Same as pn, except prints subtrees. For Nodes, it is exactly the same
+   --  as Print_Node_Subtree. For Elists it is the same as Print_Elist_Subtree.
+   --  For Lists, it is the same as Print_Tree_List. If given anything other
+   --  than a Node, List, or Elist, same effect as pn.
 
    procedure pl (L : Int);
    pragma Export (Ada, pl);
@@ -95,8 +87,9 @@ package Treepr is
    --  on the left and add a minus sign. This just saves some typing in the
    --  debugger.
 
-   procedure pt (N : Node_Id);
-   pragma Export (Ada, pt);
-   --  Same as ppp
+   procedure pe  (N : Union_Id) renames pt;
+   procedure pp  (N : Union_Id) renames pn;
+   procedure ppp (N : Union_Id) renames pt;
+   --  Synonyms retained for historical reasons
 
 end Treepr;