-- --
-- B o d y --
-- --
--- 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- --
begin
Scan_Sign (Str, Ptr, Max, Minus, Start);
- Uval := Scan_Unsigned (Str, Ptr, Max);
+
+ if Str (Ptr.all) not in '0' .. '9' then
+ Ptr.all := Start;
+ raise Constraint_Error;
+ end if;
+
+ Uval := Scan_Raw_Unsigned (Str, Ptr, Max);
-- Deal with overflow cases, and also with maximum negative number
-- --
-- B o d y --
-- --
--- 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- --
package body System.Val_LLI is
- ---------------------------
- -- Scn_Long_Long_Integer --
- ---------------------------
+ ----------------------------
+ -- Scan_Long_Long_Integer --
+ ----------------------------
function Scan_Long_Long_Integer
(Str : String;
begin
Scan_Sign (Str, Ptr, Max, Minus, Start);
- Uval := Scan_Long_Long_Unsigned (Str, Ptr, Max);
+
+ if Str (Ptr.all) not in '0' .. '9' then
+ Ptr.all := Start;
+ raise Constraint_Error;
+ end if;
+
+ Uval := Scan_Raw_Long_Long_Unsigned (Str, Ptr, Max);
-- Deal with overflow cases, and also with maximum negative number
if Uval > Long_Long_Unsigned (Long_Long_Integer'Last) then
if Minus
- and then Uval = Long_Long_Unsigned (-(Long_Long_Integer'First)) then
+ and then Uval = Long_Long_Unsigned (-(Long_Long_Integer'First))
+ then
return Long_Long_Integer'First;
else
raise Constraint_Error;
-- --
-- B o d y --
-- --
--- 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- --
package body System.Val_LLU is
- -----------------------------
- -- Scan_Long_Long_Unsigned --
- -----------------------------
+ ---------------------------------
+ -- Scan_Raw_Long_Long_Unsigned --
+ ---------------------------------
- function Scan_Long_Long_Unsigned
+ function Scan_Raw_Long_Long_Unsigned
(Str : String;
Ptr : access Integer;
Max : Integer) return Long_Long_Unsigned
Expon : Integer;
-- Exponent value
- Minus : Boolean := False;
- -- Set to True if minus sign is present, otherwise to False. Note that
- -- a minus sign is permissible for the singular case of -0, and in any
- -- case the pointer is left pointing past a negative integer literal.
-
Overflow : Boolean := False;
-- Set True if overflow is detected at any point
- Start : Positive;
- -- Save location of first non-blank character
-
Base_Char : Character;
-- Base character (# or :) in based case
-- Digit value
begin
- Scan_Sign (Str, Ptr, Max, Minus, Start);
-
- if Str (Ptr.all) not in '0' .. '9' then
- Ptr.all := Start;
- raise Constraint_Error;
- end if;
-
P := Ptr.all;
Uval := Character'Pos (Str (P)) - Character'Pos ('0');
P := P + 1;
-- Return result, dealing with sign and overflow
- if Overflow or else (Minus and then Uval /= 0) then
+ if Overflow then
raise Constraint_Error;
else
return Uval;
end if;
+ end Scan_Raw_Long_Long_Unsigned;
+
+ -----------------------------
+ -- Scan_Long_Long_Unsigned --
+ -----------------------------
+
+ function Scan_Long_Long_Unsigned
+ (Str : String;
+ Ptr : access Integer;
+ Max : Integer) return Long_Long_Unsigned
+ is
+ Start : Positive;
+ -- Save location of first non-blank character
+
+ begin
+ Scan_Plus_Sign (Str, Ptr, Max, Start);
+
+ if Str (Ptr.all) not in '0' .. '9' then
+ Ptr.all := Start;
+ raise Constraint_Error;
+ end if;
+
+ return Scan_Raw_Long_Long_Unsigned (Str, Ptr, Max);
end Scan_Long_Long_Unsigned;
------------------------------
-- --
-- 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- --
-- --
------------------------------------------------------------------------------
--- This package contains routines for scanning unsigned Long_Long_Unsigned
+-- This package contains routines for scanning modular Long_Long_Unsigned
-- values for use in Text_IO.Modular_IO, and the Value attribute.
with System.Unsigned_Types;
package System.Val_LLU is
pragma Pure;
- function Scan_Long_Long_Unsigned
+ function Scan_Raw_Long_Long_Unsigned
(Str : String;
Ptr : access Integer;
Max : Integer) return System.Unsigned_Types.Long_Long_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
-- 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_Long_Long_Unsigned
+ (Str : String;
+ Ptr : access Integer;
+ Max : Integer) return System.Unsigned_Types.Long_Long_Unsigned;
+ -- Same as Scan_Raw_Long_Long_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_Long_Long_Unsigned
(Str : String) return System.Unsigned_Types.Long_Long_Unsigned;
-- Used in computing X'Value (Str) where X is a modular integer type whose
-- --
-- B o d y --
-- --
--- 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- --
package body System.Val_Uns is
- -------------------
- -- Scan_Unsigned --
- -------------------
+ -----------------------
+ -- Scan_Raw_Unsigned --
+ -----------------------
- function Scan_Unsigned
+ function Scan_Raw_Unsigned
(Str : String;
Ptr : access Integer;
Max : Integer) return Unsigned
Expon : Integer;
-- Exponent value
- Minus : Boolean := False;
- -- Set to True if minus sign is present, otherwise to False. Note that
- -- a minus sign is permissible for the singular case of -0, and in any
- -- case the pointer is left pointing past a negative integer literal.
-
Overflow : Boolean := False;
-- Set True if overflow is detected at any point
- Start : Positive;
- -- Save location of first non-blank character
-
Base_Char : Character;
-- Base character (# or :) in based case
-- Digit value
begin
- Scan_Sign (Str, Ptr, Max, Minus, Start);
-
- if Str (Ptr.all) not in '0' .. '9' then
- Ptr.all := Start;
- raise Constraint_Error;
- end if;
-
P := Ptr.all;
Uval := Character'Pos (Str (P)) - Character'Pos ('0');
P := P + 1;
-- Return result, dealing with sign and overflow
- if Overflow or else (Minus and then Uval /= 0) then
+ if Overflow then
raise Constraint_Error;
else
return Uval;
end if;
+ end Scan_Raw_Unsigned;
+
+ -------------------
+ -- Scan_Unsigned --
+ -------------------
+
+ function Scan_Unsigned
+ (Str : String;
+ Ptr : access Integer;
+ Max : Integer) return Unsigned
+ is
+ Start : Positive;
+ -- Save location of first non-blank character
+
+ begin
+ Scan_Plus_Sign (Str, Ptr, Max, Start);
+
+ if Str (Ptr.all) not in '0' .. '9' then
+ Ptr.all := Start;
+ raise Constraint_Error;
+ end if;
+
+ return Scan_Raw_Unsigned (Str, Ptr, Max);
end Scan_Unsigned;
--------------------
-- --
-- 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- --
------------------------------------------------------------------------------
-- 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
-- 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
-- --
-- B o d y --
-- --
--- 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- --
end Scan_Exponent;
+ --------------------
+ -- Scan_Plus_Sign --
+ --------------------
+
+ procedure Scan_Plus_Sign
+ (Str : String;
+ Ptr : access Integer;
+ Max : Integer;
+ Start : out Positive)
+ is
+ P : Natural := Ptr.all;
+
+ begin
+ if P > Max then
+ raise Constraint_Error;
+ end if;
+
+ -- Scan past initial blanks
+
+ while Str (P) = ' ' loop
+ P := P + 1;
+
+ if P > Max then
+ Ptr.all := P;
+ raise Constraint_Error;
+ end if;
+ end loop;
+
+ Start := P;
+
+ -- Skip past an initial plus sign
+
+ if Str (P) = '+' then
+ P := P + 1;
+
+ if P > Max then
+ Ptr.all := Start;
+ raise Constraint_Error;
+ end if;
+ end if;
+
+ Ptr.all := P;
+ end Scan_Plus_Sign;
+
---------------
-- Scan_Sign --
---------------
-- --
-- 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- --
-- is greater than Max as required in this case. Constraint_Error is
-- also raised in this case.
+ procedure Scan_Plus_Sign
+ (Str : String;
+ Ptr : access Integer;
+ Max : Integer;
+ Start : out Positive);
+ -- Same as Scan_Sign, but allows only plus, not minus.
+ -- This is used for modular types.
+
function Scan_Exponent
(Str : String;
Ptr : access Integer;
projects / gcc.git / commitdiff