[Ada] Use 'Valid instead of range check

Arnaud Charlet charlet@adacore.com
Tue Nov 15 14:44:00 GMT 2005


Tested on i686-linux, committed on trunk

This patch corrects improper coding which used a membership test instead
of a 'Valid check.

2005-11-14  Robert Dewar  <dewar@adacore.com>

	* xgnatugn.adb: Replace invalid membership test by 'Valid

-------------- next part --------------
Index: xgnatugn.adb
===================================================================
--- xgnatugn.adb	(revision 106884)
+++ xgnatugn.adb	(working copy)
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 2003-2004 Free Software Foundation, Inc.          --
+--          Copyright (C) 2003-2005, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -180,8 +180,8 @@
    Target : Target_Type;
    --  The Target variable is initialized using the command line
 
-   Valid_Characters : constant Character_Set
-     := To_Set (Span => (' ',  '~'));
+   Valid_Characters : constant Character_Set :=
+                        To_Set (Span => (' ',  '~'));
    --  This array controls which characters are permitted in the input
    --  file (after line breaks have been removed). Valid characters
    --  are all printable ASCII characters and the space character.
@@ -748,7 +748,7 @@
 
                      else
 
-                        --  Extend Seq to cover the current (known) word.
+                        --  Extend Seq to cover the current (known) word
 
                         Seq.Last := Token.Span.Last;
                         Next_Token;
@@ -1045,7 +1045,7 @@
 
             if (not Have_Conditional) or (Flag in Edition_Type) then
 
-               --  The ordinary case.
+               --  The ordinary case
 
                if not Currently_Excluding then
                   Put_Line (Output_File, Rewritten);
@@ -1068,7 +1068,7 @@
       --  case).
 
       procedure Add (Extension, Replacement : String);
-      --  Adds an extension with a custom replacement.
+      --  Adds an extension with a custom replacement
 
       ---------
       -- Add --
@@ -1294,7 +1294,7 @@
       begin
          Target := Flag_Type'Value (Argument (1));
 
-         if Target not in Target_Type then
+         if not Target'Valid then
             Valid_Command_Line := False;
          end if;
 


More information about the Gcc-patches mailing list