make.adb, [...]: Minor reformatting.

2010-06-18  Robert Dewar  <dewar@adacore.com>

	* make.adb, sem_cat.adb: Minor reformatting.
	* sem_eval.adb: Fix typos.

From-SVN: r160991

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c5225cb..7c6fa2d 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-18  Robert Dewar  <dewar@adacore.com>
+
+       * make.adb, sem_cat.adb: Minor reformatting.
+       * sem_eval.adb: Fix typos.
+
 2010-06-18  Pascal Obry  <obry@adacore.com>
 
        * prj-nmsc.adb: Fix source filenames casing in debug output.

diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index bd67136..1368821 100644 (file)
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -6078,7 +6078,7 @@ package body Make is
                exception
                   when others =>
 
-                     --  Delete the temporary mapping file, if one was created
+                     --  Delete the temporary mapping file if one was created
 
                      if Mapping_Path /= No_Path then
                         Delete_Temporary_File (Project_Tree, Mapping_Path);
@@ -6089,7 +6089,7 @@ package body Make is
                      raise;
                end;
 
-               --  If -dn was not specified, delete the temporary mapping file,
+               --  If -dn was not specified, delete the temporary mapping file
                --  if one was created.
 
                if Mapping_Path /= No_Path then

diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index 1cde64f..1f4ed10 100644 (file)
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -1079,8 +1079,7 @@ package body Sem_Cat is
          --  implicit call, and must be treated as such.
 
          if Present (E)
-              and then
-            (Comes_From_Source (E) or else Nkind (E) /= N_Aggregate)
+           and then (Comes_From_Source (E) or else Nkind (E) /= N_Aggregate)
          then
             null;
 
@@ -1240,8 +1239,8 @@ package body Sem_Cat is
                   PEE := Parent (EE);
 
                   if Nkind (PEE) = N_Full_Type_Declaration
-                       and then not Static_Discriminant_Expr
-                                     (Discriminant_Specifications (PEE))
+                    and then not Static_Discriminant_Expr
+                                   (Discriminant_Specifications (PEE))
                   then
                      Error_Msg_N
                        ("non-static discriminant in preelaborated unit",

diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb
index 433c025..53c5e48 100644 (file)
--- a/gcc/ada/sem_eval.adb
+++ b/gcc/ada/sem_eval.adb
@@ -1805,7 +1805,7 @@ package body Sem_Eval is
    ---------------------------------
 
    --  We can fold to a static expression if the condition and both constituent
-   --  expressions are static. Othewise the only required processing is to do
+   --  expressions are static. Otherwise, the only required processing is to do
    --  the check for non-static context for the then and else expressions.
 
    procedure Eval_Conditional_Expression (N : Node_Id) is