sem_ch8.adb, [...]: Change name Write_Scopes to ws.

2010-08-10  Robert Dewar  <dewar@adacore.com>

	* sem_ch8.adb, sem_ch8.ads: Change name Write_Scopes to ws.
	* sem_util.adb: Minor reformatting.

From-SVN: r163067

4 files changed, 29 insertions, 26 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 56fdcb6..f0f418d 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-10  Robert Dewar  <dewar@adacore.com>
+
+	* sem_ch8.adb, sem_ch8.ads: Change name Write_Scopes to ws.
+	* sem_util.adb: Minor reformatting.
+
 2010-08-10  Javier Miranda  <miranda@adacore.com>
 
 	* sem_aggr.adb (Resolve_Extension_Aggregate): Warn on the use of C++
diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index 15995b8..71d6813 100644
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -511,11 +511,6 @@ package body Sem_Ch8 is
    procedure Write_Info;
    --  Write debugging information on entities declared in current scope
 
-   procedure Write_Scopes;
-   pragma Warnings (Off, Write_Scopes);
-   pragma Export (Ada, Write_Scopes);
-   --  Debugging information: dump all entities on scope stack
-
    --------------------------------
    -- Analyze_Exception_Renaming --
    --------------------------------
@@ -7732,11 +7727,11 @@ package body Sem_Ch8 is
       Write_Eol;
    end Write_Info;
 
-   -----------------
-   -- Write_Scopes --
-   -----------------
+   --------
+   -- ws --
+   --------
 
-   procedure Write_Scopes is
+   procedure ws is
       S : Entity_Id;
    begin
       for J in reverse 1 .. Scope_Stack.Last loop
@@ -7746,6 +7741,6 @@ package body Sem_Ch8 is
          Write_Name (Chars (S));
          Write_Eol;
       end loop;
-   end Write_Scopes;
+   end ws;
 
 end Sem_Ch8;
diff --git a/gcc/ada/sem_ch8.ads b/gcc/ada/sem_ch8.ads
index 0d17cd1..a7f0af9 100644
--- a/gcc/ada/sem_ch8.ads
+++ b/gcc/ada/sem_ch8.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2008, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2010, 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- --
@@ -131,27 +131,30 @@ package Sem_Ch8 is
    function Present_System_Aux (N : Node_Id := Empty) return Boolean;
    --  Return True if the auxiliary system file has been successfully loaded.
    --  Otherwise attempt to load it, using the name supplied by a previous
-   --  Extend_System pragma, and report on the success of the load.
-   --  If N is present, it is a selected component whose prefix is System,
-   --  or else a with-clause on system. N is absent when the function is
-   --  called to find the visibility of implicit operators.
+   --  Extend_System pragma, and report on the success of the load. If N is
+   --  present, it is a selected component whose prefix is System, or else a
+   --  with-clause on system. N is absent when the function is called to find
+   --  the visibility of implicit operators.
 
    procedure Restore_Scope_Stack (Handle_Use : Boolean := True);
    procedure Save_Scope_Stack (Handle_Use : Boolean := True);
-   --  These two procedures are called from Semantics, when a unit U1 is
-   --  to be compiled in the course of the compilation of another unit U2.
-   --  This happens whenever Rtsfind is called. U1, the unit retrieved by
-   --  Rtsfind, must be compiled in its own context, and the current scope
-   --  stack containing U2 and local scopes must be made unreachable. On
-   --  return, the contents of the scope stack must be made accessible again.
-   --  The flag Handle_Use indicates whether local use clauses must be
-   --  removed/installed. In the case of inlining of instance bodies, the
-   --  visibility handling is done fully in Inline_Instance_Body, and use
-   --  clauses are handled there.
+   --  These two procedures are called from Semantics, when a unit U1 is to
+   --  be compiled in the course of the compilation of another unit U2. This
+   --  happens whenever Rtsfind is called. U1, the unit retrieved by Rtsfind,
+   --  must be compiled in its own context, and the current scope stack
+   --  containing U2 and local scopes must be made unreachable. On return, the
+   --  contents of the scope stack must be made accessible again. The flag
+   --  Handle_Use indicates whether local use clauses must be removed or
+   --  installed. In the case of inlining of instance bodies, the visibility
+   --  handling is done fully in Inline_Instance_Body, and use clauses are
+   --  handled there.
 
    procedure Set_Use (L : List_Id);
    --  Find use clauses that are declarative items in a package declaration
    --  and  set the potentially use-visible flags of imported entities before
    --  analyzing the corresponding package body.
 
+   procedure ws;
+   --  Debugging routine for use in gdb: dump all entities on scope stack
+
 end Sem_Ch8;
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 156d247..72f2624 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -1598,7 +1598,7 @@ package body Sem_Util is
                Next_Elmt (ADT);
 
                --  Skip secondary dispatch table referencing predefined
-               --  primitives
+               --  primitives.
 
                pragma Assert (Has_Suffix (Node (ADT), 'Z'));
                Next_Elmt (ADT);