2009-07-13 Robert Dewar <dewar@adacore.com>

	* prj.adb, sem_ch4.adb, sem_res.adb, prj-nmsc.adb: Minor reformatting
	& comment edits.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149571 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6b28a01..7a69421 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,5 +1,10 @@
 2009-07-13  Robert Dewar  <dewar@adacore.com>
 
+       * prj.adb, sem_ch4.adb, sem_res.adb, prj-nmsc.adb: Minor reformatting
+       & comment edits.
+
+2009-07-13  Robert Dewar  <dewar@adacore.com>
+
        * opt.ads, prj-conf.adb, prj-env.adb, prj-ext.adb, prj-nmsc.adb,
        prj-proc.adb, prj-tree.adb, prj-tree.ads: Minor reformatting
 

diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb
index 82cac6b..1436c96 100644 (file)
--- a/gcc/ada/prj-nmsc.adb
+++ b/gcc/ada/prj-nmsc.adb
@@ -288,8 +288,8 @@ package body Prj.Nmsc is
    --  Output an error message. If Data.Error_Report is null, simply call
    --  Prj.Err.Error_Msg. Otherwise, disregard Flag_Location and use
    --  Error_Report. If Msg starts with "?", this is a warning, and the
-   --  string "Warning :" is adding at the beginning. If Msg starts with "<",
-   --  see comment for Err_Vars.Error_Msg_Warn
+   --  string "Warning:" is prepended to the message. If Msg starts with "<",
+   --  see comment for Err_Vars.Error_Msg_Warn.
 
    procedure Search_Directories
      (Project         : in out Project_Processing_Data;
@@ -297,10 +297,10 @@ package body Prj.Nmsc is
       For_All_Sources : Boolean);
    --  Search the source directories to find the sources. If For_All_Sources is
    --  True, check each regular file name against the naming schemes of the
-   --  different languages. Otherwise consider only the file names in the hash
-   --  table Source_Names. If Allow_Duplicate_Basenames, then files with the
-   --  same base names are authorized within a project for source-based
-   --  languages (never for unit based languages)
+   --  various languages. Otherwise consider only the file names in hash table
+   --  Source_Names. If Allow_Duplicate_Basenames then files with identical
+   --  base names are permitted within a project for source-based languages
+   --  (never for unit based languages).
 
    procedure Check_File
      (Project           : in out Project_Processing_Data;
@@ -321,13 +321,12 @@ package body Prj.Nmsc is
    --  File_Name is the same as Name, but has been normalized.
    --  Display_File_Name, however, has not been normalized.
    --
-   --  Source_Directory is the directory in which the file
-   --  was found. It hasn't been normalized (nor has had links resolved).
-   --  It should not end with a directory separator, to avoid duplicates
-   --  later on.
+   --  Source_Directory is the directory in which the file was found. It is
+   --  neither normalized nor has had links resolved, and must not end with a
+   --  a directory separator, to avoid duplicates later on.
    --
    --  If For_All_Sources is True, then all possible file names are analyzed
-   --  otherwise only those currently set in the Source_Names htable.
+   --  otherwise only those currently set in the Source_Names hash table.
 
    procedure Check_File_Naming_Schemes
      (In_Tree               : Project_Tree_Ref;

diff --git a/gcc/ada/prj.adb b/gcc/ada/prj.adb
index f9726be..a8c22f7 100644 (file)
--- a/gcc/ada/prj.adb
+++ b/gcc/ada/prj.adb
@@ -52,13 +52,15 @@ package body Prj is
    subtype Known_Casing is Casing_Type range All_Upper_Case .. Mixed_Case;
 
    type Cst_String_Access is access constant String;
+
    All_Lower_Case_Image : aliased constant String := "lowercase";
    All_Upper_Case_Image : aliased constant String := "UPPERCASE";
    Mixed_Case_Image     : aliased constant String := "MixedCase";
+
    The_Casing_Images : constant array (Known_Casing) of Cst_String_Access :=
-     (All_Lower_Case => All_Lower_Case_Image'Access,
-      All_Upper_Case => All_Upper_Case_Image'Access,
-      Mixed_Case     => Mixed_Case_Image'Access);
+                         (All_Lower_Case => All_Lower_Case_Image'Access,
+                          All_Upper_Case => All_Upper_Case_Image'Access,
+                          Mixed_Case     => Mixed_Case_Image'Access);
 
    Project_Empty : constant Project_Data :=
                      (Qualifier                      => Unspecified,
@@ -171,6 +173,7 @@ package body Prj is
    is
       Dont_Care : Boolean;
       pragma Warnings (Off, Dont_Care);
+
    begin
       if not Debug.Debug_Flag_N then
          if Current_Verbosity = High then
@@ -196,7 +199,9 @@ package body Prj is
    procedure Delete_All_Temp_Files (Tree : Project_Tree_Ref) is
       Dont_Care : Boolean;
       pragma Warnings (Off, Dont_Care);
+
       Path : Path_Name_Type;
+
    begin
       if not Debug.Debug_Flag_N then
          for Index in
@@ -681,7 +686,8 @@ package body Prj is
 
    procedure Record_Temp_File
      (Tree : Project_Tree_Ref;
-      Path : Path_Name_Type) is
+      Path : Path_Name_Type)
+   is
    begin
       Temp_Files_Table.Append (Tree.Private_Part.Temp_Files, Path);
    end Record_Temp_File;

diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index ccfcf1f..774d7ae 100644 (file)
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -2047,7 +2047,6 @@ package body Sem_Ch4 is
 
             Set_Etype (L, T_F);
          end if;
-
       end Try_One_Interp;
 
       procedure Analyze_Set_Membership;
@@ -2062,7 +2061,6 @@ package body Sem_Ch4 is
          Alt               : Node_Id;
          Index             : Interp_Index;
          It                : Interp;
-
          Candidate_Interps : Node_Id;
          Common_Type       : Entity_Id := Empty;
 
@@ -2094,22 +2092,24 @@ package body Sem_Ch4 is
                else
                   Get_First_Interp (Alt, Index, It);
                   while Present (It.Typ) loop
-                     if
-                       not Has_Compatible_Type (Candidate_Interps, It.Typ)
+                     if not
+                       Has_Compatible_Type (Candidate_Interps, It.Typ)
                      then
                         Remove_Interp (Index);
                      end if;
+
                      Get_Next_Interp (Index, It);
                   end loop;
 
                   Get_First_Interp (Alt, Index, It);
+
                   if No (It.Typ) then
                      Error_Msg_N ("alternative has no legal type", Alt);
                      return;
                   end if;
 
-                  --  If alternative is not overloaded, we have a
-                  --  unique type for all of them.
+                  --  If alternative is not overloaded, we have a unique type
+                  --  for all of them.
 
                   Set_Etype (Alt, It.Typ);
                   Get_Next_Interp (Index, It);

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 42a7e12..48fed24 100644 (file)
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -6768,7 +6768,7 @@ package body Sem_Res is
          end loop;
       end Resolve_Set_Membership;
 
-   --  start of processing for Resolve_Membership_Op
+   --  Start of processing for Resolve_Membership_Op
 
    begin
       if L = Error or else R = Error then