exp_util.ads, [...]: Minor reformatting and code clean ups.

2014-02-06  Robert Dewar  <dewar@adacore.com>

	* exp_util.ads, checks.adb, sem_prag.adb, prj-util.adb, sem_ch13.adb:
	Minor reformatting and code clean ups.

From-SVN: r207540

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 57899c72ee2c63c02ff86ed4e3ed6b9caa1f7819..ddd91dc6ad0367336622fddcb8fdd6b7abd6a5b6 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-06  Robert Dewar  <dewar@adacore.com>
+
+       * exp_util.ads, checks.adb, sem_prag.adb, prj-util.adb, sem_ch13.adb:
+       Minor reformatting and code clean ups.
+
 2014-02-06  Pascal Obry  <obry@adacore.com>
 
        * prj-util.adb (For_Interface_Sources): Skip non compilable languages.

diff --git a/gcc/ada/checks.adb b/gcc/ada/checks.adb
index 71960ce87c26874c95af6f8225e62df010844470..e3241e97a81a38574804e737f99aa2944996f3b9 100644 (file)
--- a/gcc/ada/checks.adb
+++ b/gcc/ada/checks.adb
@@ -2589,7 +2589,7 @@ package body Checks is
          --  predicated subtype itself, rather than some covering type. This
          --  is likely to be a common error, and thus deserves a warning.
 
-         elsif Present (S) and then  S = Predicate_Function (Typ) then
+         elsif Present (S) and then S = Predicate_Function (Typ) then
             Error_Msg_N
               ("predicate check includes a function call that "
                & "requires a predicate check??", Parent (N));

diff --git a/gcc/ada/exp_util.ads b/gcc/ada/exp_util.ads
index 8fa66a9eae1c4ed4985b559dce7035407e054def..73f7c8f0730e5a0442d3dff4252a6767c629c1a9 100644 (file)
--- a/gcc/ada/exp_util.ads
+++ b/gcc/ada/exp_util.ads
@@ -834,7 +834,7 @@ package Exp_Util is
    function Within_Case_Or_If_Expression (N : Node_Id) return Boolean;
    --  Determine whether arbitrary node N is within a case or an if expression
 
-   function Within_Internal_Subprogram  return Boolean;
+   function Within_Internal_Subprogram return Boolean;
    --  Indicates that some expansion is taking place within the body of a
    --  predefined primitive operation. Some expansion activity (e.g. predicate
    --  checks) is disabled in such.

diff --git a/gcc/ada/prj-util.adb b/gcc/ada/prj-util.adb
index 0861b0f2c3d21c50c24423c7171f7714d74df11c..625bae185c31943d2cbc999f4dd6bb58780d7ce7 100644 (file)
--- a/gcc/ada/prj-util.adb
+++ b/gcc/ada/prj-util.adb
@@ -467,10 +467,14 @@ package body Prj.Util is
          --  the interface for standalone libraries.
 
          if Sid.Kind = Spec
+           and then not Sid.Project.Externally_Built
            and then not Sid.Locally_Removed
            and then (Project.Standalone_Library = No
-                     or else Sid.Declared_In_Interfaces)
-           and then Sid.Dep_Name /= No_File -- for non compilable languages
+                      or else Sid.Declared_In_Interfaces)
+
+           --  Handle case of non-compilable languages
+
+           and then Sid.Dep_Name /= No_File
          then
             Action (Sid);
 

diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index c603419398004db8c5b83b7806f5d97444205aa6..ba4427e7e7e4c4890814e652c08bcc2a20e8309d 100644 (file)
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -9430,7 +9430,7 @@ package body Sem_Ch13 is
       Inside_Freezing_Actions := Inside_Freezing_Actions - 1;
 
       --  If we have a type with predicates, build predicate function. This
-      --  is not needed in the generic casee, and is not needed within TSS
+      --  is not needed in the generic case, and is not needed within TSS
       --  subprograms and other predefined primitives.
 
       if Non_Generic_Case

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 04759e708134777af7ccdad11dbb8ba38f2739a3..dabc4bbf89362c9a11f52820f15910484d9b1b55 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -1680,7 +1680,7 @@ package body Sem_Prag is
                  and then Present (Component_Associations (Expr))
                then
                   Error_Msg_N
-                    ("dependency clause contains extra parenthesis", Expr);
+                    ("dependency clause contains extra parentheses", Expr);
 
                --  Otherwise the expression is a malformed construct