[COMMITTED,22/31] ada: Fix violations of GNAT-specific GNATcheck rules

Message ID 20250107125350.619654-22-poulhies@adacore.com
State New
Headers
Series [COMMITTED,01/31] ada: Restrict previous change made to expansion of allocators |

Commit Message

Marc Poulhiès Jan. 7, 2025, 12:53 p.m. UTC
  From: Piotr Trojanek <trojanek@adacore.com>

Code cleanup; semantics is unaffected.

gcc/ada/ChangeLog:

	* diagnostics-pretty_emitter.adb (Get_Last_Line_Char): Fix whitespace.
	* sem_aggr.adb (Resolve_Array_Aggregate): Fix style.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/diagnostics-pretty_emitter.adb | 1 -
 gcc/ada/sem_aggr.adb                   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
  

Patch

diff --git a/gcc/ada/diagnostics-pretty_emitter.adb b/gcc/ada/diagnostics-pretty_emitter.adb
index e376ae12803..c624f400169 100644
--- a/gcc/ada/diagnostics-pretty_emitter.adb
+++ b/gcc/ada/diagnostics-pretty_emitter.adb
@@ -327,7 +327,6 @@  package body Diagnostics.Pretty_Emitter is
    is
       Cur_Loc : Source_Ptr := Get_Line_End (Buf, Loc);
    begin
-
       while Cur_Loc > Buf'First
         and then Buf (Cur_Loc) in ASCII.LF | ASCII.CR
       loop
diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 5bef9e22484..562240ca4ef 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -2968,8 +2968,8 @@  package body Sem_Aggr is
                               Scope_Parent : Node_Id;
                            begin
                               if Nkind (Exp) /= N_Identifier
-                                or else not Present (Entity (Exp))
-                                or else not Present (Scope (Entity (Exp)))
+                                or else No (Entity (Exp))
+                                or else No (Scope (Entity (Exp)))
                                 or else Ekind (Scope (Entity (Exp))) /= E_Loop
                               then
                                  return OK;