diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-15 09:28:43 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-15 09:28:43 +0000 |
commit | 0311af6afb62db5816bc1b2e2e7ea3d7f27cee71 (patch) | |
tree | 34addcebd3391924517515b8f61a38087d82089e /gcc/ada/a-wtedit.adb | |
parent | 2e70d70dab8bc2f09b71041dc9719a5fbed638ab (diff) | |
download | gcc-0311af6afb62db5816bc1b2e2e7ea3d7f27cee71.tar.gz |
2006-02-13 Robert Dewar <dewar@adacore.com>
* s-gloloc-mingw.adb, a-cgaaso.ads, a-stzmap.adb, a-stzmap.adb,
a-stzmap.ads, a-ztcoio.adb, a-ztedit.adb, a-ztedit.ads, a-ztenau.adb,
a-ztenau.ads, a-colien.adb, a-colien.ads, a-colire.adb, a-colire.ads,
a-comlin.adb, a-decima.adb, a-decima.ads, a-direio.adb, a-direio.adb,
a-direio.adb, a-direio.ads, a-ngcoty.adb, a-ngcoty.ads, a-nuflra.adb,
a-nuflra.ads, a-sequio.adb, a-sequio.ads, a-sequio.ads, a-storio.ads,
a-stream.ads, a-ststio.adb, a-ststio.adb, a-ststio.ads, a-ststio.ads,
a-stwima.adb, a-stwima.adb, a-stwima.ads, a-stwise.adb, a-teioed.adb,
a-teioed.ads, a-ticoau.adb, a-ticoau.ads, a-ticoio.adb, a-tasatt.ads,
a-tideau.adb, a-tideau.ads, a-tideio.adb, a-tideio.ads, a-tienau.adb,
a-tienau.ads, a-tienio.adb, a-tienio.ads, a-tifiio.ads, a-tiflau.adb,
a-tiflau.ads, a-tiflio.adb, a-tiflio.adb, a-tiflio.ads, a-tigeau.ads,
a-tiinau.adb, a-tiinau.ads, a-tiinio.adb, a-tiinio.ads, a-timoio.adb,
a-timoio.ads, a-titest.adb, a-titest.ads, a-wtcoio.adb, a-wtdeau.adb,
a-wtdeau.ads, a-wtdeio.adb, a-wtdeio.ads, a-wtedit.adb, a-wtedit.adb,
a-wtedit.ads, a-wtenau.adb, a-wtenau.ads, a-wtenau.ads, a-wtenio.adb,
a-wtenio.ads, a-wtfiio.adb, a-wtfiio.ads, a-wtflau.adb, a-wtflau.ads,
a-wtflio.adb, a-wtflio.adb, a-wtflio.ads, a-wtgeau.ads, a-wtinau.adb,
a-wtinau.ads, a-wtinio.adb, a-wtinio.ads, a-wtmoau.adb, a-wtmoau.ads,
a-wtmoio.adb, a-wtmoio.ads, xref_lib.adb, xref_lib.ads, xr_tabls.adb,
g-boubuf.adb, g-boubuf.ads, g-cgideb.adb, g-io.adb, gnatdll.adb,
g-pehage.adb, i-c.ads, g-spitbo.adb, g-spitbo.ads, mdll.adb,
mlib-fil.adb, mlib-utl.adb, mlib-utl.ads, prj-env.adb, prj-tree.adb,
prj-tree.ads, prj-util.adb, s-arit64.adb, s-asthan.ads, s-auxdec.adb,
s-auxdec.ads, s-chepoo.ads, s-direio.adb, s-direio.ads, s-errrep.adb,
s-errrep.ads, s-fileio.adb, s-fileio.ads, s-finroo.adb, s-finroo.ads,
s-gloloc.adb, s-gloloc.ads, s-io.adb, s-io.ads, s-rpc.adb,
s-rpc.ads, s-shasto.ads, s-sequio.adb, s-stopoo.ads, s-stratt.adb,
s-stratt.ads, s-taasde.adb, s-taasde.ads, s-tadert.adb, s-sequio.ads,
s-taskin.adb, s-tasque.adb, s-tasque.ads, s-wchjis.ads, makegpr.adb,
a-coinve.adb, a-cidlli.adb, eval_fat.adb, exp_dist.ads, exp_smem.adb,
fmap.adb, g-dyntab.ads, g-expect.adb, lib-xref.ads, osint.adb,
par-load.adb, restrict.adb, sinput-c.ads, a-cdlili.adb,
system-vms.ads, system-vms-zcx.ads, system-vms_64.ads: Minor
reformatting.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111023 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/a-wtedit.adb')
-rw-r--r-- | gcc/ada/a-wtedit.adb | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gcc/ada/a-wtedit.adb b/gcc/ada/a-wtedit.adb index b4736232310..ce2380a56fc 100644 --- a/gcc/ada/a-wtedit.adb +++ b/gcc/ada/a-wtedit.adb @@ -6,7 +6,7 @@ -- -- -- 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- -- @@ -53,7 +53,7 @@ package body Ada.Wide_Text_IO.Editing is -- Blank_When_Zero -- --------------------- - function Blank_When_Zero (Pic : in Picture) return Boolean is + function Blank_When_Zero (Pic : Picture) return Boolean is begin return Pic.Contents.Original_BWZ; end Blank_When_Zero; @@ -194,7 +194,7 @@ package body Ada.Wide_Text_IO.Editing is -- Expand -- ------------ - function Expand (Picture : in String) return String is + function Expand (Picture : String) return String is Result : String (1 .. MAX_PICSIZE); Picture_Index : Integer := Picture'First; Result_Index : Integer := Result'First; @@ -308,9 +308,9 @@ package body Ada.Wide_Text_IO.Editing is Sign_Position : Integer := Pic.Sign_Position; -- may float. - Answer : Wide_String (1 .. Pic.Picture.Length); - Last : Integer; - Currency_Pos : Integer := Pic.Start_Currency; + Answer : Wide_String (1 .. Pic.Picture.Length); + Last : Integer; + Currency_Pos : Integer := Pic.Start_Currency; Dollar : Boolean := False; -- Overridden immediately if necessary @@ -1095,7 +1095,7 @@ package body Ada.Wide_Text_IO.Editing is -- The following ensures that we return B and not b being careful not -- to break things which expect lower case b for blank. See CXF3A02. - function Pic_String (Pic : in Picture) return String is + function Pic_String (Pic : Picture) return String is Temp : String (1 .. Pic.Contents.Picture.Length) := Pic.Contents.Picture.Expanded; begin @@ -2757,11 +2757,10 @@ package body Ada.Wide_Text_IO.Editing is Format_Rec.Original_BWZ := Blank_When_Zero; Precalculate (Format_Rec); - -- False only if Blank_When_0 is True but the pic string - -- has a '*' + -- False only if Blank_When_0 is True but the pic string has a '*' - return not Blank_When_Zero or - Strings_Fixed.Index (Expanded_Pic, "*") = 0; + return not Blank_When_Zero + or else Strings_Fixed.Index (Expanded_Pic, "*") = 0; end; exception |