aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2022-07-26 17:33:06 +0200
committerMarc Poulhiès <poulhies@adacore.com>2022-09-05 09:21:05 +0200
commit95d9823d289fa8fe7be0a299993027f5e6e7824f (patch)
tree6dfcb2dbcf7d1452d8e32cdf8e2c911c5e8b110f
parentbd8405bfbe069763f7de0091c51f9c3000a966d5 (diff)
downloadgcc-95d9823d289fa8fe7be0a299993027f5e6e7824f.zip
gcc-95d9823d289fa8fe7be0a299993027f5e6e7824f.tar.gz
gcc-95d9823d289fa8fe7be0a299993027f5e6e7824f.tar.bz2
[Ada] Small cleanup in body of System.Value_R
This is mostly stylistic but also adds a couple of missing comments. gcc/ada/ * libgnat/s-valuer.adb (Scan_Decimal_Digits): Consistently avoid initializing local variables. (Scan_Integral_Digits): Likewise. (Scan_Raw_Real): Likewise and add a couple of comments.
-rw-r--r--gcc/ada/libgnat/s-valuer.adb29
1 files changed, 20 insertions, 9 deletions
diff --git a/gcc/ada/libgnat/s-valuer.adb b/gcc/ada/libgnat/s-valuer.adb
index b474f84..fc91660 100644
--- a/gcc/ada/libgnat/s-valuer.adb
+++ b/gcc/ada/libgnat/s-valuer.adb
@@ -184,7 +184,7 @@ package body System.Value_R is
UmaxB : constant Uns := Precision_Limit / Uns (Base);
-- Numbers bigger than UmaxB overflow if multiplied by base
- Precision_Limit_Reached : Boolean := False;
+ Precision_Limit_Reached : Boolean;
-- Set to True if addition of a digit will cause Value to be superior
-- to Precision_Limit.
@@ -198,7 +198,7 @@ package body System.Value_R is
Temp : Uns;
-- Temporary
- Trailing_Zeros : Natural := 0;
+ Trailing_Zeros : Natural;
-- Number of trailing zeros at a given point
begin
@@ -209,12 +209,17 @@ package body System.Value_R is
Precision_Limit_Reached := True;
else
Extra := 0;
+ Precision_Limit_Reached := False;
end if;
if Round then
Precision_Limit_Just_Reached := False;
end if;
+ -- Initialize trailing zero counter
+
+ Trailing_Zeros := 0;
+
-- The function precondition is that the first character is a valid
-- digit.
@@ -362,7 +367,7 @@ package body System.Value_R is
UmaxB : constant Uns := Precision_Limit / Uns (Base);
-- Numbers bigger than UmaxB overflow if multiplied by base
- Precision_Limit_Reached : Boolean := False;
+ Precision_Limit_Reached : Boolean;
-- Set to True if addition of a digit will cause Value to be superior
-- to Precision_Limit.
@@ -383,6 +388,8 @@ package body System.Value_R is
Scale := 0;
Extra := 0;
+ Precision_Limit_Reached := False;
+
if Round then
Precision_Limit_Just_Reached := False;
end if;
@@ -494,28 +501,32 @@ package body System.Value_R is
After_Point : Boolean;
-- True if a decimal should be parsed
- Base_Char : Character := ASCII.NUL;
- -- Character used to set the base. If Nul this means that default
+ Base_Char : Character;
+ -- Character used to set the base. If it is Nul, this means that default
-- base is used.
- Base_Violation : Boolean := False;
+ Base_Violation : Boolean;
-- If True some digits where not in the base. The real is still scanned
-- till the end even if an error will be raised.
+ Expon : Integer;
+ -- Exponent as an Integer
+
Index : Integer;
-- Local copy of string pointer
Start : Positive;
+ -- Index of the first non-blank character
Value : Uns;
-- Mantissa as an Integer
- Expon : Integer;
-
begin
-- The default base is 10
- Base := 10;
+ Base := 10;
+ Base_Char := ASCII.NUL;
+ Base_Violation := False;
-- We do not tolerate strings with Str'Last = Positive'Last