diff options
Diffstat (limited to 'gcc/ada/a-teioed.adb')
| -rw-r--r-- | gcc/ada/a-teioed.adb | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/gcc/ada/a-teioed.adb b/gcc/ada/a-teioed.adb index bd868308ed4..86a3b7c12cd 100644 --- a/gcc/ada/a-teioed.adb +++ b/gcc/ada/a-teioed.adb @@ -90,7 +90,7 @@ package body Ada.Text_IO.Editing is Result_Index := Result_Index + Count - 1; - -- Last + 1 was a ')' throw it away too. + -- Last + 1 was a ')' throw it away too Picture_Index := Last + 2; @@ -139,10 +139,10 @@ package body Ada.Text_IO.Editing is In_Currency : Boolean := False; Dollar : Boolean := False; - -- Overridden immediately if necessary. + -- Overridden immediately if necessary Zero : Boolean := True; - -- Set to False when a non-zero digit is output. + -- Set to False when a non-zero digit is output begin @@ -236,7 +236,7 @@ package body Ada.Text_IO.Editing is for J in reverse Last .. Answer'Last loop exit when J = Pic.Radix_Position; - -- Do this test First, Separator_Character can equal Pic.Floater. + -- Do this test First, Separator_Character can equal Pic.Floater if Answer (J) = Pic.Floater then exit; @@ -692,11 +692,11 @@ package body Ada.Text_IO.Editing is end case; end loop; - -- Now get rid of Blank_when_Zero and complete Star fill. + -- Now get rid of Blank_when_Zero and complete Star fill if Zero and Pic.Blank_When_Zero then - -- Value is zero, and blank it. + -- Value is zero, and blank it Last := Answer'Last; @@ -897,7 +897,7 @@ package body Ada.Text_IO.Editing is raise Picture_Error; end if; - -- Two decimal points is a no-no. + -- Two decimal points is a no-no Answer.Has_Fraction := True; Answer.End_Of_Fraction := J; @@ -917,7 +917,7 @@ package body Ada.Text_IO.Editing is Answer.Start_Of_Int := Answer.End_Of_Int + 1; end if; - -- No significant (intger) digits needs a null range. + -- No significant (integer) digits needs a null range return Answer; end Parse_Number_String; @@ -953,7 +953,7 @@ package body Ada.Text_IO.Editing is type Legality is (Okay, Reject); State : Legality := Reject; - -- Start in reject, which will reject null strings. + -- Start in reject, which will reject null strings Index : Pic_Index := Pic.Picture.Expanded'First; @@ -1067,7 +1067,7 @@ package body Ada.Text_IO.Editing is begin Debug_Start ("Floating_Bracket"); - -- Two different floats not allowed. + -- Two different floats not allowed if Pic.Floater /= '!' and then Pic.Floater /= '<' then raise Picture_Error; @@ -1393,6 +1393,7 @@ package body Ada.Text_IO.Editing is raise Picture_Error; else -- Overwrite Floater and Start_Float + Pic.Floater := '*'; Pic.Start_Float := Index; Star_Suppression; @@ -1411,7 +1412,7 @@ package body Ada.Text_IO.Editing is Pic.End_Float := Invalid_Position; end if; - -- A single dollar does not a floating make. + -- A single dollar does not a floating make Number_Completion; return; @@ -1423,8 +1424,8 @@ package body Ada.Text_IO.Editing is Pic.End_Float := Invalid_Position; end if; - -- Only one dollar before the sign is okay, - -- but doesn't float. + -- Only one dollar before the sign is okay, but doesn't + -- float. Pic.Radix_Position := Index; Skip; @@ -1459,7 +1460,7 @@ package body Ada.Text_IO.Editing is -- Set to True if a '_', '0', '/', 'B', or 'b' is encountered Must_Float : Boolean := False; - -- Set to true if a '#' occurs after an insert. + -- Set to true if a '#' occurs after an insert begin Debug_Start ("Leading_Pound"); @@ -1548,7 +1549,7 @@ package body Ada.Text_IO.Editing is when '9' => if State /= Okay then - -- A single '#' doesn't float. + -- A single '#' doesn't float Pic.Floater := '!'; Pic.Start_Float := Invalid_Position; @@ -1565,8 +1566,8 @@ package body Ada.Text_IO.Editing is Pic.End_Float := Invalid_Position; end if; - -- Only one pound before the sign is okay, - -- but doesn't float. + -- Only one pound before the sign is okay, but doesn't + -- float. Pic.Radix_Position := Index; Skip; @@ -1631,7 +1632,7 @@ package body Ada.Text_IO.Editing is return; end if; - -- Will return in Okay state if a '9' was seen. + -- Will return in Okay state if a '9' was seen end loop; end Number; @@ -2075,7 +2076,7 @@ package body Ada.Text_IO.Editing is -- Picture -- ------------- - -- Note that Picture can be called in either State. + -- Note that Picture can be called in either State -- It will set state to Valid only if a 9 is encountered or floating -- currency is called. @@ -2136,7 +2137,7 @@ package body Ada.Text_IO.Editing is Debug_Start ("Picture_Bracket"); Pic.Sign_Position := Index; - -- Treat as a floating sign, and unwind otherwise. + -- Treat as a floating sign, and unwind otherwise Pic.Floater := '<'; Pic.Start_Float := Index; @@ -2208,7 +2209,7 @@ package body Ada.Text_IO.Editing is Pic.Sign_Position := Index; - -- Treat as a floating sign, and unwind otherwise. + -- Treat as a floating sign, and unwind otherwise Pic.Floater := '-'; Pic.Start_Float := Index; @@ -2253,7 +2254,7 @@ package body Ada.Text_IO.Editing is when 'Z' | 'z' => - -- Can't have Z and a floating sign. + -- Can't have Z and a floating sign if State = Okay then Set_State (Reject); @@ -2272,7 +2273,7 @@ package body Ada.Text_IO.Editing is Pic.End_Float := Invalid_Position; end if; - -- Don't assume that state is okay, haven't seen a digit. + -- Don't assume that state is okay, haven't seen a digit Picture; return; @@ -2293,7 +2294,7 @@ package body Ada.Text_IO.Editing is Debug_Start ("Picture_Plus"); Pic.Sign_Position := Index; - -- Treat as a floating sign, and unwind otherwise. + -- Treat as a floating sign, and unwind otherwise Pic.Floater := '+'; Pic.Start_Float := Index; @@ -2320,7 +2321,7 @@ package body Ada.Text_IO.Editing is Pic.Max_Leading_Digits := Pic.Max_Leading_Digits + 1; Pic.End_Float := Index; Skip; - Set_State (Okay); -- "++" is enough. + Set_State (Okay); -- "++" is enough Floating_Plus; Trailing_Currency; return; @@ -2341,7 +2342,7 @@ package body Ada.Text_IO.Editing is Set_State (Reject); end if; - -- Can't have Z and a floating sign. + -- Can't have Z and a floating sign Pic.Picture.Expanded (Index) := 'Z'; -- consistency @@ -2366,7 +2367,7 @@ package body Ada.Text_IO.Editing is Pic.End_Float := Invalid_Position; end if; - -- Don't assume that state is okay, haven't seen a digit. + -- Don't assume that state is okay, haven't seen a digit Picture; return; @@ -2427,12 +2428,12 @@ package body Ada.Text_IO.Editing is end case; -- Blank when zero either if the PIC does not contain a '9' or if - -- requested by the user and no '*' + -- requested by the user and no '*'. Pic.Blank_When_Zero := (Computed_BWZ or Pic.Blank_When_Zero) and not Pic.Star_Fill; - -- Star fill if '*' and no '9'. + -- Star fill if '*' and no '9' Pic.Star_Fill := Pic.Star_Fill and Computed_BWZ; @@ -2706,7 +2707,7 @@ package body Ada.Text_IO.Editing is when Constraint_Error => - -- To deal with special cases like null strings. + -- To deal with special cases like null strings raise Picture_Error; end Precalculate; |