diff options
| author | Robert Dewar <dewar@adacore.com> | 2014-02-06 10:08:16 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2014-02-06 11:08:16 +0100 |
| commit | 155b4fccd4c83e71b46dd47c9142d98bd848a07e (patch) | |
| tree | d112d25e6e1061513e2885f4e77370c691dc96d1 | |
| parent | c366d38c64bd0960374870043f05fe7ab08d0bd2 (diff) | |
| download | gcc-155b4fccd4c83e71b46dd47c9142d98bd848a07e.zip gcc-155b4fccd4c83e71b46dd47c9142d98bd848a07e.tar.gz gcc-155b4fccd4c83e71b46dd47c9142d98bd848a07e.tar.bz2 | |
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
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/checks.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/exp_util.ads | 2 | ||||
| -rw-r--r-- | gcc/ada/prj-util.adb | 8 | ||||
| -rw-r--r-- | gcc/ada/sem_ch13.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/sem_prag.adb | 2 |
6 files changed, 15 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 57899c7..ddd91dc 100644 --- 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 71960ce..e3241e9 100644 --- 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 8fa66a9..73f7c8f 100644 --- 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 0861b0f..625bae1 100644 --- 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 c603419..ba4427e 100644 --- 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 04759e7..dabc4bb 100644 --- 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 |