diff options
author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-06 09:13:42 +0000 |
---|---|---|
committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-06 09:13:42 +0000 |
commit | 99037453d9a50d75d88cbe7c9e81f8a3d0e4e357 (patch) | |
tree | 166fbaa89fa43adbb98799a1535fe88c72c45bf1 /gcc/ada/g-calend.adb | |
parent | 9779ba931e62edc9d8fb81c1b0569ea4e80df162 (diff) | |
download | gcc-99037453d9a50d75d88cbe7c9e81f8a3d0e4e357.tar.gz |
2007-04-06 Javier Miranda <miranda@adacore.com>
Matt Heaney <heaney@adacore.com>
Robert Dewar <dewar@adacore.com>
a-coprnu.ads, a-cohata.ads, a-chtgop.ads, a-chtgop.adb, a-cgcaso.ads,
a-cgarso.ads, a-secain.ads, a-slcain.ads, a-shcain.ads, a-chtgke.ads,
a-chtgke.ads, a-coprnu.ads, a-contai.ads, a-chtgke.ads, a-chtgke.adb,
a-stwiha.ads, a-strhas.ads, a-lfztio.ads, a-liztio.ads, a-llfzti.ads,
a-llizti.ads, a-sfztio.ads, a-siztio.ads, a-ssizti.ads, a-stzfix.ads,
a-stzhas.ads, a-szuzha.ads, a-tiunio.ads, a-wwunio.ads, a-ztcoio.ads,
a-ztinio.ads, a-zttest.ads, a-zzunio.ads, a-astaco.ads, a-charac.ads,
a-chlat1.ads, ada.ads, a-dynpri.ads, a-flteio.ads, a-fwteio.ads,
a-inteio.ads, a-intnam.ads, a-ioexce.ads, a-iwteio.ads, a-lfteio.ads,
a-lfwtio.ads, a-liteio.ads, a-liwtio.ads, a-llftio.ads, a-llfwti.ads,
a-llitio.ads, a-lliwti.ads, a-ncelfu.ads, a-ngcefu.ads, a-ngelfu.ads,
a-nlcefu.ads, a-nlcoty.ads, a-nlelfu.ads, a-nllcef.ads, a-nllcty.ads,
a-nllefu.ads, a-nscefu.ads, a-nscoty.ads, a-nselfu.ads, a-nucoty.ads,
a-nuelfu.ads, a-numeri.ads, a-sfteio.ads, a-sfwtio.ads, a-siteio.ads,
a-siwtio.ads, a-ssitio.ads, a-ssiwti.ads, a-storio.ads, a-strfix.ads,
a-string.ads, a-stwifi.ads, a-titest.ads, a-unccon.ads, a-uncdea.ads,
a-wtcoio.ads, a-wtinio.ads, a-wttest.ads, calendar.ads, directio.ads,
i-c.ads, ioexcept.ads, machcode.ads, sequenio.ads, text_io.ads,
unchconv.ads, unchdeal.ads, a-widcha.ads, a-zchara.ads, a-stboha.ads,
a-stfiha.ads, a-coteio.ads, a-envvar.ads, a-lcteio.ads, a-llctio.ads,
a-scteio.ads, a-swbwha.ads, a-swfwha.ads, a-szbzha.ads, a-szfzha.ads,
a-tiboio.ads, a-wwboio.ads, a-zzboio.ads, a-dispat.ads, a-tgdico.ads,
expander.adb, g-socket.ads, par-labl.adb, sinput-c.adb, s-tarest.ads,
s-stchop.ads, g-expect-vms.adb, s-taprop-lynxos.adb,
s-taprop-tru64.adb, s-taprop-irix.adb,
s-taprop-hpux-dce.adb, s-traceb-hpux.adb,
s-taprop-linux.adb, s-taprop-dummy.adb, s-osprim-unix.adb,
s-osprim-solaris.adb, s-taprop-solaris.adb, s-taprop-vms.adb,
s-osprim-mingw.adb, s-taprop-mingw.adb, s-osprim-posix.adb,
s-taprop-posix.adb, a-exexpr-gcc.adb, a-ststio.adb, a-ststio.ads,
a-textio.adb, a-textio.ads, a-tideau.adb, a-tideau.ads, a-witeio.adb,
a-witeio.ads, a-wtdeau.adb, a-wtdeau.ads, g-calend.adb, g-calend.ads,
g-dirope.adb, g-expect.ads, gnatchop.adb, g-spipat.adb, g-spipat.ads,
s-direio.adb, s-direio.ads, s-fatgen.adb, s-fatgen.ads, s-parint.adb,
s-sequio.adb, s-sequio.ads, s-taprop.ads, s-valdec.adb, s-valdec.ads,
s-valint.adb, s-valint.ads, s-vallld.adb, s-vallld.ads, s-vallli.adb,
s-vallli.ads, s-valllu.adb, s-valllu.ads, s-valrea.adb, s-valrea.ads,
s-valuns.adb, s-valuns.ads, s-valuti.adb, s-valuti.ads, xref_lib.adb,
s-stchop.adb, i-vxwork-x86.ads, a-crbtgo.ads, a-crbtgo.adb,
a-coorse.ads, a-coorse.adb, a-cohama.ads, a-cohama.adb, a-ciorse.ads,
a-ciorse.adb, a-cihama.ads, a-cihama.adb, a-chtgop.ads, a-chtgop.ads,
a-coormu.adb, a-ciormu.adb, a-cihase.adb, a-cihase.ads, a-cohase.adb,
a-cohase.ads, a-swuwha.ads, a-ciormu.ads, a-coormu.ads, a-rbtgso.ads,
a-stunha.ads, a-ciorma.adb, a-coorma.adb, a-ztdeau.adb, a-ztdeau.ads,
a-ztexio.adb, a-ztexio.ads: Addition of null-exclusion to anonymous
access types.
Update documentation.
Minor rewording.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123538 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/g-calend.adb')
-rw-r--r-- | gcc/ada/g-calend.adb | 71 |
1 files changed, 37 insertions, 34 deletions
diff --git a/gcc/ada/g-calend.adb b/gcc/ada/g-calend.adb index ea8f28a3a68..3fec4a093e8 100644 --- a/gcc/ada/g-calend.adb +++ b/gcc/ada/g-calend.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1999-2005, AdaCore -- +-- Copyright (C) 1999-2006, AdaCore -- -- -- -- 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- -- @@ -41,13 +41,13 @@ package body GNAT.Calendar is ----------------- function Day_In_Year (Date : Time) return Day_In_Year_Number is - Year : Year_Number; - Month : Month_Number; - Day : Day_Number; - Dsecs : Day_Duration; + Year : Year_Number; + Month : Month_Number; + Day : Day_Number; + Day_Secs : Day_Duration; begin - Split (Date, Year, Month, Day, Dsecs); + Split (Date, Year, Month, Day, Day_Secs); return Julian_Day (Year, Month, Day) - Julian_Day (Year, 1, 1) + 1; end Day_In_Year; @@ -57,13 +57,13 @@ package body GNAT.Calendar is ----------------- function Day_Of_Week (Date : Time) return Day_Name is - Year : Year_Number; - Month : Month_Number; - Day : Day_Number; - Dsecs : Day_Duration; + Year : Year_Number; + Month : Month_Number; + Day : Day_Number; + Day_Secs : Day_Duration; begin - Split (Date, Year, Month, Day, Dsecs); + Split (Date, Year, Month, Day, Day_Secs); return Day_Name'Val ((Julian_Day (Year, Month, Day)) mod 7); end Day_Of_Week; @@ -90,8 +90,8 @@ package body GNAT.Calendar is -- Julian_Day -- ---------------- - -- Julian_Day is used to by Day_Of_Week and Day_In_Year. Note - -- that this implementation is not expensive. + -- Julian_Day is used to by Day_Of_Week and Day_In_Year. Note that this + -- implementation is not expensive. function Julian_Day (Year : Year_Number; @@ -178,21 +178,21 @@ package body GNAT.Calendar is Second : out Second_Number; Sub_Second : out Second_Duration) is - Dsecs : Day_Duration; - Secs : Natural; + Day_Secs : Day_Duration; + Secs : Natural; begin - Split (Date, Year, Month, Day, Dsecs); + Split (Date, Year, Month, Day, Day_Secs); - if Dsecs = 0.0 then + if Day_Secs = 0.0 then Secs := 0; else - Secs := Natural (Dsecs - 0.5); + Secs := Natural (Day_Secs - 0.5); end if; - Sub_Second := Second_Duration (Dsecs - Day_Duration (Secs)); - Hour := Hour_Number (Secs / 3600); - Secs := Secs mod 3600; + Sub_Second := Second_Duration (Day_Secs - Day_Duration (Secs)); + Hour := Hour_Number (Secs / 3_600); + Secs := Secs mod 3_600; Minute := Minute_Number (Secs / 60); Second := Second_Number (Secs mod 60); end Split; @@ -228,23 +228,25 @@ package body GNAT.Calendar is Second : Second_Number; Sub_Second : Second_Duration := 0.0) return Time is - Dsecs : constant Day_Duration := - Day_Duration (Hour * 3600 + Minute * 60 + Second) + - Sub_Second; + Day_Secs : constant Day_Duration := + Day_Duration (Hour * 3_600) + + Day_Duration (Minute * 60) + + Day_Duration (Second) + + Sub_Second; begin - return Time_Of (Year, Month, Day, Dsecs); + return Time_Of (Year, Month, Day, Day_Secs); end Time_Of; ----------------- -- To_Duration -- ----------------- - function To_Duration (T : access timeval) return Duration is + function To_Duration (T : not null access timeval) return Duration is procedure timeval_to_duration - (T : access timeval; - sec : access C.long; - usec : access C.long); + (T : not null access timeval; + sec : not null access C.long; + usec : not null access C.long); pragma Import (C, timeval_to_duration, "__gnat_timeval_to_duration"); Micro : constant := 10**6; @@ -260,9 +262,12 @@ package body GNAT.Calendar is -- To_Timeval -- ---------------- - function To_Timeval (D : Duration) return timeval is + function To_Timeval (D : Duration) return timeval is - procedure duration_to_timeval (Sec, Usec : C.long; T : access timeval); + procedure duration_to_timeval + (Sec : C.long; + Usec : C.long; + T : not null access timeval); pragma Import (C, duration_to_timeval, "__gnat_duration_to_timeval"); Micro : constant := 10**6; @@ -288,9 +293,7 @@ package body GNAT.Calendar is -- Week_In_Year -- ------------------ - function Week_In_Year - (Date : Ada.Calendar.Time) return Week_In_Year_Number - is + function Week_In_Year (Date : Time) return Week_In_Year_Number is Year : Year_Number; Month : Month_Number; Day : Day_Number; |