2006-02-13 Bob Duff <duff@adacore.com>

	* s-valint.adb (Scan_Integer): Call Scan_Raw_Unsigned instead of
	Scan_Unsigned, so we do not scan leading blanks and sign twice.
	Integer'Value("- 5") and Integer'Value("-+5") now correctly
	raise Constraint_Error.

	* s-vallli.adb (Scan_Long_Long_Integer): Call
	Scan_Raw_Long_Long_Unsigned instead of Scan_Long_Long_Unsigned, so we
	do not scan leading blanks and sign twice.
	Integer'Value("- 5") and Integer'Value("-+5") now correctly
	raise Constraint_Error.

	* s-valllu.ads, s-valllu.adb (Scan_Raw_Long_Long_Unsigned,
	Scan_Long_Long_Unsigned): Split out most of the processing from
	Scan_Long_Long_Unsigned out into
	Scan_Raw_Long_Long_Unsigned, so that Val_LLI can call the Raw_ version.
	This prevents scanning leading blanks and sign twice.
	Also fixed a bug: Modular'Value("-0") should raise Constraint_Error
	See RM-3.5(44).

	* s-valuns.ads, s-valuns.adb (Scan_Raw_Unsigned, Scan_Unsigned): Split
	out most of the processing from Scan_Unsigned out into
	Scan_Raw_Unsigned, so that Val_LLI can call the Raw_ version.
	This prevents scanning leading blanks and sign twice.

	* s-valuti.ads, s-valuti.adb (Scan_Plus_Sign): Add Scan_Plus_Sign, for
	use with Modular'Value attribute.
	(Scan_Plus_Sign): Add Scan_Plus_Sign, for use with Modular'Value
	attribute.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111101 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 21 insertions, 12 deletions

diff --git a/gcc/ada/s-valuns.ads b/gcc/ada/s-valuns.ads
index bd41849e98f..7503ca4b720 100644
--- a/gcc/ada/s-valuns.ads
+++ b/gcc/ada/s-valuns.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2005, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2006, 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- --
@@ -32,25 +32,26 @@
 ------------------------------------------------------------------------------
 
 --  This package contains routines for scanning modular Unsigned
---  values for use in Text_IO.Modular, and the Value attribute.
+--  values for use in Text_IO.Modular_IO, and the Value attribute.
 
 with System.Unsigned_Types;
 
 package System.Val_Uns is
    pragma Pure;
 
-   function Scan_Unsigned
+   function Scan_Raw_Unsigned
      (Str : String;
       Ptr : access Integer;
       Max : Integer) return System.Unsigned_Types.Unsigned;
    --  This function scans the string starting at Str (Ptr.all) for a valid
    --  integer according to the syntax described in (RM 3.5(43)). The substring
-   --  scanned extends no further than Str (Max). There are three cases for the
-   --  return:
+   --  scanned extends no further than Str (Max).  Note: this does not scan
+   --  leading or trailing blanks, nor leading sign.
+   --
+   --  There are three cases for the return:
    --
-   --  If a valid integer is found after scanning past any initial spaces, then
-   --  Ptr.all is updated past the last character of the integer (but trailing
-   --  spaces are not scanned out).
+   --  If a valid integer is found, then Ptr.all is updated past the last
+   --  character of the integer.
    --
    --  If no valid integer is found, then Ptr.all points either to an initial
    --  non-digit character, or to Max + 1 if the field is all spaces and the
@@ -59,16 +60,24 @@ package System.Val_Uns is
    --  If a syntactically valid integer is scanned, but the value is out of
    --  range, or, in the based case, the base value is out of range or there
    --  is an out of range digit, then Ptr.all points past the integer, and
-   --  Constraint_Error is raised. Note that if a minus sign is present, and
-   --  the integer value is non-zero, then constraint error will be raised.
+   --  Constraint_Error is raised.
    --
    --  Note: these rules correspond to the requirements for leaving the pointer
-   --  positioned in Text_Io.Get
+   --  positioned in Text_IO.Get
    --
-   --  Note: if Str is null, i.e. if Max is less than Ptr, then this is a
+   --  Note: if Str is empty, i.e. if Max is less than Ptr, then this is a
    --  special case of an all-blank string, and Ptr is unchanged, and hence
    --  is greater than Max as required in this case.
 
+   function Scan_Unsigned
+     (Str : String;
+      Ptr : access Integer;
+      Max : Integer) return System.Unsigned_Types.Unsigned;
+   --  Same as Scan_Raw_Unsigned, except scans optional leading
+   --  blanks, and an optional leading plus sign.
+   --  Note: if a minus sign is present, Constraint_Error will be raised.
+   --  Note: trailing blanks are not scanned.
+
    function Value_Unsigned
      (Str : String) return System.Unsigned_Types.Unsigned;
    --  Used in computing X'Value (Str) where X is a modular integer type whose