From: Piotr Trojanek <trojanek@adacore.com>
Date: Wed, 1 Dec 2021 14:53:45 +0000 (+0100)
Subject: [Ada] Simplify handling of user-defined numeric literals
X-Git-Tag: upstream/12.2.0~2460
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c58372ad22f94d21b15ae2f2838e761b36b3486;p=platform%2Fupstream%2Fgcc.git

[Ada] Simplify handling of user-defined numeric literals

gcc/ada/

	* sem_util.adb (String_From_Numeric_Literal): Simplify using
	membership tests and ranges; fix whitespace.
---

diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 7064dfac8d8..bfe15fa96f6 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -28978,7 +28978,7 @@ package body Sem_Util is
                   Source_Text (Get_Source_File_Index (Loc));
       Src_Ptr : Source_Ptr := Loc;
 
-      C : Character  := Sbuffer (Src_Ptr);
+      C : Character := Sbuffer (Src_Ptr);
       --  Current source program character
 
       function Belongs_To_Numeric_Literal (C : Character) return Boolean;
@@ -28991,9 +28991,7 @@ package body Sem_Util is
       function Belongs_To_Numeric_Literal (C : Character) return Boolean is
       begin
          case C is
-            when '0' .. '9'
-               | '_' | '.' | 'e' | '#' | 'A' | 'B' | 'C' | 'D' | 'E' | 'F'
-            =>
+            when '0' .. '9' | '_' | '.' | 'e' | '#' | 'A' .. 'F' =>
                return True;
 
             --  Make sure '+' or '-' is part of an exponent
@@ -29002,7 +29000,7 @@ package body Sem_Util is
                declare
                   Prev_C : constant Character := Sbuffer (Src_Ptr - 1);
                begin
-                  return Prev_C = 'e' or else Prev_C = 'E';
+                  return Prev_C in 'e' | 'E';
                end;
 
             --  Other characters cannot belong to a numeric literal