diff options
| author | Stephane Glondu <steph@glondu.net> | 2015-05-18 17:29:08 +0200 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2015-05-18 17:29:08 +0200 |
| commit | 9f5dc295161e3213fff7c786a406ffc12ee2c83f (patch) | |
| tree | 7fdda080b1bdbc0f7af60a50f7d04df681538551 | |
| parent | 737cc9b48fd839c7840be153bb59cb5bf65932ac (diff) | |
| parent | 90ee23cb84d7a394d7fe97f5c153079c6a06c351 (diff) | |
Merge tag 'upstream/2.04'
Upstream version 2.04
71 files changed, 747 insertions, 633 deletions
@@ -1,90 +1,94 @@ -src/calendar.cmo: src/time.cmi src/date.cmi src/calendar_builder.cmi \ +src/calendar.cmo : src/time.cmi src/date.cmi src/calendar_builder.cmi \ src/calendar.cmi -src/calendar.cmx: src/time.cmx src/date.cmx src/calendar_builder.cmx \ +src/calendar.cmx : src/time.cmx src/date.cmx src/calendar_builder.cmx \ src/calendar.cmi -src/calendar_builder.cmo: src/utils.cmi src/time_sig.cmi src/time_Zone.cmi \ +src/calendar_builder.cmo : src/utils.cmi src/time_sig.cmi src/time_Zone.cmi \ src/period.cmi src/date_sig.cmi src/calendar_builder.cmi -src/calendar_builder.cmx: src/utils.cmx src/time_sig.cmi src/time_Zone.cmx \ +src/calendar_builder.cmx : src/utils.cmx src/time_sig.cmi src/time_Zone.cmx \ src/period.cmi src/date_sig.cmi src/calendar_builder.cmi -src/date.cmo: src/utils.cmi src/time_Zone.cmi src/period.cmi src/date.cmi -src/date.cmx: src/utils.cmx src/time_Zone.cmx src/period.cmi src/date.cmi -src/fcalendar.cmo: src/ftime.cmi src/date.cmi src/calendar_builder.cmi \ +src/date.cmo : src/utils.cmi src/time_Zone.cmi src/period.cmi src/date.cmi +src/date.cmx : src/utils.cmx src/time_Zone.cmx src/period.cmi src/date.cmi +src/fcalendar.cmo : src/ftime.cmi src/date.cmi src/calendar_builder.cmi \ src/fcalendar.cmi -src/fcalendar.cmx: src/ftime.cmx src/date.cmx src/calendar_builder.cmx \ +src/fcalendar.cmx : src/ftime.cmx src/date.cmx src/calendar_builder.cmx \ src/fcalendar.cmi -src/ftime.cmo: src/utils.cmi src/time_Zone.cmi src/period.cmi src/ftime.cmi -src/ftime.cmx: src/utils.cmx src/time_Zone.cmx src/period.cmi src/ftime.cmi -src/printer.cmo: src/time_Zone.cmi src/time.cmi src/period.cmi src/ftime.cmi \ - src/fcalendar.cmi src/date.cmi src/calendar.cmi src/printer.cmi -src/printer.cmx: src/time_Zone.cmx src/time.cmx src/period.cmi src/ftime.cmx \ - src/fcalendar.cmx src/date.cmx src/calendar.cmx src/printer.cmi -src/time.cmo: src/utils.cmi src/time_Zone.cmi src/period.cmi src/time.cmi -src/time.cmx: src/utils.cmx src/time_Zone.cmx src/period.cmi src/time.cmi -src/time_Zone.cmo: src/time_Zone.cmi -src/time_Zone.cmx: src/time_Zone.cmi -src/utils.cmo: src/utils.cmi -src/utils.cmx: src/utils.cmi -src/version.cmo: src/version.cmi -src/version.cmx: src/version.cmi -src/calendar.cmi: src/time.cmi src/date.cmi src/calendar_sig.cmi -src/calendar_builder.cmi: src/time_sig.cmi src/date_sig.cmi \ +src/ftime.cmo : src/utils.cmi src/time_Zone.cmi src/period.cmi src/ftime.cmi +src/ftime.cmx : src/utils.cmx src/time_Zone.cmx src/period.cmi src/ftime.cmi +src/printer.cmo : src/utils.cmi src/time_Zone.cmi src/time.cmi \ + src/period.cmi src/ftime.cmi src/fcalendar.cmi src/date.cmi \ + src/calendar.cmi src/printer.cmi +src/printer.cmx : src/utils.cmx src/time_Zone.cmx src/time.cmx \ + src/period.cmi src/ftime.cmx src/fcalendar.cmx src/date.cmx \ + src/calendar.cmx src/printer.cmi +src/time.cmo : src/utils.cmi src/time_Zone.cmi src/period.cmi src/time.cmi +src/time.cmx : src/utils.cmx src/time_Zone.cmx src/period.cmi src/time.cmi +src/time_Zone.cmo : src/time_Zone.cmi +src/time_Zone.cmx : src/time_Zone.cmi +src/utils.cmo : src/utils.cmi +src/utils.cmx : src/utils.cmi +src/version.cmo : src/version.cmi +src/version.cmx : src/version.cmi +src/calendar.cmi : src/time.cmi src/date.cmi src/calendar_sig.cmi +src/calendar_builder.cmi : src/time_sig.cmi src/date_sig.cmi \ src/calendar_sig.cmi -src/calendar_sig.cmi: src/time_sig.cmi src/time_Zone.cmi src/period.cmi \ +src/calendar_sig.cmi : src/time_sig.cmi src/time_Zone.cmi src/period.cmi \ src/date_sig.cmi -src/date.cmi: src/date_sig.cmi -src/date_sig.cmi: src/period.cmi -src/fcalendar.cmi: src/ftime.cmi src/date.cmi src/calendar_sig.cmi -src/ftime.cmi: src/time_sig.cmi -src/period.cmi: -src/printer.cmi: src/time.cmi src/ftime.cmi src/fcalendar.cmi src/date.cmi \ +src/date.cmi : src/date_sig.cmi +src/date_sig.cmi : src/period.cmi +src/fcalendar.cmi : src/ftime.cmi src/date.cmi src/calendar_sig.cmi +src/ftime.cmi : src/time_sig.cmi +src/period.cmi : +src/printer.cmi : src/time.cmi src/ftime.cmi src/fcalendar.cmi src/date.cmi \ src/calendar.cmi -src/time.cmi: src/time_sig.cmi -src/time_Zone.cmi: -src/time_sig.cmi: src/time_Zone.cmi src/period.cmi -src/utils.cmi: -src/version.cmi: -tests/gen_test.cmo: tests/gen_test.cmi -tests/gen_test.cmx: tests/gen_test.cmi -tests/test.cmo: tests/test_timezone.cmo tests/test_time.cmo \ +src/time.cmi : src/time_sig.cmi +src/time_Zone.cmi : +src/time_sig.cmi : src/time_Zone.cmi src/period.cmi +src/utils.cmi : +src/version.cmi : +tests/gen_test.cmo : tests/gen_test.cmi +tests/gen_test.cmx : tests/gen_test.cmi +tests/test.cmo : tests/test_timezone.cmo tests/test_time.cmo \ tests/test_printer.cmo tests/test_pcalendar.cmo tests/test_ftime.cmo \ tests/test_fpcalendar.cmo tests/test_fcalendar.cmo tests/test_date.cmo \ tests/test_calendar.cmo -tests/test.cmx: tests/test_timezone.cmx tests/test_time.cmx \ +tests/test.cmx : tests/test_timezone.cmx tests/test_time.cmx \ tests/test_printer.cmx tests/test_pcalendar.cmx tests/test_ftime.cmx \ tests/test_fpcalendar.cmx tests/test_fcalendar.cmx tests/test_date.cmx \ tests/test_calendar.cmx -tests/test_calendar.cmo: src/utils.cmi src/time_Zone.cmi src/time.cmi \ +tests/test_calendar.cmo : src/utils.cmi src/time_Zone.cmi src/time.cmi \ src/period.cmi tests/gen_test.cmi src/date.cmi src/calendar.cmi -tests/test_calendar.cmx: src/utils.cmx src/time_Zone.cmx src/time.cmx \ +tests/test_calendar.cmx : src/utils.cmx src/time_Zone.cmx src/time.cmx \ src/period.cmi tests/gen_test.cmx src/date.cmx src/calendar.cmx -tests/test_date.cmo: src/time_Zone.cmi src/period.cmi tests/gen_test.cmi \ +tests/test_date.cmo : src/time_Zone.cmi src/period.cmi tests/gen_test.cmi \ src/date.cmi -tests/test_date.cmx: src/time_Zone.cmx src/period.cmi tests/gen_test.cmx \ +tests/test_date.cmx : src/time_Zone.cmx src/period.cmi tests/gen_test.cmx \ src/date.cmx -tests/test_fcalendar.cmo: src/utils.cmi src/time_Zone.cmi src/time.cmi \ +tests/test_fcalendar.cmo : src/utils.cmi src/time_Zone.cmi src/time.cmi \ src/period.cmi tests/gen_test.cmi src/fcalendar.cmi src/date.cmi -tests/test_fcalendar.cmx: src/utils.cmx src/time_Zone.cmx src/time.cmx \ +tests/test_fcalendar.cmx : src/utils.cmx src/time_Zone.cmx src/time.cmx \ src/period.cmi tests/gen_test.cmx src/fcalendar.cmx src/date.cmx -tests/test_fpcalendar.cmo: src/utils.cmi src/time_Zone.cmi src/time.cmi \ +tests/test_fpcalendar.cmo : src/utils.cmi src/time_Zone.cmi src/time.cmi \ src/period.cmi tests/gen_test.cmi src/fcalendar.cmi src/date.cmi -tests/test_fpcalendar.cmx: src/utils.cmx src/time_Zone.cmx src/time.cmx \ +tests/test_fpcalendar.cmx : src/utils.cmx src/time_Zone.cmx src/time.cmx \ src/period.cmi tests/gen_test.cmx src/fcalendar.cmx src/date.cmx -tests/test_ftime.cmo: src/utils.cmi src/time_Zone.cmi src/period.cmi \ +tests/test_ftime.cmo : src/utils.cmi src/time_Zone.cmi src/period.cmi \ tests/gen_test.cmi src/ftime.cmi -tests/test_ftime.cmx: src/utils.cmx src/time_Zone.cmx src/period.cmi \ +tests/test_ftime.cmx : src/utils.cmx src/time_Zone.cmx src/period.cmi \ tests/gen_test.cmx src/ftime.cmx -tests/test_pcalendar.cmo: src/utils.cmi src/time_Zone.cmi src/time.cmi \ +tests/test_pcalendar.cmo : src/utils.cmi src/time_Zone.cmi src/time.cmi \ src/period.cmi tests/gen_test.cmi src/date.cmi src/calendar.cmi -tests/test_pcalendar.cmx: src/utils.cmx src/time_Zone.cmx src/time.cmx \ +tests/test_pcalendar.cmx : src/utils.cmx src/time_Zone.cmx src/time.cmx \ src/period.cmi tests/gen_test.cmx src/date.cmx src/calendar.cmx -tests/test_printer.cmo: src/time_Zone.cmi src/time.cmi src/printer.cmi \ - tests/gen_test.cmi src/date.cmi src/calendar.cmi -tests/test_printer.cmx: src/time_Zone.cmx src/time.cmx src/printer.cmx \ - tests/gen_test.cmx src/date.cmx src/calendar.cmx -tests/test_time.cmo: src/utils.cmi src/time_Zone.cmi src/time.cmi \ +tests/test_printer.cmo : src/utils.cmi src/time_Zone.cmi src/time.cmi \ + src/printer.cmi tests/gen_test.cmi src/ftime.cmi src/date.cmi \ + src/calendar.cmi +tests/test_printer.cmx : src/utils.cmx src/time_Zone.cmx src/time.cmx \ + src/printer.cmx tests/gen_test.cmx src/ftime.cmx src/date.cmx \ + src/calendar.cmx +tests/test_time.cmo : src/utils.cmi src/time_Zone.cmi src/time.cmi \ src/period.cmi tests/gen_test.cmi -tests/test_time.cmx: src/utils.cmx src/time_Zone.cmx src/time.cmx \ +tests/test_time.cmx : src/utils.cmx src/time_Zone.cmx src/time.cmx \ src/period.cmi tests/gen_test.cmx -tests/test_timezone.cmo: src/time_Zone.cmi tests/gen_test.cmi -tests/test_timezone.cmx: src/time_Zone.cmx tests/gen_test.cmx -tests/gen_test.cmi: +tests/test_timezone.cmo : src/time_Zone.cmi tests/gen_test.cmi +tests/test_timezone.cmx : src/time_Zone.cmx tests/gen_test.cmx +tests/gen_test.cmi : @@ -6,6 +6,14 @@ Mark "*": bug fixed. Mark "!": change that can break compatibility with older version of the library =============================================================================== +version 2.04, 2014-10-29: +=========================== +* [Makefile] Fix minor issues with ocamlfind and 'make install' (from + Christopher Zimmermann). +o [Printer] In function from_fstring of sub-module Ftime, Fcalendar, and + Precise_Fcalendar, the number of seconds corresponding to %S may be a floating + point number (from Christophe Troestler' suggestion). + version 2.03.2, 2012-06-26: =========================== o [Compilation] Compatibility with OCaml 4 diff --git a/Makefile.in b/Makefile.in index 14c9a63..9eb3026 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,7 +45,7 @@ HAS_NATDYNLINK=@HAS_NATDYNLINK@ NAME = calendar NAMELIB = calendarLib -VERSION = 2.03.2 +VERSION = 2.04 LIBDIR = target @@ -120,7 +120,8 @@ src/version.ml: Makefile echo "let date = \"`date`\"" >> $@ META: Makefile - echo "description = \"$(NAME) library\"" > $@ + echo "name = \"$(NAME)\"" > $@ + echo "description = \"$(NAME) library\"" >> $@ echo "version = \"$(VERSION)\"" >> $@ echo "archive(byte) = \"$(NAMELIB).cma\"" >> $@ echo "archive(native) = \"$(NAMELIB).cmxa\"" >> $@ @@ -177,10 +178,10 @@ $(NAMELIB).ps: $(SRC) $(CAMLWEB) --ps -o $@ $^ ifeq ($(CAMLMAJORVERSION),3) -utils/example.ml: utils/example.ml.3 +utils/example.ml: utils/example.ml.3 Makefile cp $< $@ else -utils/example.ml: utils/example.ml.4 +utils/example.ml: utils/example.ml.4 Makefile cp $< $@ endif @@ -209,7 +210,7 @@ headers: install: $(LIBS) $(CLIBS) META @if [ "`sed -n -e 's/version = "\([0-9.+dev]*\)"/\1/p' META`" = "$(VERSION)" ]; then \ (if test -d `ocamlfind install -help | grep destdir | sed -e "s/.*default: \(.*\))/\1/"`/$(NAME); then $(MAKE) uninstall; fi;\ - $(CAMLFIND) install $(NAME) target/*.cm[ioxa] target/*.cmx[as] $(MLI) $(CLIBS) META); \ + $(CAMLFIND) install $(NAME) target/*.cm* $(MLI) $(CLIBS) META); \ else \ (echo; echo "Not the good version. Please, do :"; \ echo " make clean && make"; \ @@ -222,7 +223,7 @@ uninstall: # Exporting ########### -EXPORT_DIR= $$HOME/WWW/prog/$(NAME) +EXPORT_DIR= $$HOME/EXPORT/$(NAME) TMP_DIR = $$HOME/tmp ROOT= $$HOME/DEV/calendar @@ -234,6 +235,7 @@ export: doc rm -rf $(TMP_DIR)/trunk (cd $(ROOT)/tags; svn commit -m "v $(VERSION)") rm -rf $(EXPORT_DIR)/doc + mkdir -p $(EXPORT_DIR) cp -rf CHANGES doc $(EXPORT_DIR) cp -rf $(ROOT)/tags/v$(VERSION) $(TMP_DIR)/$(NAME)-$(VERSION) cp -rf .depend configure config.status doc $(TMP_DIR)/$(NAME)-$(VERSION) @@ -271,6 +273,7 @@ clean: for i in . src tests utils; do \ rm -f $$i/*~ $$i/\#* $$i/*.cm[iox] $$i/*.*a $$i/*$(OBJ_EXT) $$i/a.out; \ done + rm -f utils/example.ml dist-clean distclean: clean rm -rf $(NAME).ps.gz doc $(LIBDIR) diff --git a/config.status b/config.status index a63f768..709641a 100755 --- a/config.status +++ b/config.status @@ -598,8 +598,8 @@ S["LIBOBJS"]="" S["HAS_NATDYNLINK"]="yes" S["LIBEXT"]=".a" S["OBJEXT"]=".o" -S["OCAMLLIB"]="/localhome/julien/godi/lib/ocaml/std-lib" -S["OCAMLMAJOR"]="3" +S["OCAMLLIB"]="/localhome/julien/.opam/4.00.1/lib/ocaml" +S["OCAMLMAJOR"]="4" S["OCAMLBEST"]="opt" S["OCAMLDOT"]="ocamldot" S["OCAMLWC"]="ocamlwc" diff --git a/doc/Calendar.Precise.html b/doc/Calendar.Precise.html index b0077b0..ec57f49 100644 --- a/doc/Calendar.Precise.html +++ b/doc/Calendar.Precise.html @@ -34,15 +34,16 @@ <title>Calendar.Precise</title> </head> <body> -<div class="navbar"> <a href="Calendar.html">Up</a> +<div class="navbar"> <a class="up" href="Calendar.html" title="Calendar">Up</a> </div> -<center><h1>Module <a href="type_Calendar.Precise.html">Calendar.Precise</a></h1></center> -<br> -<pre><span class="keyword">module</span> Precise: <code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = Date and module Time = Time</code></pre>More precise implementation of calendar in which seconds are integer.<br> +<h1>Module <a href="type_Calendar.Precise.html">Calendar.Precise</a></h1> +<pre><span class="keyword">module</span> Precise: <code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = Date and module Time = Time</code></pre><div class="info"> +More precise implementation of calendar in which seconds are integer.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Date.html">Date</a>: <code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="type"> </code></pre><div class="info"> Date implementation used by this calendar. </div> @@ -56,49 +57,49 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sun</span></code></td> +<code><span id="TYPEELTday.Sun"><span class="constructor">Sun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mon</span></code></td> +<code><span id="TYPEELTday.Mon"><span class="constructor">Mon</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Tue</span></code></td> +<code><span id="TYPEELTday.Tue"><span class="constructor">Tue</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Wed</span></code></td> +<code><span id="TYPEELTday.Wed"><span class="constructor">Wed</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Thu</span></code></td> +<code><span id="TYPEELTday.Thu"><span class="constructor">Thu</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Fri</span></code></td> +<code><span id="TYPEELTday.Fri"><span class="constructor">Fri</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sat</span></code></td> +<code><span id="TYPEELTday.Sat"><span class="constructor">Sat</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Days of the week.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -108,84 +109,84 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jan</span></code></td> +<code><span id="TYPEELTmonth.Jan"><span class="constructor">Jan</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Feb</span></code></td> +<code><span id="TYPEELTmonth.Feb"><span class="constructor">Feb</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mar</span></code></td> +<code><span id="TYPEELTmonth.Mar"><span class="constructor">Mar</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Apr</span></code></td> +<code><span id="TYPEELTmonth.Apr"><span class="constructor">Apr</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">May</span></code></td> +<code><span id="TYPEELTmonth.May"><span class="constructor">May</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jun</span></code></td> +<code><span id="TYPEELTmonth.Jun"><span class="constructor">Jun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jul</span></code></td> +<code><span id="TYPEELTmonth.Jul"><span class="constructor">Jul</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Aug</span></code></td> +<code><span id="TYPEELTmonth.Aug"><span class="constructor">Aug</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sep</span></code></td> +<code><span id="TYPEELTmonth.Sep"><span class="constructor">Sep</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Oct</span></code></td> +<code><span id="TYPEELTmonth.Oct"><span class="constructor">Oct</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Nov</span></code></td> +<code><span id="TYPEELTmonth.Nov"><span class="constructor">Nov</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Dec</span></code></td> +<code><span id="TYPEELTmonth.Dec"><span class="constructor">Dec</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Months of the year.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -203,7 +204,7 @@ The different fields of a calendar.<br> </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> int -> int -> int -> <a href="Calendar_sig.S.html#TYPEsecond">second</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make year month day hour minute second</code> makes the calendar "year-month-day; hour-minute-second".<br> @@ -239,7 +240,7 @@ Return the Modified Julian day. It is <code class="code"><span class="constructor">Julian</span> day - 2 400 000.5</code> (more precise than <code class="code"><span class="constructor">Date</span>.from_mjd</code>).<br> </div> <br> -<span id="2_Conversions"><h2>Conversions</h2></span><br> +<h2 id="2_Conversions">Conversions</h2><br> <br> Those functions have the same behaviour as those defined in <a href="Time_sig.S.html"><code class="code"><span class="constructor">Time_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -253,7 +254,7 @@ Those functions have the same behaviour as those defined in <b>See also</b> <a href="Time_sig.S.html#VALfrom_gmt">Time_sig.S.from_gmt</a><br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -294,7 +295,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALsecond">Time_sig.S.second</a><br> </div> <br> -<span id="2_Calendarsarecomparable"><h2>Calendars are comparable</h2></span><br> +<h2 id="2_Calendarsarecomparable">Calendars are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Equality function between two calendars.<br> <b>See also</b> <a href="Utils.Comparable.html#VALequal">Utils.Comparable.equal.</a><br> @@ -330,7 +331,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALis_am">Time_sig.S.is_am</a><br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALto_unixtm"><span class="keyword">val</span> to_unixtm</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> Unix.tm</code></pre><div class="info"> Convert a calendar into the <code class="code">unix.tm</code> type. The field <code class="code">isdst</code> is always <code class="code"><span class="keyword">false</span></code>. More precise than @@ -368,12 +369,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.<br> <b>Since</b> 1.03<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of seconds between two calendars. </div> <br> -<span id="2_Arithmeticoperationsoncalendarsandperiods"><h2>Arithmetic operations on calendars and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsoncalendarsandperiods">Arithmetic operations on calendars and periods</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> diff --git a/doc/Calendar.html b/doc/Calendar.html index 0b7edd7..0eb466b 100644 --- a/doc/Calendar.html +++ b/doc/Calendar.html @@ -28,18 +28,19 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Calendar</title> </head> <body> -<div class="navbar"><a href="Calendar_builder.html">Previous</a> - <a href="index.html">Up</a> - <a href="Fcalendar.html">Next</a> +<div class="navbar"><a class="pre" href="Calendar_builder.html" title="Calendar_builder">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Fcalendar.html" title="Fcalendar">Next</a> </div> -<center><h1>Module <a href="type_Calendar.html">Calendar</a></h1></center> -<br> -<pre><span class="keyword">module</span> Calendar: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Calendar implementation in which seconds are integer. +<h1>Module <a href="type_Calendar.html">Calendar</a></h1> +<pre><span class="keyword">module</span> Calendar: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Calendar implementation in which seconds are integer. <p> This module uses float. Then results may be unprecise, especially comparison of calendars which differ with few seconds. In this case, consider to use module <code class="code"><span class="constructor">Precise</span></code>.<br> +</div> <hr width="100%"> <pre><span class="keyword">include</span> <a href="Calendar_sig.S.html">Calendar_sig.S</a></pre> <pre><span class="keyword">module</span> <a href="Calendar.Precise.html">Precise</a>: <code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = Date and module Time = Time</code></pre><div class="info"> diff --git a/doc/Calendar_builder.Make.html b/doc/Calendar_builder.Make.html index 18cddd5..54debfc 100644 --- a/doc/Calendar_builder.Make.html +++ b/doc/Calendar_builder.Make.html @@ -35,16 +35,17 @@ <title>Calendar_builder.Make</title> </head> <body> -<div class="navbar"> <a href="Calendar_builder.html">Up</a> - <a href="Calendar_builder.Make_Precise.html">Next</a> +<div class="navbar"> <a class="up" href="Calendar_builder.html" title="Calendar_builder">Up</a> + <a class="post" href="Calendar_builder.Make_Precise.html" title="Calendar_builder.Make_Precise">Next</a> </div> -<center><h1>Functor <a href="type_Calendar_builder.Make.html">Calendar_builder.Make</a></h1></center> -<br> -<pre><span class="keyword">module</span> Make: <div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">D</span></code><code class="code"> : </code><code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">T</span></code><code class="code"> : </code><code class="type"><a href="Time_sig.S.html">Time_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = D and module Time = T</code></div></div></pre>Implement a calendar from a date implementation and a time implementation. +<h1>Functor <a href="type_Calendar_builder.Make.html">Calendar_builder.Make</a></h1> +<pre><span class="keyword">module</span> Make: <div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">D</span></code><code class="code"> : </code><code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">T</span></code><code class="code"> : </code><code class="type"><a href="Time_sig.S.html">Time_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = D and module Time = T</code></div></div></pre><div class="info"> +Implement a calendar from a date implementation and a time implementation. <p> This module uses float. Then results may be very unprecise.<br> <b>Since</b> 2.0<br> +</div> <table border="0" cellpadding="3" width="100%"> <tr> <td align="left" valign="top" width="1%%"><b>Parameters: </b></td> @@ -66,7 +67,7 @@ </table> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Date.html">Date</a>: <code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="type"> </code></pre><div class="info"> Date implementation used by this calendar. </div> @@ -80,49 +81,49 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sun</span></code></td> +<code><span id="TYPEELTday.Sun"><span class="constructor">Sun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mon</span></code></td> +<code><span id="TYPEELTday.Mon"><span class="constructor">Mon</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Tue</span></code></td> +<code><span id="TYPEELTday.Tue"><span class="constructor">Tue</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Wed</span></code></td> +<code><span id="TYPEELTday.Wed"><span class="constructor">Wed</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Thu</span></code></td> +<code><span id="TYPEELTday.Thu"><span class="constructor">Thu</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Fri</span></code></td> +<code><span id="TYPEELTday.Fri"><span class="constructor">Fri</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sat</span></code></td> +<code><span id="TYPEELTday.Sat"><span class="constructor">Sat</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Days of the week.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -132,84 +133,84 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jan</span></code></td> +<code><span id="TYPEELTmonth.Jan"><span class="constructor">Jan</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Feb</span></code></td> +<code><span id="TYPEELTmonth.Feb"><span class="constructor">Feb</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mar</span></code></td> +<code><span id="TYPEELTmonth.Mar"><span class="constructor">Mar</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Apr</span></code></td> +<code><span id="TYPEELTmonth.Apr"><span class="constructor">Apr</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">May</span></code></td> +<code><span id="TYPEELTmonth.May"><span class="constructor">May</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jun</span></code></td> +<code><span id="TYPEELTmonth.Jun"><span class="constructor">Jun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jul</span></code></td> +<code><span id="TYPEELTmonth.Jul"><span class="constructor">Jul</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Aug</span></code></td> +<code><span id="TYPEELTmonth.Aug"><span class="constructor">Aug</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sep</span></code></td> +<code><span id="TYPEELTmonth.Sep"><span class="constructor">Sep</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Oct</span></code></td> +<code><span id="TYPEELTmonth.Oct"><span class="constructor">Oct</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Nov</span></code></td> +<code><span id="TYPEELTmonth.Nov"><span class="constructor">Nov</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Dec</span></code></td> +<code><span id="TYPEELTmonth.Dec"><span class="constructor">Dec</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Months of the year.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -227,7 +228,7 @@ The different fields of a calendar.<br> </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> int -> int -> int -> <a href="Calendar_sig.S.html#TYPEsecond">second</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make year month day hour minute second</code> makes the calendar "year-month-day; hour-minute-second".<br> @@ -263,7 +264,7 @@ Return the Modified Julian day. It is <code class="code"><span class="constructor">Julian</span> day - 2 400 000.5</code> (more precise than <code class="code"><span class="constructor">Date</span>.from_mjd</code>).<br> </div> <br> -<span id="2_Conversions"><h2>Conversions</h2></span><br> +<h2 id="2_Conversions">Conversions</h2><br> <br> Those functions have the same behaviour as those defined in <a href="Time_sig.S.html"><code class="code"><span class="constructor">Time_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -277,7 +278,7 @@ Those functions have the same behaviour as those defined in <b>See also</b> <a href="Time_sig.S.html#VALfrom_gmt">Time_sig.S.from_gmt</a><br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -318,7 +319,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALsecond">Time_sig.S.second</a><br> </div> <br> -<span id="2_Calendarsarecomparable"><h2>Calendars are comparable</h2></span><br> +<h2 id="2_Calendarsarecomparable">Calendars are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Equality function between two calendars.<br> <b>See also</b> <a href="Utils.Comparable.html#VALequal">Utils.Comparable.equal.</a><br> @@ -354,7 +355,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALis_am">Time_sig.S.is_am</a><br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALto_unixtm"><span class="keyword">val</span> to_unixtm</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> Unix.tm</code></pre><div class="info"> Convert a calendar into the <code class="code">unix.tm</code> type. The field <code class="code">isdst</code> is always <code class="code"><span class="keyword">false</span></code>. More precise than @@ -392,12 +393,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.<br> <b>Since</b> 1.03<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of seconds between two calendars. </div> <br> -<span id="2_Arithmeticoperationsoncalendarsandperiods"><h2>Arithmetic operations on calendars and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsoncalendarsandperiods">Arithmetic operations on calendars and periods</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> diff --git a/doc/Calendar_builder.Make_Precise.html b/doc/Calendar_builder.Make_Precise.html index 4b2e6ea..451c387 100644 --- a/doc/Calendar_builder.Make_Precise.html +++ b/doc/Calendar_builder.Make_Precise.html @@ -35,14 +35,15 @@ <title>Calendar_builder.Make_Precise</title> </head> <body> -<div class="navbar"><a href="Calendar_builder.Make.html">Previous</a> - <a href="Calendar_builder.html">Up</a> +<div class="navbar"><a class="pre" href="Calendar_builder.Make.html" title="Calendar_builder.Make">Previous</a> + <a class="up" href="Calendar_builder.html" title="Calendar_builder">Up</a> </div> -<center><h1>Functor <a href="type_Calendar_builder.Make_Precise.html">Calendar_builder.Make_Precise</a></h1></center> -<br> -<pre><span class="keyword">module</span> Make_Precise: <div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">D</span></code><code class="code"> : </code><code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">T</span></code><code class="code"> : </code><code class="type"><a href="Time_sig.S.html">Time_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = D and module Time = T</code></div></div></pre>Similar to <a href="Calendar_builder.Make.html"><code class="code"><span class="constructor">Calendar_builder</span>.<span class="constructor">Make</span></code></a> but results are more precise. The counterpart is that +<h1>Functor <a href="type_Calendar_builder.Make_Precise.html">Calendar_builder.Make_Precise</a></h1> +<pre><span class="keyword">module</span> Make_Precise: <div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">D</span></code><code class="code"> : </code><code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">T</span></code><code class="code"> : </code><code class="type"><a href="Time_sig.S.html">Time_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = D and module Time = T</code></div></div></pre><div class="info"> +Similar to <a href="Calendar_builder.Make.html"><code class="code"><span class="constructor">Calendar_builder</span>.<span class="constructor">Make</span></code></a> but results are more precise. The counterpart is that some operations are less efficient.<br> <b>Since</b> 2.0<br> +</div> <table border="0" cellpadding="3" width="100%"> <tr> <td align="left" valign="top" width="1%%"><b>Parameters: </b></td> @@ -64,7 +65,7 @@ </table> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Date.html">Date</a>: <code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="type"> </code></pre><div class="info"> Date implementation used by this calendar. </div> @@ -78,49 +79,49 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sun</span></code></td> +<code><span id="TYPEELTday.Sun"><span class="constructor">Sun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mon</span></code></td> +<code><span id="TYPEELTday.Mon"><span class="constructor">Mon</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Tue</span></code></td> +<code><span id="TYPEELTday.Tue"><span class="constructor">Tue</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Wed</span></code></td> +<code><span id="TYPEELTday.Wed"><span class="constructor">Wed</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Thu</span></code></td> +<code><span id="TYPEELTday.Thu"><span class="constructor">Thu</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Fri</span></code></td> +<code><span id="TYPEELTday.Fri"><span class="constructor">Fri</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sat</span></code></td> +<code><span id="TYPEELTday.Sat"><span class="constructor">Sat</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Days of the week.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -130,84 +131,84 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jan</span></code></td> +<code><span id="TYPEELTmonth.Jan"><span class="constructor">Jan</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Feb</span></code></td> +<code><span id="TYPEELTmonth.Feb"><span class="constructor">Feb</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mar</span></code></td> +<code><span id="TYPEELTmonth.Mar"><span class="constructor">Mar</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Apr</span></code></td> +<code><span id="TYPEELTmonth.Apr"><span class="constructor">Apr</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">May</span></code></td> +<code><span id="TYPEELTmonth.May"><span class="constructor">May</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jun</span></code></td> +<code><span id="TYPEELTmonth.Jun"><span class="constructor">Jun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jul</span></code></td> +<code><span id="TYPEELTmonth.Jul"><span class="constructor">Jul</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Aug</span></code></td> +<code><span id="TYPEELTmonth.Aug"><span class="constructor">Aug</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sep</span></code></td> +<code><span id="TYPEELTmonth.Sep"><span class="constructor">Sep</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Oct</span></code></td> +<code><span id="TYPEELTmonth.Oct"><span class="constructor">Oct</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Nov</span></code></td> +<code><span id="TYPEELTmonth.Nov"><span class="constructor">Nov</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Dec</span></code></td> +<code><span id="TYPEELTmonth.Dec"><span class="constructor">Dec</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Months of the year.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -225,7 +226,7 @@ The different fields of a calendar.<br> </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> int -> int -> int -> <a href="Calendar_sig.S.html#TYPEsecond">second</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make year month day hour minute second</code> makes the calendar "year-month-day; hour-minute-second".<br> @@ -261,7 +262,7 @@ Return the Modified Julian day. It is <code class="code"><span class="constructor">Julian</span> day - 2 400 000.5</code> (more precise than <code class="code"><span class="constructor">Date</span>.from_mjd</code>).<br> </div> <br> -<span id="2_Conversions"><h2>Conversions</h2></span><br> +<h2 id="2_Conversions">Conversions</h2><br> <br> Those functions have the same behaviour as those defined in <a href="Time_sig.S.html"><code class="code"><span class="constructor">Time_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -275,7 +276,7 @@ Those functions have the same behaviour as those defined in <b>See also</b> <a href="Time_sig.S.html#VALfrom_gmt">Time_sig.S.from_gmt</a><br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -316,7 +317,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALsecond">Time_sig.S.second</a><br> </div> <br> -<span id="2_Calendarsarecomparable"><h2>Calendars are comparable</h2></span><br> +<h2 id="2_Calendarsarecomparable">Calendars are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Equality function between two calendars.<br> <b>See also</b> <a href="Utils.Comparable.html#VALequal">Utils.Comparable.equal.</a><br> @@ -352,7 +353,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALis_am">Time_sig.S.is_am</a><br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALto_unixtm"><span class="keyword">val</span> to_unixtm</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> Unix.tm</code></pre><div class="info"> Convert a calendar into the <code class="code">unix.tm</code> type. The field <code class="code">isdst</code> is always <code class="code"><span class="keyword">false</span></code>. More precise than @@ -390,12 +391,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.<br> <b>Since</b> 1.03<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of seconds between two calendars. </div> <br> -<span id="2_Arithmeticoperationsoncalendarsandperiods"><h2>Arithmetic operations on calendars and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsoncalendarsandperiods">Arithmetic operations on calendars and periods</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> diff --git a/doc/Calendar_builder.html b/doc/Calendar_builder.html index acaf993..f67bccf 100644 --- a/doc/Calendar_builder.html +++ b/doc/Calendar_builder.html @@ -28,14 +28,15 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Calendar_builder</title> </head> <body> -<div class="navbar"><a href="Calendar_sig.html">Previous</a> - <a href="index.html">Up</a> - <a href="Calendar.html">Next</a> +<div class="navbar"><a class="pre" href="Calendar_sig.html" title="Calendar_sig">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Calendar.html" title="Calendar">Next</a> </div> -<center><h1>Module <a href="type_Calendar_builder.html">Calendar_builder</a></h1></center> -<br> -<pre><span class="keyword">module</span> Calendar_builder: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_builder.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Generic calendar implementation.<br> +<h1>Module <a href="type_Calendar_builder.html">Calendar_builder</a></h1> +<pre><span class="keyword">module</span> Calendar_builder: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_builder.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Generic calendar implementation.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span class="keyword">module</span> <a href="Calendar_builder.Make.html">Make</a>: <div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">D</span></code><code class="code"> : </code><code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><div class="sig_block"><code class="code"><span class="keyword">functor</span> (</code><code class="code"><span class="constructor">T</span></code><code class="code"> : </code><code class="type"><a href="Time_sig.S.html">Time_sig.S</a></code><code class="code">) <span class="keywordsign">-></span> </code><code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = D and module Time = T</code></div></div></pre><div class="info"> Implement a calendar from a date implementation and a time implementation. diff --git a/doc/Calendar_sig.S.Date.html b/doc/Calendar_sig.S.Date.html index f5d2610..1c23f75 100644 --- a/doc/Calendar_sig.S.Date.html +++ b/doc/Calendar_sig.S.Date.html @@ -37,16 +37,17 @@ <title>Calendar_sig.S.Date</title> </head> <body> -<div class="navbar"> <a href="Calendar_sig.S.html">Up</a> - <a href="Calendar_sig.S.Time.html">Next</a> +<div class="navbar"> <a class="up" href="Calendar_sig.S.html" title="Calendar_sig.S">Up</a> + <a class="post" href="Calendar_sig.S.Time.html" title="Calendar_sig.S.Time">Next</a> </div> -<center><h1>Module <a href="type_Calendar_sig.S.Date.html">Calendar_sig.S.Date</a></h1></center> -<br> -<pre><span class="keyword">module</span> Date: <code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="type"> </code></pre>Date implementation used by this calendar.<br> +<h1>Module <a href="type_Calendar_sig.S.Date.html">Calendar_sig.S.Date</a></h1> +<pre><span class="keyword">module</span> Date: <code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="type"> </code></pre><div class="info"> +Date implementation used by this calendar.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span id="TYPEfield"><span class="keyword">type</span> <code class="type"></code>field</span> = <code class="type"><a href="Period.html#TYPEdate_field">Period.date_field</a></code> </pre> <div class="info"> The different fields of a date.<br> @@ -64,54 +65,54 @@ Type of a date, without specifying any precision level.<br> Type of a date.<br> </div> -<br><code><span id="TYPEday"><span class="keyword">type</span> <code class="type"></code>day</span> = </code><table class="typetable"> +<pre><code><span id="TYPEday"><span class="keyword">type</span> <code class="type"></code>day</span> = </code></pre><table class="typetable"> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sun</span></code></td> +<code><span id="TYPEELTday.Sun"><span class="constructor">Sun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mon</span></code></td> +<code><span id="TYPEELTday.Mon"><span class="constructor">Mon</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Tue</span></code></td> +<code><span id="TYPEELTday.Tue"><span class="constructor">Tue</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Wed</span></code></td> +<code><span id="TYPEELTday.Wed"><span class="constructor">Wed</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Thu</span></code></td> +<code><span id="TYPEELTday.Thu"><span class="constructor">Thu</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Fri</span></code></td> +<code><span id="TYPEELTday.Fri"><span class="constructor">Fri</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sat</span></code></td> +<code><span id="TYPEELTday.Sat"><span class="constructor">Sat</span></span></code></td> </tr></table> @@ -119,89 +120,89 @@ Type of a date.<br> Days of the week.<br> </div> -<br><code><span id="TYPEmonth"><span class="keyword">type</span> <code class="type"></code>month</span> = </code><table class="typetable"> +<pre><code><span id="TYPEmonth"><span class="keyword">type</span> <code class="type"></code>month</span> = </code></pre><table class="typetable"> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jan</span></code></td> +<code><span id="TYPEELTmonth.Jan"><span class="constructor">Jan</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Feb</span></code></td> +<code><span id="TYPEELTmonth.Feb"><span class="constructor">Feb</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mar</span></code></td> +<code><span id="TYPEELTmonth.Mar"><span class="constructor">Mar</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Apr</span></code></td> +<code><span id="TYPEELTmonth.Apr"><span class="constructor">Apr</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">May</span></code></td> +<code><span id="TYPEELTmonth.May"><span class="constructor">May</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jun</span></code></td> +<code><span id="TYPEELTmonth.Jun"><span class="constructor">Jun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jul</span></code></td> +<code><span id="TYPEELTmonth.Jul"><span class="constructor">Jul</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Aug</span></code></td> +<code><span id="TYPEELTmonth.Aug"><span class="constructor">Aug</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sep</span></code></td> +<code><span id="TYPEELTmonth.Sep"><span class="constructor">Sep</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Oct</span></code></td> +<code><span id="TYPEELTmonth.Oct"><span class="constructor">Oct</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Nov</span></code></td> +<code><span id="TYPEELTmonth.Nov"><span class="constructor">Nov</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Dec</span></code></td> +<code><span id="TYPEELTmonth.Dec"><span class="constructor">Dec</span></span></code></td> </tr></table> @@ -215,7 +216,7 @@ Year as an <code class="code">int</code>.<br> </div> <br> -<span id="2_Exceptions"><h2>Exceptions</h2></span><br> +<h2 id="2_Exceptions">Exceptions</h2><br> <pre><span id="EXCEPTIONOut_of_bounds"><span class="keyword">exception</span> Out_of_bounds</span></pre> <div class="info"> Raised when a date is outside the Julian period.<br> @@ -226,7 +227,7 @@ Raised when a date belongs to <code class="code">[<span class="constructor">October</span> 5th, 1582; <span class="constructor">October</span> 14th, 1582]</code>.<br> </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type"><a href="Date_sig.S.html#TYPEyear">year</a> -> int -> int -> <a href="Date_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make year month day</code> makes the date year-month-day. A BC year <code class="code">y</code> corresponds to the year <code class="code">-(y+1)</code>.<br> @@ -274,7 +275,7 @@ Make a date from a year and its day of the year.<br> <b>Example:</b> <code class="code">from_day_of_year 2008 39</code> returns the date 2008-2-8.<br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <pre><span id="VALdays_in_month"><span class="keyword">val</span> days_in_month</span> : <code class="type">[< <a href="Date_sig.S.html#TYPEfield">field</a> > `Month `Year ] <a href="Date_sig.S.html#TYPEdate">date</a> -> int</code></pre><div class="info"> Number of days in the month of a date.<br> <b>Example:</b> <code class="code">days_in_month (make 2003 6 26)</code> returns <code class="code">30</code>.<br> @@ -317,7 +318,7 @@ Modified Julian day (i.e. Julian day - 2 400 001). <b>Example:</b> <code class="code">to_mjd (make 1858 11 17)</code> returns 0.<br> </div> <br> -<span id="2_Datesarecomparable"><h2>Dates are comparable</h2></span><br> +<h2 id="2_Datesarecomparable">Dates are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type">[< <a href="Date_sig.S.html#TYPEfield">field</a> ] <a href="Date_sig.S.html#TYPEdate">date</a> -><br> [< <a href="Date_sig.S.html#TYPEfield">field</a> ] <a href="Date_sig.S.html#TYPEdate">date</a> -> bool</code></pre><div class="info"> Equality function between two dates.<br> <b>Since</b> 1.09.0<br> @@ -333,7 +334,7 @@ Hash function for dates.<br> <b>See also</b> <a href="Utils.Comparable.html#VALhash">Utils.Comparable.hash</a><br> </div> <br> -<span id="2_Booleanoperationsondates"><h2>Boolean operations on dates</h2></span><br> +<h2 id="2_Booleanoperationsondates">Boolean operations on dates</h2><br> <pre><span id="VALis_valid_date"><span class="keyword">val</span> is_valid_date</span> : <code class="type"><a href="Date_sig.S.html#TYPEyear">year</a> -> int -> int -> bool</code></pre><div class="info"> Check if a date is valid, that is the date has not been coerced to look like a real date.<br> @@ -354,7 +355,7 @@ Return <code class="code"><span class="keyword">true</span></code> iff a date be <code class="code"><span class="keyword">false</span></code> otherwise.<br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALto_unixtm"><span class="keyword">val</span> to_unixtm</span> : <code class="type"><a href="Date_sig.S.html#TYPEt">t</a> -> Unix.tm</code></pre><div class="info"> Convert a date into the <code class="code"><span class="constructor">Unix</span>.tm</code> type. The field <code class="code">is_isdst</code> is always <code class="code"><span class="keyword">false</span></code>. The fields <code class="code"><span class="constructor">Unix</span>.tm_sec</code>, @@ -410,12 +411,12 @@ Inverse of <code class="code">int_of_month</code>.<br> <b>Raises</b> <code>Invalid_argument</code> if the argument does not belong to <code class="code">1; 12</code>.<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Date_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of days between two dates. </div> <br> -<span id="2_Arithmeticoperationsondatesandperiods"><h2>Arithmetic operations on dates and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsondatesandperiods">Arithmetic operations on dates and periods</h2><br> <pre><span id="VALadd"><span class="keyword">val</span> add</span> : <code class="type">([< <a href="Date_sig.S.html#TYPEfield">field</a> ] as 'a) <a href="Date_sig.S.html#TYPEdate">date</a> -><br> 'a Period.period -> 'a <a href="Date_sig.S.html#TYPEdate">date</a></code></pre><div class="info"> <code class="code">add d p</code> returns <code class="code">d + p</code>.<br> <b>Raises</b><ul><li><code>Out_of_bounds</code> when the resulting date is outside the Julian @@ -471,7 +472,7 @@ A period is the number of days between two dates. (i.e. one year ago).<br> </div> <br> -<span id="2_Operationsonyears"><h2>Operations on years</h2></span><br> +<h2 id="2_Operationsonyears">Operations on years</h2><br> <pre><span id="VALis_leap_year"><span class="keyword">val</span> is_leap_year</span> : <code class="type"><a href="Date_sig.S.html#TYPEyear">year</a> -> bool</code></pre><div class="info"> Return <code class="code"><span class="keyword">true</span></code> if a year is a leap year; <code class="code"><span class="keyword">false</span></code> otherwise.<br> </div> diff --git a/doc/Calendar_sig.S.Period.html b/doc/Calendar_sig.S.Period.html index 92a2531..ba91b52 100644 --- a/doc/Calendar_sig.S.Period.html +++ b/doc/Calendar_sig.S.Period.html @@ -32,15 +32,16 @@ <title>Calendar_sig.S.Period</title> </head> <body> -<div class="navbar"><a href="Calendar_sig.S.Time.html">Previous</a> - <a href="Calendar_sig.S.html">Up</a> +<div class="navbar"><a class="pre" href="Calendar_sig.S.Time.html" title="Calendar_sig.S.Time">Previous</a> + <a class="up" href="Calendar_sig.S.html" title="Calendar_sig.S">Up</a> </div> -<center><h1>Module <a href="type_Calendar_sig.S.Period.html">Calendar_sig.S.Period</a></h1></center> -<br> -<pre><span class="keyword">module</span> Period: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>A period is the number of seconds between two calendars.<br> +<h1>Module <a href="type_Calendar_sig.S.Period.html">Calendar_sig.S.Period</a></h1> +<pre><span class="keyword">module</span> Period: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +A period is the number of seconds between two calendars.<br> +</div> <hr width="100%"> <br> -<span id="3_Arithmeticoperations"><h3>Arithmetic operations</h3></span><br> +<h3 id="3_Arithmeticoperations">Arithmetic operations</h3><br> <pre><span id="TYPEperiod"><span class="keyword">type</span> <code class="type">+[< <a href="Period.html#TYPEdate_field">Period.date_field</a> ]</code> period</span> </pre> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> = <code class="type"><a href="Period.html#TYPEdate_field">Period.date_field</a> <a href="Calendar_sig.S.Period.html#TYPEperiod">period</a></code> </pre> @@ -49,7 +50,7 @@ Type of a period.<br> </div> <br> -<span id="3_Periodisanadditivemonoid"><h3>Period is an additive monoid</h3></span><br> +<h3 id="3_Periodisanadditivemonoid">Period is an additive monoid</h3><br> <pre><span id="VALempty"><span class="keyword">val</span> empty</span> : <code class="type">[< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] <a href="Calendar_sig.S.Period.html#TYPEperiod">period</a></code></pre><div class="info"> The empty period.<br> </div> @@ -63,7 +64,7 @@ Substraction of periods.<br> Opposite of a period.<br> </div> <br> -<span id="3_Periodsarecomparable"><h3>Periods are comparable</h3></span><br> +<h3 id="3_Periodsarecomparable">Periods are comparable</h3><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type">[< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] <a href="Calendar_sig.S.Period.html#TYPEperiod">period</a> -><br> [< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] <a href="Calendar_sig.S.Period.html#TYPEperiod">period</a> -> bool</code></pre><div class="info"> Equality function between two periods.<br> <b>Since</b> 1.09.0<br> @@ -79,7 +80,7 @@ Hash function for periods.<br> <b>See also</b> <a href="Utils.Comparable.html#VALhash">Utils.Comparable.hash</a><br> </div> <br> -<span id="3_Constructors"><h3>Constructors</h3></span><br> +<h3 id="3_Constructors">Constructors</h3><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -><br> int -> int -> int -> int -> <a href="Calendar_sig.S.html#TYPEsecond">Calendar_sig.S.second</a> -> <a href="Calendar_sig.S.Period.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make year month day hour minute second</code> makes a period of the specified length.<br> @@ -116,7 +117,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.Period.html#VALsecond">Time_sig.S.Period.second</a><br> </div> <br> -<span id="3_Coercions"><h3>Coercions</h3></span><br> +<h3 id="3_Coercions">Coercions</h3><br> <pre><span id="VALfrom_date"><span class="keyword">val</span> from_date</span> : <code class="type">([< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] as 'a) Date.Period.period -><br> 'a <a href="Calendar_sig.S.Period.html#TYPEperiod">period</a></code></pre><div class="info"> Convert a date period to a calendar period.<br> </div> diff --git a/doc/Calendar_sig.S.Time.html b/doc/Calendar_sig.S.Time.html index 9d746cb..070edc2 100644 --- a/doc/Calendar_sig.S.Time.html +++ b/doc/Calendar_sig.S.Time.html @@ -38,17 +38,18 @@ <title>Calendar_sig.S.Time</title> </head> <body> -<div class="navbar"><a href="Calendar_sig.S.Date.html">Previous</a> - <a href="Calendar_sig.S.html">Up</a> - <a href="Calendar_sig.S.Period.html">Next</a> +<div class="navbar"><a class="pre" href="Calendar_sig.S.Date.html" title="Calendar_sig.S.Date">Previous</a> + <a class="up" href="Calendar_sig.S.html" title="Calendar_sig.S">Up</a> + <a class="post" href="Calendar_sig.S.Period.html" title="Calendar_sig.S.Period">Next</a> </div> -<center><h1>Module <a href="type_Calendar_sig.S.Time.html">Calendar_sig.S.Time</a></h1></center> -<br> -<pre><span class="keyword">module</span> Time: <code class="type"><a href="Time_sig.S.html">Time_sig.S</a></code><code class="type"> </code></pre>Time implementation used by this calendar.<br> +<h1>Module <a href="type_Calendar_sig.S.Time.html">Calendar_sig.S.Time</a></h1> +<pre><span class="keyword">module</span> Time: <code class="type"><a href="Time_sig.S.html">Time_sig.S</a></code><code class="type"> </code></pre><div class="info"> +Time implementation used by this calendar.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> Type of a time.<br> @@ -60,7 +61,7 @@ The different fields of a time.<br> </div> <br> -<span id="2_Second"><h2>Second</h2></span><br> +<h2 id="2_Second">Second</h2><br> <pre><span id="TYPEsecond"><span class="keyword">type</span> <code class="type"></code>second</span> </pre> <div class="info"> Type of a second.<br> @@ -71,7 +72,7 @@ Type of a second.<br> Second implementation </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> <a href="Time_sig.S.html#TYPEsecond">second</a> -> <a href="Time_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make hour minute second</code> makes the time hour-minute-second.<br> </div> @@ -91,7 +92,7 @@ The current time based on <code class="code"><span class="constructor">Time_Zone So, it has always the same behaviour as <code class="code">make 12 0 0</code>.<br> </div> <br> -<span id="2_Conversions"><h2>Conversions</h2></span><br> +<h2 id="2_Conversions">Conversions</h2><br> <pre><span id="VALconvert"><span class="keyword">val</span> convert</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -> <a href="Time_Zone.html#TYPEt">Time_Zone.t</a> -> <a href="Time_Zone.html#TYPEt">Time_Zone.t</a> -> <a href="Time_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">convert t t1 t2</code> converts the time <code class="code">t</code> expressed in the time zone <code class="code">t1</code> to the same time expressed in the time zone <code class="code">t2</code>.<br> @@ -115,7 +116,7 @@ The current time based on <code class="code"><span class="constructor">Time_Zone (make (-73) 0 0)</code> returns the time 23-0-0 and (-4).<br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <pre><span id="VALhour"><span class="keyword">val</span> hour</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -> int</code></pre><div class="info"> Hour.<br> <b>Example:</b> <code class="code">hour (make 20 0 0)</code> returns 20.<br> @@ -143,7 +144,7 @@ Number of hours of a time. The resulting fractional part represents <b>Example:</b> <code class="code">to_hours (make 1 3 0)</code> returns <code class="code">1 + 0.05 = 1.05</code>.<br> </div> <br> -<span id="2_Timesarecomparable"><h2>Times are comparable</h2></span><br> +<h2 id="2_Timesarecomparable">Times are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -> <a href="Time_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Equality function between two times.<br> <b>Since</b> 1.09.0<br> @@ -159,7 +160,7 @@ Hash function for times.<br> <b>See also</b> <a href="Utils.Comparable.html#VALhash">Utils.Comparable.hash.</a><br> </div> <br> -<span id="2_Booleanoperationsontimes"><h2>Boolean operations on times</h2></span><br> +<h2 id="2_Booleanoperationsontimes">Boolean operations on times</h2><br> <pre><span id="VALis_pm"><span class="keyword">val</span> is_pm</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Return <code class="code"><span class="keyword">true</span></code> is the time is before midday in the current time zone; <code class="code"><span class="keyword">false</span></code> otherwise.<br> @@ -173,7 +174,7 @@ Return <code class="code"><span class="keyword">true</span></code> is the time i <code class="code"><span class="keyword">true</span></code>.<br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALfrom_seconds"><span class="keyword">val</span> from_seconds</span> : <code class="type"><a href="Time_sig.S.html#TYPEsecond">second</a> -> <a href="Time_sig.S.html#TYPEt">t</a></code></pre><div class="info"> Inverse of <code class="code">to_seconds</code>.<br> </div> @@ -184,12 +185,12 @@ Inverse of <code class="code">to_minutes</code>.<br> Inverse of <code class="code">to_hours</code>.<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Time_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of seconds between two times. </div> <br> -<span id="2_Arithmeticoperationsontimesandperiods"><h2>Arithmetic operations on times and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsontimesandperiods">Arithmetic operations on times and periods</h2><br> <pre><span id="VALadd"><span class="keyword">val</span> add</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -><br> [< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] Period.period -> <a href="Time_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">app t p</code> returns <code class="code">t + p</code>.<br> <b>Example:</b> <code class="code">add (make 20 0 0) (<span class="constructor">Period</span>.minute 70)</code> returns the time diff --git a/doc/Calendar_sig.S.html b/doc/Calendar_sig.S.html index 2c99dc1..b13f721 100644 --- a/doc/Calendar_sig.S.html +++ b/doc/Calendar_sig.S.html @@ -34,15 +34,16 @@ <title>Calendar_sig.S</title> </head> <body> -<div class="navbar"> <a href="Calendar_sig.html">Up</a> +<div class="navbar"> <a class="up" href="Calendar_sig.html" title="Calendar_sig">Up</a> </div> -<center><h1>Module type <a href="type_Calendar_sig.S.html">Calendar_sig.S</a></h1></center> -<br> -<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Common operations for all calendar representations.<br> +<h1>Module type <a href="type_Calendar_sig.S.html">Calendar_sig.S</a></h1> +<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Common operations for all calendar representations.<br> <b>Since</b> 2.0 (this signature was before inlined in interface of Calendar).<br> +</div> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Date.html">Date</a>: <code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="type"> </code></pre><div class="info"> Date implementation used by this calendar. </div> @@ -56,49 +57,49 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sun</span></code></td> +<code><span id="TYPEELTday.Sun"><span class="constructor">Sun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mon</span></code></td> +<code><span id="TYPEELTday.Mon"><span class="constructor">Mon</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Tue</span></code></td> +<code><span id="TYPEELTday.Tue"><span class="constructor">Tue</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Wed</span></code></td> +<code><span id="TYPEELTday.Wed"><span class="constructor">Wed</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Thu</span></code></td> +<code><span id="TYPEELTday.Thu"><span class="constructor">Thu</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Fri</span></code></td> +<code><span id="TYPEELTday.Fri"><span class="constructor">Fri</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sat</span></code></td> +<code><span id="TYPEELTday.Sat"><span class="constructor">Sat</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Days of the week.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -108,84 +109,84 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jan</span></code></td> +<code><span id="TYPEELTmonth.Jan"><span class="constructor">Jan</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Feb</span></code></td> +<code><span id="TYPEELTmonth.Feb"><span class="constructor">Feb</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mar</span></code></td> +<code><span id="TYPEELTmonth.Mar"><span class="constructor">Mar</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Apr</span></code></td> +<code><span id="TYPEELTmonth.Apr"><span class="constructor">Apr</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">May</span></code></td> +<code><span id="TYPEELTmonth.May"><span class="constructor">May</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jun</span></code></td> +<code><span id="TYPEELTmonth.Jun"><span class="constructor">Jun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jul</span></code></td> +<code><span id="TYPEELTmonth.Jul"><span class="constructor">Jul</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Aug</span></code></td> +<code><span id="TYPEELTmonth.Aug"><span class="constructor">Aug</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sep</span></code></td> +<code><span id="TYPEELTmonth.Sep"><span class="constructor">Sep</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Oct</span></code></td> +<code><span id="TYPEELTmonth.Oct"><span class="constructor">Oct</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Nov</span></code></td> +<code><span id="TYPEELTmonth.Nov"><span class="constructor">Nov</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Dec</span></code></td> +<code><span id="TYPEELTmonth.Dec"><span class="constructor">Dec</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Months of the year.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -203,7 +204,7 @@ The different fields of a calendar.<br> </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> int -> int -> int -> <a href="Calendar_sig.S.html#TYPEsecond">second</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make year month day hour minute second</code> makes the calendar "year-month-day; hour-minute-second".<br> @@ -239,7 +240,7 @@ Return the Modified Julian day. It is <code class="code"><span class="constructor">Julian</span> day - 2 400 000.5</code> (more precise than <code class="code"><span class="constructor">Date</span>.from_mjd</code>).<br> </div> <br> -<span id="2_Conversions"><h2>Conversions</h2></span><br> +<h2 id="2_Conversions">Conversions</h2><br> <br> Those functions have the same behaviour as those defined in <a href="Time_sig.S.html"><code class="code"><span class="constructor">Time_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -253,7 +254,7 @@ Those functions have the same behaviour as those defined in <b>See also</b> <a href="Time_sig.S.html#VALfrom_gmt">Time_sig.S.from_gmt</a><br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -294,7 +295,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALsecond">Time_sig.S.second</a><br> </div> <br> -<span id="2_Calendarsarecomparable"><h2>Calendars are comparable</h2></span><br> +<h2 id="2_Calendarsarecomparable">Calendars are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Equality function between two calendars.<br> <b>See also</b> <a href="Utils.Comparable.html#VALequal">Utils.Comparable.equal.</a><br> @@ -330,7 +331,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALis_am">Time_sig.S.is_am</a><br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALto_unixtm"><span class="keyword">val</span> to_unixtm</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> Unix.tm</code></pre><div class="info"> Convert a calendar into the <code class="code">unix.tm</code> type. The field <code class="code">isdst</code> is always <code class="code"><span class="keyword">false</span></code>. More precise than @@ -368,12 +369,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.<br> <b>Since</b> 1.03<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of seconds between two calendars. </div> <br> -<span id="2_Arithmeticoperationsoncalendarsandperiods"><h2>Arithmetic operations on calendars and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsoncalendarsandperiods">Arithmetic operations on calendars and periods</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> diff --git a/doc/Calendar_sig.html b/doc/Calendar_sig.html index e84f697..7447f4f 100644 --- a/doc/Calendar_sig.html +++ b/doc/Calendar_sig.html @@ -28,13 +28,13 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Calendar_sig</title> </head> <body> -<div class="navbar"><a href="Date.html">Previous</a> - <a href="index.html">Up</a> - <a href="Calendar_builder.html">Next</a> +<div class="navbar"><a class="pre" href="Date.html" title="Date">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Calendar_builder.html" title="Calendar_builder">Next</a> </div> -<center><h1>Module <a href="type_Calendar_sig.html">Calendar_sig</a></h1></center> -<br> -<pre><span class="keyword">module</span> Calendar_sig: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Calendar interface. A calendar combines a date and a time: it may be seen +<h1>Module <a href="type_Calendar_sig.html">Calendar_sig</a></h1> +<pre><span class="keyword">module</span> Calendar_sig: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Calendar interface. A calendar combines a date and a time: it may be seen as a 6-uple (year, month, day, hour, minute, second). <p> @@ -42,6 +42,7 @@ implementation (like module <code class="code"><span class="constructor">Date</span></code>). But if you need to manage more precise dates, use this module. The exact Julian period is now <code class="code">[<span class="constructor">January</span>, 1st 4713 <span class="constructor">BC</span> at midday <span class="constructor">GMT</span>; <span class="constructor">January</span> 22th, 3268 <span class="constructor">AC</span> at midday <span class="constructor">GMT</span>]</code>.<br> +</div> <hr width="100%"> <pre><span class="keyword">module type</span> <a href="Calendar_sig.S.html">S</a> = <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> Common operations for all calendar representations. diff --git a/doc/Date.html b/doc/Date.html index fa20b02..ccf331c 100644 --- a/doc/Date.html +++ b/doc/Date.html @@ -28,13 +28,14 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Date</title> </head> <body> -<div class="navbar"><a href="Date_sig.html">Previous</a> - <a href="index.html">Up</a> - <a href="Calendar_sig.html">Next</a> +<div class="navbar"><a class="pre" href="Date_sig.html" title="Date_sig">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Calendar_sig.html" title="Calendar_sig">Next</a> +</div> +<h1>Module <a href="type_Date.html">Date</a></h1> +<pre><span class="keyword">module</span> Date: <code class="code"><span class="keyword">sig</span></code> <a href="Date.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Date implementation.<br> </div> -<center><h1>Module <a href="type_Date.html">Date</a></h1></center> -<br> -<pre><span class="keyword">module</span> Date: <code class="code"><span class="keyword">sig</span></code> <a href="Date.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Date implementation.<br> <hr width="100%"> <pre><span class="keyword">include</span> <a href="Date_sig.S.html">Date_sig.S</a></pre> </body></html>
\ No newline at end of file diff --git a/doc/Date_sig.S.Period.html b/doc/Date_sig.S.Period.html index d73d03b..b5c7fed 100644 --- a/doc/Date_sig.S.Period.html +++ b/doc/Date_sig.S.Period.html @@ -29,19 +29,20 @@ <title>Date_sig.S.Period</title> </head> <body> -<div class="navbar"> <a href="Date_sig.S.html">Up</a> +<div class="navbar"> <a class="up" href="Date_sig.S.html" title="Date_sig.S">Up</a> </div> -<center><h1>Module <a href="type_Date_sig.S.Period.html">Date_sig.S.Period</a></h1></center> -<br> -<pre><span class="keyword">module</span> Period: <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>A period is the number of days between two dates.<br> +<h1>Module <a href="type_Date_sig.S.Period.html">Date_sig.S.Period</a></h1> +<pre><span class="keyword">module</span> Period: <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +A period is the number of days between two dates.<br> +</div> <hr width="100%"> <br> -<span id="3_Arithmeticoperations"><h3>Arithmetic operations</h3></span><br> +<h3 id="3_Arithmeticoperations">Arithmetic operations</h3><br> <pre><span id="TYPEp"><span class="keyword">type</span> <code class="type">+[< <a href="Date_sig.S.html#TYPEfield">Date_sig.S.field</a> ]</code> p</span> </pre> <pre><span class="keyword">include</span> <a href="Period.S.html">Period.S</a></pre> <br> -<span id="3_Constructors"><h3>Constructors</h3></span><br> +<h3 id="3_Constructors">Constructors</h3><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> int -> <a href="Date_sig.S.html#TYPEt">Date_sig.S.t</a></code></pre><div class="info"> <code class="code">make year month day</code> makes a period of the specified length.<br> </div> @@ -62,7 +63,7 @@ Labelled version of <code class="code">make</code>. <code class="code">day n</code> makes a period of <code class="code">n</code> days.<br> </div> <br> -<span id="3_Getters"><h3>Getters</h3></span><br> +<h3 id="3_Getters">Getters</h3><br> <pre><span id="EXCEPTIONNot_computable"><span class="keyword">exception</span> Not_computable</span></pre> <div class="info"> <b>Since</b> 1.04<br> diff --git a/doc/Date_sig.S.html b/doc/Date_sig.S.html index b3045ed..0ea51e9 100644 --- a/doc/Date_sig.S.html +++ b/doc/Date_sig.S.html @@ -36,15 +36,16 @@ <title>Date_sig.S</title> </head> <body> -<div class="navbar"> <a href="Date_sig.html">Up</a> +<div class="navbar"> <a class="up" href="Date_sig.html" title="Date_sig">Up</a> </div> -<center><h1>Module type <a href="type_Date_sig.S.html">Date_sig.S</a></h1></center> -<br> -<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Common operations for all date representations.<br> +<h1>Module type <a href="type_Date_sig.S.html">Date_sig.S</a></h1> +<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Common operations for all date representations.<br> <b>Since</b> 2.0 (this signature was before inlined in interface of Date).<br> +</div> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span id="TYPEfield"><span class="keyword">type</span> <code class="type"></code>field</span> = <code class="type"><a href="Period.html#TYPEdate_field">Period.date_field</a></code> </pre> <div class="info"> The different fields of a date.<br> @@ -62,54 +63,54 @@ Type of a date, without specifying any precision level.<br> Type of a date.<br> </div> -<br><code><span id="TYPEday"><span class="keyword">type</span> <code class="type"></code>day</span> = </code><table class="typetable"> +<pre><code><span id="TYPEday"><span class="keyword">type</span> <code class="type"></code>day</span> = </code></pre><table class="typetable"> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sun</span></code></td> +<code><span id="TYPEELTday.Sun"><span class="constructor">Sun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mon</span></code></td> +<code><span id="TYPEELTday.Mon"><span class="constructor">Mon</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Tue</span></code></td> +<code><span id="TYPEELTday.Tue"><span class="constructor">Tue</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Wed</span></code></td> +<code><span id="TYPEELTday.Wed"><span class="constructor">Wed</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Thu</span></code></td> +<code><span id="TYPEELTday.Thu"><span class="constructor">Thu</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Fri</span></code></td> +<code><span id="TYPEELTday.Fri"><span class="constructor">Fri</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sat</span></code></td> +<code><span id="TYPEELTday.Sat"><span class="constructor">Sat</span></span></code></td> </tr></table> @@ -117,89 +118,89 @@ Type of a date.<br> Days of the week.<br> </div> -<br><code><span id="TYPEmonth"><span class="keyword">type</span> <code class="type"></code>month</span> = </code><table class="typetable"> +<pre><code><span id="TYPEmonth"><span class="keyword">type</span> <code class="type"></code>month</span> = </code></pre><table class="typetable"> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jan</span></code></td> +<code><span id="TYPEELTmonth.Jan"><span class="constructor">Jan</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Feb</span></code></td> +<code><span id="TYPEELTmonth.Feb"><span class="constructor">Feb</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mar</span></code></td> +<code><span id="TYPEELTmonth.Mar"><span class="constructor">Mar</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Apr</span></code></td> +<code><span id="TYPEELTmonth.Apr"><span class="constructor">Apr</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">May</span></code></td> +<code><span id="TYPEELTmonth.May"><span class="constructor">May</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jun</span></code></td> +<code><span id="TYPEELTmonth.Jun"><span class="constructor">Jun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jul</span></code></td> +<code><span id="TYPEELTmonth.Jul"><span class="constructor">Jul</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Aug</span></code></td> +<code><span id="TYPEELTmonth.Aug"><span class="constructor">Aug</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sep</span></code></td> +<code><span id="TYPEELTmonth.Sep"><span class="constructor">Sep</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Oct</span></code></td> +<code><span id="TYPEELTmonth.Oct"><span class="constructor">Oct</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Nov</span></code></td> +<code><span id="TYPEELTmonth.Nov"><span class="constructor">Nov</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Dec</span></code></td> +<code><span id="TYPEELTmonth.Dec"><span class="constructor">Dec</span></span></code></td> </tr></table> @@ -213,7 +214,7 @@ Year as an <code class="code">int</code>.<br> </div> <br> -<span id="2_Exceptions"><h2>Exceptions</h2></span><br> +<h2 id="2_Exceptions">Exceptions</h2><br> <pre><span id="EXCEPTIONOut_of_bounds"><span class="keyword">exception</span> Out_of_bounds</span></pre> <div class="info"> Raised when a date is outside the Julian period.<br> @@ -224,7 +225,7 @@ Raised when a date belongs to <code class="code">[<span class="constructor">October</span> 5th, 1582; <span class="constructor">October</span> 14th, 1582]</code>.<br> </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type"><a href="Date_sig.S.html#TYPEyear">year</a> -> int -> int -> <a href="Date_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make year month day</code> makes the date year-month-day. A BC year <code class="code">y</code> corresponds to the year <code class="code">-(y+1)</code>.<br> @@ -272,7 +273,7 @@ Make a date from a year and its day of the year.<br> <b>Example:</b> <code class="code">from_day_of_year 2008 39</code> returns the date 2008-2-8.<br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <pre><span id="VALdays_in_month"><span class="keyword">val</span> days_in_month</span> : <code class="type">[< <a href="Date_sig.S.html#TYPEfield">field</a> > `Month `Year ] <a href="Date_sig.S.html#TYPEdate">date</a> -> int</code></pre><div class="info"> Number of days in the month of a date.<br> <b>Example:</b> <code class="code">days_in_month (make 2003 6 26)</code> returns <code class="code">30</code>.<br> @@ -315,7 +316,7 @@ Modified Julian day (i.e. Julian day - 2 400 001). <b>Example:</b> <code class="code">to_mjd (make 1858 11 17)</code> returns 0.<br> </div> <br> -<span id="2_Datesarecomparable"><h2>Dates are comparable</h2></span><br> +<h2 id="2_Datesarecomparable">Dates are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type">[< <a href="Date_sig.S.html#TYPEfield">field</a> ] <a href="Date_sig.S.html#TYPEdate">date</a> -><br> [< <a href="Date_sig.S.html#TYPEfield">field</a> ] <a href="Date_sig.S.html#TYPEdate">date</a> -> bool</code></pre><div class="info"> Equality function between two dates.<br> <b>Since</b> 1.09.0<br> @@ -331,7 +332,7 @@ Hash function for dates.<br> <b>See also</b> <a href="Utils.Comparable.html#VALhash">Utils.Comparable.hash</a><br> </div> <br> -<span id="2_Booleanoperationsondates"><h2>Boolean operations on dates</h2></span><br> +<h2 id="2_Booleanoperationsondates">Boolean operations on dates</h2><br> <pre><span id="VALis_valid_date"><span class="keyword">val</span> is_valid_date</span> : <code class="type"><a href="Date_sig.S.html#TYPEyear">year</a> -> int -> int -> bool</code></pre><div class="info"> Check if a date is valid, that is the date has not been coerced to look like a real date.<br> @@ -352,7 +353,7 @@ Return <code class="code"><span class="keyword">true</span></code> iff a date be <code class="code"><span class="keyword">false</span></code> otherwise.<br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALto_unixtm"><span class="keyword">val</span> to_unixtm</span> : <code class="type"><a href="Date_sig.S.html#TYPEt">t</a> -> Unix.tm</code></pre><div class="info"> Convert a date into the <code class="code"><span class="constructor">Unix</span>.tm</code> type. The field <code class="code">is_isdst</code> is always <code class="code"><span class="keyword">false</span></code>. The fields <code class="code"><span class="constructor">Unix</span>.tm_sec</code>, @@ -408,12 +409,12 @@ Inverse of <code class="code">int_of_month</code>.<br> <b>Raises</b> <code>Invalid_argument</code> if the argument does not belong to <code class="code">1; 12</code>.<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Date_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of days between two dates. </div> <br> -<span id="2_Arithmeticoperationsondatesandperiods"><h2>Arithmetic operations on dates and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsondatesandperiods">Arithmetic operations on dates and periods</h2><br> <pre><span id="VALadd"><span class="keyword">val</span> add</span> : <code class="type">([< <a href="Date_sig.S.html#TYPEfield">field</a> ] as 'a) <a href="Date_sig.S.html#TYPEdate">date</a> -><br> 'a Period.period -> 'a <a href="Date_sig.S.html#TYPEdate">date</a></code></pre><div class="info"> <code class="code">add d p</code> returns <code class="code">d + p</code>.<br> <b>Raises</b><ul><li><code>Out_of_bounds</code> when the resulting date is outside the Julian @@ -469,7 +470,7 @@ A period is the number of days between two dates. (i.e. one year ago).<br> </div> <br> -<span id="2_Operationsonyears"><h2>Operations on years</h2></span><br> +<h2 id="2_Operationsonyears">Operations on years</h2><br> <pre><span id="VALis_leap_year"><span class="keyword">val</span> is_leap_year</span> : <code class="type"><a href="Date_sig.S.html#TYPEyear">year</a> -> bool</code></pre><div class="info"> Return <code class="code"><span class="keyword">true</span></code> if a year is a leap year; <code class="code"><span class="keyword">false</span></code> otherwise.<br> </div> diff --git a/doc/Date_sig.html b/doc/Date_sig.html index 531f0bb..823b483 100644 --- a/doc/Date_sig.html +++ b/doc/Date_sig.html @@ -28,13 +28,13 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Date_sig</title> </head> <body> -<div class="navbar"><a href="Ftime.html">Previous</a> - <a href="index.html">Up</a> - <a href="Date.html">Next</a> +<div class="navbar"><a class="pre" href="Ftime.html" title="Ftime">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Date.html" title="Date">Next</a> </div> -<center><h1>Module <a href="type_Date_sig.html">Date_sig</a></h1></center> -<br> -<pre><span class="keyword">module</span> Date_sig: <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Date interface. A date may be seen as a triple (year, month, day). +<h1>Module <a href="type_Date_sig.html">Date_sig</a></h1> +<pre><span class="keyword">module</span> Date_sig: <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Date interface. A date may be seen as a triple (year, month, day). <p> All the dates should belong to @@ -55,6 +55,7 @@ exception is raised if you attempt to create such a date. Those dropped days correspond to the change from the Julian to the Gregorian calendar.<br> +</div> <hr width="100%"> <pre><span class="keyword">module type</span> <a href="Date_sig.S.html">S</a> = <code class="code"><span class="keyword">sig</span></code> <a href="Date_sig.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> Common operations for all date representations. diff --git a/doc/Fcalendar.Precise.html b/doc/Fcalendar.Precise.html index ee80467..4328b2f 100644 --- a/doc/Fcalendar.Precise.html +++ b/doc/Fcalendar.Precise.html @@ -34,15 +34,16 @@ <title>Fcalendar.Precise</title> </head> <body> -<div class="navbar"> <a href="Fcalendar.html">Up</a> +<div class="navbar"> <a class="up" href="Fcalendar.html" title="Fcalendar">Up</a> </div> -<center><h1>Module <a href="type_Fcalendar.Precise.html">Fcalendar.Precise</a></h1></center> -<br> -<pre><span class="keyword">module</span> Precise: <code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = Date and module Time = Ftime</code></pre>More precise implementation of calendar in which seconds are float.<br> +<h1>Module <a href="type_Fcalendar.Precise.html">Fcalendar.Precise</a></h1> +<pre><span class="keyword">module</span> Precise: <code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = Date and module Time = Ftime</code></pre><div class="info"> +More precise implementation of calendar in which seconds are float.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Date.html">Date</a>: <code class="type"><a href="Date_sig.S.html">Date_sig.S</a></code><code class="type"> </code></pre><div class="info"> Date implementation used by this calendar. </div> @@ -56,49 +57,49 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sun</span></code></td> +<code><span id="TYPEELTday.Sun"><span class="constructor">Sun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mon</span></code></td> +<code><span id="TYPEELTday.Mon"><span class="constructor">Mon</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Tue</span></code></td> +<code><span id="TYPEELTday.Tue"><span class="constructor">Tue</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Wed</span></code></td> +<code><span id="TYPEELTday.Wed"><span class="constructor">Wed</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Thu</span></code></td> +<code><span id="TYPEELTday.Thu"><span class="constructor">Thu</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Fri</span></code></td> +<code><span id="TYPEELTday.Fri"><span class="constructor">Fri</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sat</span></code></td> +<code><span id="TYPEELTday.Sat"><span class="constructor">Sat</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Days of the week.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -108,84 +109,84 @@ Time implementation used by this calendar. <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jan</span></code></td> +<code><span id="TYPEELTmonth.Jan"><span class="constructor">Jan</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Feb</span></code></td> +<code><span id="TYPEELTmonth.Feb"><span class="constructor">Feb</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Mar</span></code></td> +<code><span id="TYPEELTmonth.Mar"><span class="constructor">Mar</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Apr</span></code></td> +<code><span id="TYPEELTmonth.Apr"><span class="constructor">Apr</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">May</span></code></td> +<code><span id="TYPEELTmonth.May"><span class="constructor">May</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jun</span></code></td> +<code><span id="TYPEELTmonth.Jun"><span class="constructor">Jun</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Jul</span></code></td> +<code><span id="TYPEELTmonth.Jul"><span class="constructor">Jul</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Aug</span></code></td> +<code><span id="TYPEELTmonth.Aug"><span class="constructor">Aug</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Sep</span></code></td> +<code><span id="TYPEELTmonth.Sep"><span class="constructor">Sep</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Oct</span></code></td> +<code><span id="TYPEELTmonth.Oct"><span class="constructor">Oct</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Nov</span></code></td> +<code><span id="TYPEELTmonth.Nov"><span class="constructor">Nov</span></span></code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Dec</span></code></td> +<code><span id="TYPEELTmonth.Dec"><span class="constructor">Dec</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Months of the year.</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> @@ -203,7 +204,7 @@ The different fields of a calendar.<br> </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> int -> int -> int -> <a href="Calendar_sig.S.html#TYPEsecond">second</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make year month day hour minute second</code> makes the calendar "year-month-day; hour-minute-second".<br> @@ -239,7 +240,7 @@ Return the Modified Julian day. It is <code class="code"><span class="constructor">Julian</span> day - 2 400 000.5</code> (more precise than <code class="code"><span class="constructor">Date</span>.from_mjd</code>).<br> </div> <br> -<span id="2_Conversions"><h2>Conversions</h2></span><br> +<h2 id="2_Conversions">Conversions</h2><br> <br> Those functions have the same behaviour as those defined in <a href="Time_sig.S.html"><code class="code"><span class="constructor">Time_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -253,7 +254,7 @@ Those functions have the same behaviour as those defined in <b>See also</b> <a href="Time_sig.S.html#VALfrom_gmt">Time_sig.S.from_gmt</a><br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> @@ -294,7 +295,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALsecond">Time_sig.S.second</a><br> </div> <br> -<span id="2_Calendarsarecomparable"><h2>Calendars are comparable</h2></span><br> +<h2 id="2_Calendarsarecomparable">Calendars are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> <a href="Calendar_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Equality function between two calendars.<br> <b>See also</b> <a href="Utils.Comparable.html#VALequal">Utils.Comparable.equal.</a><br> @@ -330,7 +331,7 @@ Those functions have the same behavious as those defined in <b>See also</b> <a href="Time_sig.S.html#VALis_am">Time_sig.S.is_am</a><br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALto_unixtm"><span class="keyword">val</span> to_unixtm</span> : <code class="type"><a href="Calendar_sig.S.html#TYPEt">t</a> -> Unix.tm</code></pre><div class="info"> Convert a calendar into the <code class="code">unix.tm</code> type. The field <code class="code">isdst</code> is always <code class="code"><span class="keyword">false</span></code>. More precise than @@ -368,12 +369,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.<br> <b>Since</b> 1.03<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Calendar_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Calendar_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of seconds between two calendars. </div> <br> -<span id="2_Arithmeticoperationsoncalendarsandperiods"><h2>Arithmetic operations on calendars and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsoncalendarsandperiods">Arithmetic operations on calendars and periods</h2><br> <br> Those functions have the same behavious as those defined in <a href="Date_sig.S.html"><code class="code"><span class="constructor">Date_sig</span>.<span class="constructor">S</span></code></a>.<br> diff --git a/doc/Fcalendar.html b/doc/Fcalendar.html index aa245a5..147b4f7 100644 --- a/doc/Fcalendar.html +++ b/doc/Fcalendar.html @@ -28,19 +28,20 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Fcalendar</title> </head> <body> -<div class="navbar"><a href="Calendar.html">Previous</a> - <a href="index.html">Up</a> - <a href="Printer.html">Next</a> +<div class="navbar"><a class="pre" href="Calendar.html" title="Calendar">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Printer.html" title="Printer">Next</a> </div> -<center><h1>Module <a href="type_Fcalendar.html">Fcalendar</a></h1></center> -<br> -<pre><span class="keyword">module</span> Fcalendar: <code class="code"><span class="keyword">sig</span></code> <a href="Fcalendar.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Calendar implementation in which seconds are float. +<h1>Module <a href="type_Fcalendar.html">Fcalendar</a></h1> +<pre><span class="keyword">module</span> Fcalendar: <code class="code"><span class="keyword">sig</span></code> <a href="Fcalendar.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Calendar implementation in which seconds are float. <p> This module uses float. Then results may be very unprecise, especially comparison of calendars which differ with few seconds. In this case, consider to use module <code class="code"><span class="constructor">Precise</span></code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span class="keyword">include</span> <a href="Calendar_sig.S.html">Calendar_sig.S</a></pre> <pre><span class="keyword">module</span> <a href="Fcalendar.Precise.html">Precise</a>: <code class="type"><a href="Calendar_sig.S.html">Calendar_sig.S</a></code><code class="type"> with module Date = Date and module Time = Ftime</code></pre><div class="info"> diff --git a/doc/Ftime.html b/doc/Ftime.html index 66544c9..1b08ea3 100644 --- a/doc/Ftime.html +++ b/doc/Ftime.html @@ -28,17 +28,18 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Ftime</title> </head> <body> -<div class="navbar"><a href="Time.html">Previous</a> - <a href="index.html">Up</a> - <a href="Date_sig.html">Next</a> +<div class="navbar"><a class="pre" href="Time.html" title="Time">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Date_sig.html" title="Date_sig">Next</a> </div> -<center><h1>Module <a href="type_Ftime.html">Ftime</a></h1></center> -<br> -<pre><span class="keyword">module</span> Ftime: <code class="code"><span class="keyword">sig</span></code> <a href="Ftime.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Time implementation in which seconds are floats. +<h1>Module <a href="type_Ftime.html">Ftime</a></h1> +<pre><span class="keyword">module</span> Ftime: <code class="code"><span class="keyword">sig</span></code> <a href="Ftime.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Time implementation in which seconds are floats. <p> This module uses float. Then results may be very unprecise.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span class="keyword">include</span> <a href="Time_sig.S.html">Time_sig.S</a></pre> </body></html>
\ No newline at end of file diff --git a/doc/Period.S.html b/doc/Period.S.html index 4bad8b0..fc7f443 100644 --- a/doc/Period.S.html +++ b/doc/Period.S.html @@ -28,11 +28,12 @@ <title>Period.S</title> </head> <body> -<div class="navbar"> <a href="Period.html">Up</a> +<div class="navbar"> <a class="up" href="Period.html" title="Period">Up</a> </div> -<center><h1>Module type <a href="type_Period.S.html">Period.S</a></h1></center> -<br> -<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Period.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Common interface for all periods.<br> +<h1>Module type <a href="type_Period.S.html">Period.S</a></h1> +<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Period.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Common interface for all periods.<br> +</div> <hr width="100%"> <pre><span id="TYPEperiod"><span class="keyword">type</span> <code class="type">+[< <a href="Period.html#TYPEdate_field">Period.date_field</a> ]</code> period</span> </pre> @@ -42,7 +43,7 @@ Type of a period.<br> </div> <br> -<span id="3_Periodisanadditivemonoid"><h3>Period is an additive monoid</h3></span><br> +<h3 id="3_Periodisanadditivemonoid">Period is an additive monoid</h3><br> <pre><span id="VALempty"><span class="keyword">val</span> empty</span> : <code class="type">[< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] <a href="Period.S.html#TYPEperiod">period</a></code></pre><div class="info"> The empty period.<br> </div> @@ -56,7 +57,7 @@ Substraction of periods.<br> Opposite of a period.<br> </div> <br> -<span id="3_Periodsarecomparable"><h3>Periods are comparable</h3></span><br> +<h3 id="3_Periodsarecomparable">Periods are comparable</h3><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type">[< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] <a href="Period.S.html#TYPEperiod">period</a> -><br> [< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] <a href="Period.S.html#TYPEperiod">period</a> -> bool</code></pre><div class="info"> Equality function between two periods.<br> <b>Since</b> 1.09.0<br> diff --git a/doc/Period.html b/doc/Period.html index fc2ad54..d38bceb 100644 --- a/doc/Period.html +++ b/doc/Period.html @@ -28,16 +28,17 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Period</title> </head> <body> -<div class="navbar"><a href="Time_Zone.html">Previous</a> - <a href="index.html">Up</a> - <a href="Time_sig.html">Next</a> +<div class="navbar"><a class="pre" href="Time_Zone.html" title="Time_Zone">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Time_sig.html" title="Time_sig">Next</a> </div> -<center><h1>Module <a href="type_Period.html">Period</a></h1></center> -<br> -<pre><span class="keyword">module</span> Period: <code class="code"><span class="keyword">sig</span></code> <a href="Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>A period represents the time passed between two events (a date, a time...). +<h1>Module <a href="type_Period.html">Period</a></h1> +<pre><span class="keyword">module</span> Period: <code class="code"><span class="keyword">sig</span></code> <a href="Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +A period represents the time passed between two events (a date, a time...). Only an interface defining arithmetic operations on periods is defined here. An implementation of this interface depends on the kind of an event (see module <code class="code"><span class="constructor">Time</span>.<span class="constructor">Period</span></code>, <code class="code"><span class="constructor">Date</span>.<span class="constructor">Period</span></code> and <code class="code"><span class="constructor">Calendar</span>.<span class="constructor">Period</span></code>).<br> +</div> <hr width="100%"> <pre><span id="TYPEdate_field"><span class="keyword">type</span> <code class="type"></code>date_field</span> = <code class="type">[ `Day | `Month | `Week | `Year ]</code> </pre> diff --git a/doc/Printer.Calendar.html b/doc/Printer.Calendar.html index 8a2d5c4..9f36f1c 100644 --- a/doc/Printer.Calendar.html +++ b/doc/Printer.Calendar.html @@ -29,14 +29,15 @@ <title>Printer.Calendar</title> </head> <body> -<div class="navbar"><a href="Printer.Precise_Calendar.html">Previous</a> - <a href="Printer.html">Up</a> - <a href="Printer.CalendarPrinter.html">Next</a> +<div class="navbar"><a class="pre" href="Printer.Precise_Calendar.html" title="Printer.Precise_Calendar">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.CalendarPrinter.html" title="Printer.CalendarPrinter">Next</a> </div> -<center><h1>Module <a href="type_Printer.Calendar.html">Printer.Calendar</a></h1></center> -<br> -<pre><span class="keyword">module</span> Calendar: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Calendar.t</code></pre>Calendar printer. Default format is <code class="code">%i %<span class="constructor">T</span></code>.<br> +<h1>Module <a href="type_Printer.Calendar.html">Printer.Calendar</a></h1> +<pre><span class="keyword">module</span> Calendar: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Calendar.t</code></pre><div class="info"> +Calendar printer. Default format is <code class="code">%i %<span class="constructor">T</span></code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -64,7 +65,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.CalendarPrinter.html b/doc/Printer.CalendarPrinter.html index adbdf5c..413b3a6 100644 --- a/doc/Printer.CalendarPrinter.html +++ b/doc/Printer.CalendarPrinter.html @@ -29,13 +29,14 @@ <title>Printer.CalendarPrinter</title> </head> <body> -<div class="navbar"><a href="Printer.Calendar.html">Previous</a> - <a href="Printer.html">Up</a> - <a href="Printer.Precise_Fcalendar.html">Next</a> +<div class="navbar"><a class="pre" href="Printer.Calendar.html" title="Printer.Calendar">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.Precise_Fcalendar.html" title="Printer.Precise_Fcalendar">Next</a> +</div> +<h1>Module <a href="type_Printer.CalendarPrinter.html">Printer.CalendarPrinter</a></h1> +<pre><span class="keyword">module</span> CalendarPrinter: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Calendar.t</code></pre><div class="info"> +<span class="warning">Deprecated.</span>Replaced by <a href="Printer.Calendar.html"><code class="code"><span class="constructor">Printer</span>.<span class="constructor">Calendar</span></code></a>.<br> </div> -<center><h1>Module <a href="type_Printer.CalendarPrinter.html">Printer.CalendarPrinter</a></h1></center> -<br> -<pre><span class="keyword">module</span> CalendarPrinter: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Calendar.t</code></pre><span class="warning">Deprecated.</span>Replaced by <a href="Printer.Calendar.html"><code class="code"><span class="constructor">Printer</span>.<span class="constructor">Calendar</span></code></a>.<br> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -63,7 +64,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.Date.html b/doc/Printer.Date.html index e728d17..4145980 100644 --- a/doc/Printer.Date.html +++ b/doc/Printer.Date.html @@ -28,15 +28,16 @@ <title>Printer.Date</title> </head> <body> -<div class="navbar"> <a href="Printer.html">Up</a> - <a href="Printer.DatePrinter.html">Next</a> +<div class="navbar"> <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.DatePrinter.html" title="Printer.DatePrinter">Next</a> </div> -<center><h1>Module <a href="type_Printer.Date.html">Printer.Date</a></h1></center> -<br> -<pre><span class="keyword">module</span> Date: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Date.t</code></pre>Date printer. Specifiers which use time functionalities are not available +<h1>Module <a href="type_Printer.Date.html">Printer.Date</a></h1> +<pre><span class="keyword">module</span> Date: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Date.t</code></pre><div class="info"> +Date printer. Specifiers which use time functionalities are not available on this printer. Default format is <code class="code">%i</code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -64,7 +65,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.DatePrinter.html b/doc/Printer.DatePrinter.html index cb9478d..3cbaa1e 100644 --- a/doc/Printer.DatePrinter.html +++ b/doc/Printer.DatePrinter.html @@ -29,13 +29,14 @@ <title>Printer.DatePrinter</title> </head> <body> -<div class="navbar"><a href="Printer.Date.html">Previous</a> - <a href="Printer.html">Up</a> - <a href="Printer.Time.html">Next</a> +<div class="navbar"><a class="pre" href="Printer.Date.html" title="Printer.Date">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.Time.html" title="Printer.Time">Next</a> +</div> +<h1>Module <a href="type_Printer.DatePrinter.html">Printer.DatePrinter</a></h1> +<pre><span class="keyword">module</span> DatePrinter: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Date.t</code></pre><div class="info"> +<span class="warning">Deprecated.</span>Replaced by <a href="Printer.Date.html"><code class="code"><span class="constructor">Printer</span>.<span class="constructor">Date</span></code></a>.<br> </div> -<center><h1>Module <a href="type_Printer.DatePrinter.html">Printer.DatePrinter</a></h1></center> -<br> -<pre><span class="keyword">module</span> DatePrinter: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Date.t</code></pre><span class="warning">Deprecated.</span>Replaced by <a href="Printer.Date.html"><code class="code"><span class="constructor">Printer</span>.<span class="constructor">Date</span></code></a>.<br> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -63,7 +64,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.Fcalendar.html b/doc/Printer.Fcalendar.html index 80ba435..1965161 100644 --- a/doc/Printer.Fcalendar.html +++ b/doc/Printer.Fcalendar.html @@ -28,14 +28,15 @@ <title>Printer.Fcalendar</title> </head> <body> -<div class="navbar"><a href="Printer.Precise_Fcalendar.html">Previous</a> - <a href="Printer.html">Up</a> +<div class="navbar"><a class="pre" href="Printer.Precise_Fcalendar.html" title="Printer.Precise_Fcalendar">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> </div> -<center><h1>Module <a href="type_Printer.Fcalendar.html">Printer.Fcalendar</a></h1></center> -<br> -<pre><span class="keyword">module</span> Fcalendar: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Fcalendar.t</code></pre>Fcalendar printer. Seconds are rounded to integers before pretty printing. +<h1>Module <a href="type_Printer.Fcalendar.html">Printer.Fcalendar</a></h1> +<pre><span class="keyword">module</span> Fcalendar: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Fcalendar.t</code></pre><div class="info"> +Fcalendar printer. Seconds are rounded to integers before pretty printing. Default format is <code class="code">%i %<span class="constructor">T</span></code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -63,7 +64,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.Ftime.html b/doc/Printer.Ftime.html index 690cdf3..0398198 100644 --- a/doc/Printer.Ftime.html +++ b/doc/Printer.Ftime.html @@ -29,17 +29,18 @@ <title>Printer.Ftime</title> </head> <body> -<div class="navbar"><a href="Printer.TimePrinter.html">Previous</a> - <a href="Printer.html">Up</a> - <a href="Printer.Precise_Calendar.html">Next</a> +<div class="navbar"><a class="pre" href="Printer.TimePrinter.html" title="Printer.TimePrinter">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.Precise_Calendar.html" title="Printer.Precise_Calendar">Next</a> </div> -<center><h1>Module <a href="type_Printer.Ftime.html">Printer.Ftime</a></h1></center> -<br> -<pre><span class="keyword">module</span> Ftime: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Ftime.t</code></pre>Ftime printer. Seconds are rounded to integers before pretty printing. +<h1>Module <a href="type_Printer.Ftime.html">Printer.Ftime</a></h1> +<pre><span class="keyword">module</span> Ftime: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Ftime.t</code></pre><div class="info"> +Ftime printer. Seconds are rounded to integers before pretty printing. Specifiers which use date functionalities are not available on this printer. Default format is <code class="code">%<span class="constructor">T</span></code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -67,7 +68,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.Precise_Calendar.html b/doc/Printer.Precise_Calendar.html index 205a139..f3fd1b8 100644 --- a/doc/Printer.Precise_Calendar.html +++ b/doc/Printer.Precise_Calendar.html @@ -29,14 +29,15 @@ <title>Printer.Precise_Calendar</title> </head> <body> -<div class="navbar"><a href="Printer.Ftime.html">Previous</a> - <a href="Printer.html">Up</a> - <a href="Printer.Calendar.html">Next</a> +<div class="navbar"><a class="pre" href="Printer.Ftime.html" title="Printer.Ftime">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.Calendar.html" title="Printer.Calendar">Next</a> </div> -<center><h1>Module <a href="type_Printer.Precise_Calendar.html">Printer.Precise_Calendar</a></h1></center> -<br> -<pre><span class="keyword">module</span> Precise_Calendar: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = <a href="Calendar.Precise.html">Calendar.Precise</a>.t</code></pre>Precise Calendar printer. Default format is <code class="code">%i %<span class="constructor">T</span></code>.<br> +<h1>Module <a href="type_Printer.Precise_Calendar.html">Printer.Precise_Calendar</a></h1> +<pre><span class="keyword">module</span> Precise_Calendar: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = <a href="Calendar.Precise.html">Calendar.Precise</a>.t</code></pre><div class="info"> +Precise Calendar printer. Default format is <code class="code">%i %<span class="constructor">T</span></code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -64,7 +65,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.Precise_Fcalendar.html b/doc/Printer.Precise_Fcalendar.html index e792b8c..6895efe 100644 --- a/doc/Printer.Precise_Fcalendar.html +++ b/doc/Printer.Precise_Fcalendar.html @@ -29,16 +29,17 @@ <title>Printer.Precise_Fcalendar</title> </head> <body> -<div class="navbar"><a href="Printer.CalendarPrinter.html">Previous</a> - <a href="Printer.html">Up</a> - <a href="Printer.Fcalendar.html">Next</a> +<div class="navbar"><a class="pre" href="Printer.CalendarPrinter.html" title="Printer.CalendarPrinter">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.Fcalendar.html" title="Printer.Fcalendar">Next</a> </div> -<center><h1>Module <a href="type_Printer.Precise_Fcalendar.html">Printer.Precise_Fcalendar</a></h1></center> -<br> -<pre><span class="keyword">module</span> Precise_Fcalendar: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = <a href="Fcalendar.Precise.html">Fcalendar.Precise</a>.t</code></pre>Precise Fcalendar printer. +<h1>Module <a href="type_Printer.Precise_Fcalendar.html">Printer.Precise_Fcalendar</a></h1> +<pre><span class="keyword">module</span> Precise_Fcalendar: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = <a href="Fcalendar.Precise.html">Fcalendar.Precise</a>.t</code></pre><div class="info"> +Precise Fcalendar printer. Seconds are rounded to integers before pretty printing. Default format is <code class="code">%i %<span class="constructor">T</span></code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -66,7 +67,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.S.html b/doc/Printer.S.html index 0e53a04..9add055 100644 --- a/doc/Printer.S.html +++ b/doc/Printer.S.html @@ -27,11 +27,12 @@ <title>Printer.S</title> </head> <body> -<div class="navbar"> <a href="Printer.html">Up</a> +<div class="navbar"> <a class="up" href="Printer.html" title="Printer">Up</a> </div> -<center><h1>Module type <a href="type_Printer.S.html">Printer.S</a></h1></center> -<br> -<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Printer.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Generic signature of a printer-parser.<br> +<h1>Module type <a href="type_Printer.S.html">Printer.S</a></h1> +<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Printer.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Generic signature of a printer-parser.<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -59,7 +60,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.Time.html b/doc/Printer.Time.html index 1fcbfe0..2170b09 100644 --- a/doc/Printer.Time.html +++ b/doc/Printer.Time.html @@ -29,16 +29,17 @@ <title>Printer.Time</title> </head> <body> -<div class="navbar"><a href="Printer.DatePrinter.html">Previous</a> - <a href="Printer.html">Up</a> - <a href="Printer.TimePrinter.html">Next</a> +<div class="navbar"><a class="pre" href="Printer.DatePrinter.html" title="Printer.DatePrinter">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.TimePrinter.html" title="Printer.TimePrinter">Next</a> </div> -<center><h1>Module <a href="type_Printer.Time.html">Printer.Time</a></h1></center> -<br> -<pre><span class="keyword">module</span> Time: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Time.t</code></pre>Time printer. Specifiers which use date functionalities are not available +<h1>Module <a href="type_Printer.Time.html">Printer.Time</a></h1> +<pre><span class="keyword">module</span> Time: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Time.t</code></pre><div class="info"> +Time printer. Specifiers which use date functionalities are not available on this printer. Default format is <code class="code">%<span class="constructor">T</span></code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -66,7 +67,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.TimePrinter.html b/doc/Printer.TimePrinter.html index df6bece..185eec2 100644 --- a/doc/Printer.TimePrinter.html +++ b/doc/Printer.TimePrinter.html @@ -29,13 +29,14 @@ <title>Printer.TimePrinter</title> </head> <body> -<div class="navbar"><a href="Printer.Time.html">Previous</a> - <a href="Printer.html">Up</a> - <a href="Printer.Ftime.html">Next</a> +<div class="navbar"><a class="pre" href="Printer.Time.html" title="Printer.Time">Previous</a> + <a class="up" href="Printer.html" title="Printer">Up</a> + <a class="post" href="Printer.Ftime.html" title="Printer.Ftime">Next</a> +</div> +<h1>Module <a href="type_Printer.TimePrinter.html">Printer.TimePrinter</a></h1> +<pre><span class="keyword">module</span> TimePrinter: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Time.t</code></pre><div class="info"> +<span class="warning">Deprecated.</span>Replaced by <a href="Printer.Time.html"><code class="code"><span class="constructor">Printer</span>.<span class="constructor">Time</span></code></a>.<br> </div> -<center><h1>Module <a href="type_Printer.TimePrinter.html">Printer.TimePrinter</a></h1></center> -<br> -<pre><span class="keyword">module</span> TimePrinter: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Time.t</code></pre><span class="warning">Deprecated.</span>Replaced by <a href="Printer.Time.html"><code class="code"><span class="constructor">Printer</span>.<span class="constructor">Time</span></code></a>.<br> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> @@ -63,7 +64,7 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is (see the printer implementations).<br> </div> <br> -<span id="3_Parsersfromstring"><h3>Parsers from string</h3></span><br> +<h3 id="3_Parsersfromstring">Parsers from string</h3><br> <pre><span id="VALfrom_fstring"><span class="keyword">val</span> from_fstring</span> : <code class="type">string -> string -> <a href="Printer.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">from_fstring format s</code> converts <code class="code">s</code> to a date according to <code class="code">format</code>. <p> diff --git a/doc/Printer.html b/doc/Printer.html index 6c05d38..0e8da9e 100644 --- a/doc/Printer.html +++ b/doc/Printer.html @@ -30,13 +30,13 @@ <title>Printer</title> </head> <body> -<div class="navbar"><a href="Fcalendar.html">Previous</a> - <a href="index.html">Up</a> - <a href="Version.html">Next</a> +<div class="navbar"><a class="pre" href="Fcalendar.html" title="Fcalendar">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Version.html" title="Version">Next</a> </div> -<center><h1>Module <a href="type_Printer.html">Printer</a></h1></center> -<br> -<pre><span class="keyword">module</span> Printer: <code class="code"><span class="keyword">sig</span></code> <a href="Printer.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Pretty printing and parsing from string. +<h1>Module <a href="type_Printer.html">Printer</a></h1> +<pre><span class="keyword">module</span> Printer: <code class="code"><span class="keyword">sig</span></code> <a href="Printer.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Pretty printing and parsing from string. In the following, an "event" is either a date or a time or a calendar. <p> @@ -108,9 +108,10 @@ </li><li>a possible output of <code class="code">the date is %<span class="constructor">B</span>, the %-dth</code> is <code class="code">the date is <span class="constructor">January</span>, the 6th</code> is matched by ;<br> </li><li>a possible output of <code class="code">%<span class="constructor">D</span></code> is <code class="code">01/06/03</code><br> -</li></ul><hr width="100%"> +</li></ul></div> +<hr width="100%"> <br> -<span id="2_Internationalization"><h2>Internationalization</h2></span> +<h2 id="2_Internationalization">Internationalization</h2> <p> You can manage the string representations of days and months. @@ -145,7 +146,7 @@ Set the regular expression used to recognize words in <b>Since</b> 1.10<br> </div> <br> -<span id="2_Printersincludingparsersfromstring"><h2>Printers (including parsers from string)</h2></span> +<h2 id="2_Printersincludingparsersfromstring">Printers (including parsers from string)</h2> <p> Printers also contain parsers which allow to build events from strings.<br> @@ -156,12 +157,12 @@ Generic signature of a printer-parser. Date printer. </div> <pre><span class="keyword">module</span> <a href="Printer.DatePrinter.html">DatePrinter</a>: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Date.t</code></pre><div class="info"> -<font color="#CCCCCC"></font></div> +<span class="deprecated"></span></div> <pre><span class="keyword">module</span> <a href="Printer.Time.html">Time</a>: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Time.t</code></pre><div class="info"> Time printer. </div> <pre><span class="keyword">module</span> <a href="Printer.TimePrinter.html">TimePrinter</a>: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Time.t</code></pre><div class="info"> -<font color="#CCCCCC"></font></div> +<span class="deprecated"></span></div> <pre><span class="keyword">module</span> <a href="Printer.Ftime.html">Ftime</a>: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Ftime.t</code></pre><div class="info"> Ftime printer. </div> @@ -172,7 +173,7 @@ Precise Calendar printer. Calendar printer. </div> <pre><span class="keyword">module</span> <a href="Printer.CalendarPrinter.html">CalendarPrinter</a>: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = Calendar.t</code></pre><div class="info"> -<font color="#CCCCCC"></font></div> +<span class="deprecated"></span></div> <pre><span class="keyword">module</span> <a href="Printer.Precise_Fcalendar.html">Precise_Fcalendar</a>: <code class="type"><a href="Printer.S.html">S</a></code><code class="type"> with type t = <a href="Fcalendar.Precise.html">Fcalendar.Precise</a>.t</code></pre><div class="info"> Precise Fcalendar printer. </div> diff --git a/doc/Time.html b/doc/Time.html index bb8165a..80e9bd5 100644 --- a/doc/Time.html +++ b/doc/Time.html @@ -28,13 +28,14 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Time</title> </head> <body> -<div class="navbar"><a href="Time_sig.html">Previous</a> - <a href="index.html">Up</a> - <a href="Ftime.html">Next</a> +<div class="navbar"><a class="pre" href="Time_sig.html" title="Time_sig">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Ftime.html" title="Ftime">Next</a> +</div> +<h1>Module <a href="type_Time.html">Time</a></h1> +<pre><span class="keyword">module</span> Time: <code class="code"><span class="keyword">sig</span></code> <a href="Time.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Time implementation in which seconds are integers.<br> </div> -<center><h1>Module <a href="type_Time.html">Time</a></h1></center> -<br> -<pre><span class="keyword">module</span> Time: <code class="code"><span class="keyword">sig</span></code> <a href="Time.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Time implementation in which seconds are integers.<br> <hr width="100%"> <pre><span class="keyword">include</span> <a href="Time_sig.S.html">Time_sig.S</a></pre> </body></html>
\ No newline at end of file diff --git a/doc/Time_Zone.html b/doc/Time_Zone.html index 7351eee..3ec55ca 100644 --- a/doc/Time_Zone.html +++ b/doc/Time_Zone.html @@ -28,37 +28,38 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Time_Zone</title> </head> <body> -<div class="navbar"><a href="Utils.html">Previous</a> - <a href="index.html">Up</a> - <a href="Period.html">Next</a> +<div class="navbar"><a class="pre" href="Utils.html" title="Utils">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Period.html" title="Period">Next</a> </div> -<center><h1>Module <a href="type_Time_Zone.html">Time_Zone</a></h1></center> -<br> -<pre><span class="keyword">module</span> Time_Zone: <code class="code"><span class="keyword">sig</span></code> <a href="Time_Zone.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Time zone management. +<h1>Module <a href="type_Time_Zone.html">Time_Zone</a></h1> +<pre><span class="keyword">module</span> Time_Zone: <code class="code"><span class="keyword">sig</span></code> <a href="Time_Zone.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Time zone management. <p> You can <code class="code">change</code> the <code class="code">current</code> time zone in your program by side effect.<br> +</div> <hr width="100%"> -<br><code><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> = </code><table class="typetable"> +<pre><code><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> = </code></pre><table class="typetable"> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">UTC</span></code></td> +<code><span id="TYPEELTt.UTC"><span class="constructor">UTC</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Greenwich Meridian Time</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">Local</span></code></td> +<code><span id="TYPEELTt.Local"><span class="constructor">Local</span></span></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Local Time</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr> <tr> <td align="left" valign="top" > <code><span class="keyword">|</span></code></td> <td align="left" valign="top" > -<code><span class="constructor">UTC_Plus</span> <span class="keyword">of</span> <code class="type">int</code></code></td> +<code><span id="TYPEELTt.UTC_Plus"><span class="constructor">UTC_Plus</span></span> <span class="keyword">of</span> <code class="type">int</code></code></td> <td class="typefieldcomment" align="left" valign="top" ><code>(*</code></td><td class="typefieldcomment" align="left" valign="top" >Another time zone specified from UTC</td><td class="typefieldcomment" align="left" valign="bottom" ><code>*)</code></td> </tr></table> diff --git a/doc/Time_sig.S.Period.html b/doc/Time_sig.S.Period.html index ff863b3..0082805 100644 --- a/doc/Time_sig.S.Period.html +++ b/doc/Time_sig.S.Period.html @@ -30,15 +30,16 @@ <title>Time_sig.S.Period</title> </head> <body> -<div class="navbar"><a href="Time_sig.S.Second.html">Previous</a> - <a href="Time_sig.S.html">Up</a> +<div class="navbar"><a class="pre" href="Time_sig.S.Second.html" title="Time_sig.S.Second">Previous</a> + <a class="up" href="Time_sig.S.html" title="Time_sig.S">Up</a> </div> -<center><h1>Module <a href="type_Time_sig.S.Period.html">Time_sig.S.Period</a></h1></center> -<br> -<pre><span class="keyword">module</span> Period: <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>A period is the number of seconds between two times.<br> +<h1>Module <a href="type_Time_sig.S.Period.html">Time_sig.S.Period</a></h1> +<pre><span class="keyword">module</span> Period: <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +A period is the number of seconds between two times.<br> +</div> <hr width="100%"> <br> -<span id="3_Arithmeticoperations"><h3>Arithmetic operations</h3></span><br> +<h3 id="3_Arithmeticoperations">Arithmetic operations</h3><br> <pre><span class="keyword">include</span> <a href="Period.S.html">Period.S</a></pre> <pre><span id="VALlength"><span class="keyword">val</span> length</span> : <code class="type">[< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] period -> <a href="Time_sig.S.html#TYPEsecond">Time_sig.S.second</a></code></pre><div class="info"> Number of seconds of a period.<br> @@ -50,7 +51,7 @@ Multiplication.<br> Division.<br> </div> <br> -<span id="3_Constructors"><h3>Constructors</h3></span><br> +<h3 id="3_Constructors">Constructors</h3><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> <a href="Time_sig.S.html#TYPEsecond">Time_sig.S.second</a> -> [< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] period</code></pre><div class="info"> <code class="code">make hour minute second</code> makes a period of the specified length.<br> </div> @@ -68,7 +69,7 @@ Labelled version of <code class="code">make</code>. <code class="code">second n</code> makes a period of <code class="code">n</code> seconds.<br> </div> <br> -<span id="3_Getters"><h3>Getters</h3></span><br> +<h3 id="3_Getters">Getters</h3><br> <pre><span id="VALto_seconds"><span class="keyword">val</span> to_seconds</span> : <code class="type">[< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] period -> <a href="Time_sig.S.html#TYPEsecond">Time_sig.S.second</a></code></pre><div class="info"> Number of seconds of a period.<br> <b>Since</b> 1.04<br> diff --git a/doc/Time_sig.S.Second.html b/doc/Time_sig.S.Second.html index ece5b69..a234cdf 100644 --- a/doc/Time_sig.S.Second.html +++ b/doc/Time_sig.S.Second.html @@ -27,13 +27,14 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Time_sig.S.Second</title> </head> <body> -<div class="navbar"> <a href="Time_sig.S.html">Up</a> - <a href="Time_sig.S.Period.html">Next</a> +<div class="navbar"> <a class="up" href="Time_sig.S.html" title="Time_sig.S">Up</a> + <a class="post" href="Time_sig.S.Period.html" title="Time_sig.S.Period">Next</a> </div> -<center><h1>Module <a href="type_Time_sig.S.Second.html">Time_sig.S.Second</a></h1></center> -<br> -<pre><span class="keyword">module</span> Second: <code class="type"><a href="Time_sig.Second.html">Time_sig.Second</a></code><code class="type"> with type t = second</code></pre>Second implementation<br> +<h1>Module <a href="type_Time_sig.S.Second.html">Time_sig.S.Second</a></h1> +<pre><span class="keyword">module</span> Second: <code class="type"><a href="Time_sig.Second.html">Time_sig.Second</a></code><code class="type"> with type t = second</code></pre><div class="info"> +Second implementation<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> diff --git a/doc/Time_sig.S.html b/doc/Time_sig.S.html index d9f61cb..095d034 100644 --- a/doc/Time_sig.S.html +++ b/doc/Time_sig.S.html @@ -37,16 +37,17 @@ <title>Time_sig.S</title> </head> <body> -<div class="navbar"><a href="Time_sig.Second.html">Previous</a> - <a href="Time_sig.html">Up</a> +<div class="navbar"><a class="pre" href="Time_sig.Second.html" title="Time_sig.Second">Previous</a> + <a class="up" href="Time_sig.html" title="Time_sig">Up</a> </div> -<center><h1>Module type <a href="type_Time_sig.S.html">Time_sig.S</a></h1></center> -<br> -<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Common operations for all time representations.<br> +<h1>Module type <a href="type_Time_sig.S.html">Time_sig.S</a></h1> +<pre><span class="keyword">module type</span> S = <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.S.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Common operations for all time representations.<br> <b>Since</b> 2.0 (this signature was before inlined in interface of Time).<br> +</div> <hr width="100%"> <br> -<span id="2_Datatypes"><h2>Datatypes</h2></span><br> +<h2 id="2_Datatypes">Datatypes</h2><br> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> Type of a time.<br> @@ -58,7 +59,7 @@ The different fields of a time.<br> </div> <br> -<span id="2_Second"><h2>Second</h2></span><br> +<h2 id="2_Second">Second</h2><br> <pre><span id="TYPEsecond"><span class="keyword">type</span> <code class="type"></code>second</span> </pre> <div class="info"> Type of a second.<br> @@ -69,7 +70,7 @@ Type of a second.<br> Second implementation </div> <br> -<span id="2_Constructors"><h2>Constructors</h2></span><br> +<h2 id="2_Constructors">Constructors</h2><br> <pre><span id="VALmake"><span class="keyword">val</span> make</span> : <code class="type">int -> int -> <a href="Time_sig.S.html#TYPEsecond">second</a> -> <a href="Time_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">make hour minute second</code> makes the time hour-minute-second.<br> </div> @@ -89,7 +90,7 @@ The current time based on <code class="code"><span class="constructor">Time_Zone So, it has always the same behaviour as <code class="code">make 12 0 0</code>.<br> </div> <br> -<span id="2_Conversions"><h2>Conversions</h2></span><br> +<h2 id="2_Conversions">Conversions</h2><br> <pre><span id="VALconvert"><span class="keyword">val</span> convert</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -> <a href="Time_Zone.html#TYPEt">Time_Zone.t</a> -> <a href="Time_Zone.html#TYPEt">Time_Zone.t</a> -> <a href="Time_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">convert t t1 t2</code> converts the time <code class="code">t</code> expressed in the time zone <code class="code">t1</code> to the same time expressed in the time zone <code class="code">t2</code>.<br> @@ -113,7 +114,7 @@ The current time based on <code class="code"><span class="constructor">Time_Zone (make (-73) 0 0)</code> returns the time 23-0-0 and (-4).<br> </div> <br> -<span id="2_Getters"><h2>Getters</h2></span><br> +<h2 id="2_Getters">Getters</h2><br> <pre><span id="VALhour"><span class="keyword">val</span> hour</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -> int</code></pre><div class="info"> Hour.<br> <b>Example:</b> <code class="code">hour (make 20 0 0)</code> returns 20.<br> @@ -141,7 +142,7 @@ Number of hours of a time. The resulting fractional part represents <b>Example:</b> <code class="code">to_hours (make 1 3 0)</code> returns <code class="code">1 + 0.05 = 1.05</code>.<br> </div> <br> -<span id="2_Timesarecomparable"><h2>Times are comparable</h2></span><br> +<h2 id="2_Timesarecomparable">Times are comparable</h2><br> <pre><span id="VALequal"><span class="keyword">val</span> equal</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -> <a href="Time_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Equality function between two times.<br> <b>Since</b> 1.09.0<br> @@ -157,7 +158,7 @@ Hash function for times.<br> <b>See also</b> <a href="Utils.Comparable.html#VALhash">Utils.Comparable.hash.</a><br> </div> <br> -<span id="2_Booleanoperationsontimes"><h2>Boolean operations on times</h2></span><br> +<h2 id="2_Booleanoperationsontimes">Boolean operations on times</h2><br> <pre><span id="VALis_pm"><span class="keyword">val</span> is_pm</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -> bool</code></pre><div class="info"> Return <code class="code"><span class="keyword">true</span></code> is the time is before midday in the current time zone; <code class="code"><span class="keyword">false</span></code> otherwise.<br> @@ -171,7 +172,7 @@ Return <code class="code"><span class="keyword">true</span></code> is the time i <code class="code"><span class="keyword">true</span></code>.<br> </div> <br> -<span id="2_Coercions"><h2>Coercions</h2></span><br> +<h2 id="2_Coercions">Coercions</h2><br> <pre><span id="VALfrom_seconds"><span class="keyword">val</span> from_seconds</span> : <code class="type"><a href="Time_sig.S.html#TYPEsecond">second</a> -> <a href="Time_sig.S.html#TYPEt">t</a></code></pre><div class="info"> Inverse of <code class="code">to_seconds</code>.<br> </div> @@ -182,12 +183,12 @@ Inverse of <code class="code">to_minutes</code>.<br> Inverse of <code class="code">to_hours</code>.<br> </div> <br> -<span id="2_Period"><h2>Period</h2></span><br> +<h2 id="2_Period">Period</h2><br> <pre><span class="keyword">module</span> <a href="Time_sig.S.Period.html">Period</a>: <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.S.Period.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> A period is the number of seconds between two times. </div> <br> -<span id="2_Arithmeticoperationsontimesandperiods"><h2>Arithmetic operations on times and periods</h2></span><br> +<h2 id="2_Arithmeticoperationsontimesandperiods">Arithmetic operations on times and periods</h2><br> <pre><span id="VALadd"><span class="keyword">val</span> add</span> : <code class="type"><a href="Time_sig.S.html#TYPEt">t</a> -><br> [< <a href="Period.html#TYPEdate_field">Period.date_field</a> ] Period.period -> <a href="Time_sig.S.html#TYPEt">t</a></code></pre><div class="info"> <code class="code">app t p</code> returns <code class="code">t + p</code>.<br> <b>Example:</b> <code class="code">add (make 20 0 0) (<span class="constructor">Period</span>.minute 70)</code> returns the time diff --git a/doc/Time_sig.Second.html b/doc/Time_sig.Second.html index 55ba230..74803ac 100644 --- a/doc/Time_sig.Second.html +++ b/doc/Time_sig.Second.html @@ -27,13 +27,14 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Time_sig.Second</title> </head> <body> -<div class="navbar"> <a href="Time_sig.html">Up</a> - <a href="Time_sig.S.html">Next</a> +<div class="navbar"> <a class="up" href="Time_sig.html" title="Time_sig">Up</a> + <a class="post" href="Time_sig.S.html" title="Time_sig.S">Next</a> </div> -<center><h1>Module type <a href="type_Time_sig.Second.html">Time_sig.Second</a></h1></center> -<br> -<pre><span class="keyword">module type</span> Second = <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.Second.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Interface for seconds.<br> +<h1>Module type <a href="type_Time_sig.Second.html">Time_sig.Second</a></h1> +<pre><span class="keyword">module type</span> Second = <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.Second.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Interface for seconds.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> <div class="info"> diff --git a/doc/Time_sig.html b/doc/Time_sig.html index 1f9c958..8dcabdd 100644 --- a/doc/Time_sig.html +++ b/doc/Time_sig.html @@ -28,13 +28,13 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Time_sig</title> </head> <body> -<div class="navbar"><a href="Period.html">Previous</a> - <a href="index.html">Up</a> - <a href="Time.html">Next</a> +<div class="navbar"><a class="pre" href="Period.html" title="Period">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Time.html" title="Time">Next</a> </div> -<center><h1>Module <a href="type_Time_sig.html">Time_sig</a></h1></center> -<br> -<pre><span class="keyword">module</span> Time_sig: <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Time interface. A time may be seen as a triple (hour, minute, second). +<h1>Module <a href="type_Time_sig.html">Time_sig</a></h1> +<pre><span class="keyword">module</span> Time_sig: <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Time interface. A time may be seen as a triple (hour, minute, second). <p> If minutes and seconds do not belong to <code class="code">[0; 60[</code>, they are coerced into @@ -48,6 +48,7 @@ <a href="Time_Zone.html#VALchange"><code class="code"><span class="constructor">Time_Zone</span>.change</code></a>), each time consequently changes. If you want to express a time in another time zone (and do not affect others times), use the <code class="code">convert</code> function.<br> +</div> <hr width="100%"> <pre><span class="keyword">module type</span> <a href="Time_sig.Second.html">Second</a> = <code class="code"><span class="keyword">sig</span></code> <a href="Time_sig.Second.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> Interface for seconds. diff --git a/doc/Utils.Comparable.html b/doc/Utils.Comparable.html index 367c59d..b1c9fba 100644 --- a/doc/Utils.Comparable.html +++ b/doc/Utils.Comparable.html @@ -26,14 +26,15 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Utils.Comparable</title> </head> <body> -<div class="navbar"> <a href="Utils.html">Up</a> +<div class="navbar"> <a class="up" href="Utils.html" title="Utils">Up</a> </div> -<center><h1>Module type <a href="type_Utils.Comparable.html">Utils.Comparable</a></h1></center> -<br> -<pre><span class="keyword">module type</span> Comparable = <code class="code"><span class="keyword">sig</span></code> <a href="Utils.Comparable.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Interface for comparable and hashable types. +<h1>Module type <a href="type_Utils.Comparable.html">Utils.Comparable</a></h1> +<pre><span class="keyword">module type</span> Comparable = <code class="code"><span class="keyword">sig</span></code> <a href="Utils.Comparable.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Interface for comparable and hashable types. Modules implementing this interface can be an argument of <code class="code"><span class="constructor">Map</span>.<span class="constructor">Make</span></code>, <code class="code"><span class="constructor">Set</span>.<span class="constructor">Make</span></code> or <code class="code"><span class="constructor">Hashtbl</span>.<span class="constructor">Make</span></code>.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> diff --git a/doc/Utils.Float.html b/doc/Utils.Float.html index 255a5df..9b3b5f8 100644 --- a/doc/Utils.Float.html +++ b/doc/Utils.Float.html @@ -27,13 +27,14 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Utils.Float</title> </head> <body> -<div class="navbar"><a href="Utils.Int.html">Previous</a> - <a href="Utils.html">Up</a> +<div class="navbar"><a class="pre" href="Utils.Int.html" title="Utils.Int">Previous</a> + <a class="up" href="Utils.html" title="Utils">Up</a> </div> -<center><h1>Module <a href="type_Utils.Float.html">Utils.Float</a></h1></center> -<br> -<pre><span class="keyword">module</span> Float: <code class="code"><span class="keyword">sig</span></code> <a href="Utils.Float.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Float implementation.<br> +<h1>Module <a href="type_Utils.Float.html">Utils.Float</a></h1> +<pre><span class="keyword">module</span> Float: <code class="code"><span class="keyword">sig</span></code> <a href="Utils.Float.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Float implementation.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span class="keyword">include</span> <a href="Utils.Comparable.html">Utils.Comparable</a></pre> <pre><span id="VALset_precision"><span class="keyword">val</span> set_precision</span> : <code class="type">float -> unit</code></pre><div class="info"> diff --git a/doc/Utils.Int.html b/doc/Utils.Int.html index df3d925..30bff74 100644 --- a/doc/Utils.Int.html +++ b/doc/Utils.Int.html @@ -27,13 +27,14 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Utils.Int</title> </head> <body> -<div class="navbar"> <a href="Utils.html">Up</a> - <a href="Utils.Float.html">Next</a> +<div class="navbar"> <a class="up" href="Utils.html" title="Utils">Up</a> + <a class="post" href="Utils.Float.html" title="Utils.Float">Next</a> </div> -<center><h1>Module <a href="type_Utils.Int.html">Utils.Int</a></h1></center> -<br> -<pre><span class="keyword">module</span> Int: <code class="type"><a href="Utils.Comparable.html">Comparable</a></code><code class="type"> with type t = int</code></pre>Integer implementation.<br> +<h1>Module <a href="type_Utils.Int.html">Utils.Int</a></h1> +<pre><span class="keyword">module</span> Int: <code class="type"><a href="Utils.Comparable.html">Comparable</a></code><code class="type"> with type t = int</code></pre><div class="info"> +Integer implementation.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="TYPEt"><span class="keyword">type</span> <code class="type"></code>t</span> </pre> diff --git a/doc/Utils.html b/doc/Utils.html index b10be68..d9d6e0e 100644 --- a/doc/Utils.html +++ b/doc/Utils.html @@ -27,13 +27,14 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Utils</title> </head> <body> -<div class="navbar"> <a href="index.html">Up</a> - <a href="Time_Zone.html">Next</a> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + <a class="post" href="Time_Zone.html" title="Time_Zone">Next</a> </div> -<center><h1>Module <a href="type_Utils.html">Utils</a></h1></center> -<br> -<pre><span class="keyword">module</span> Utils: <code class="code"><span class="keyword">sig</span></code> <a href="Utils.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Some utilities.<br> +<h1>Module <a href="type_Utils.html">Utils</a></h1> +<pre><span class="keyword">module</span> Utils: <code class="code"><span class="keyword">sig</span></code> <a href="Utils.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Some utilities.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span class="keyword">module type</span> <a href="Utils.Comparable.html">Comparable</a> = <code class="code"><span class="keyword">sig</span></code> <a href="Utils.Comparable.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> Interface for comparable and hashable types. diff --git a/doc/Version.html b/doc/Version.html index 1df21f0..23a92b3 100644 --- a/doc/Version.html +++ b/doc/Version.html @@ -27,13 +27,14 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Version</title> </head> <body> -<div class="navbar"><a href="Printer.html">Previous</a> - <a href="index.html">Up</a> +<div class="navbar"><a class="pre" href="Printer.html" title="Printer">Previous</a> + <a class="up" href="index.html" title="Index">Up</a> </div> -<center><h1>Module <a href="type_Version.html">Version</a></h1></center> -<br> -<pre><span class="keyword">module</span> Version: <code class="code"><span class="keyword">sig</span></code> <a href="Version.html">..</a> <code class="code"><span class="keyword">end</span></code></pre>Information about version of calendar.<br> +<h1>Module <a href="type_Version.html">Version</a></h1> +<pre><span class="keyword">module</span> Version: <code class="code"><span class="keyword">sig</span></code> <a href="Version.html">..</a> <code class="code"><span class="keyword">end</span></code></pre><div class="info"> +Information about version of calendar.<br> <b>Since</b> 2.0<br> +</div> <hr width="100%"> <pre><span id="VALversion"><span class="keyword">val</span> version</span> : <code class="type">string</code></pre><div class="info"> Name of this version.<br> diff --git a/doc/index.html b/doc/index.html index 714e9f5..4e3bf43 100644 --- a/doc/index.html +++ b/doc/index.html @@ -25,67 +25,69 @@ <link title="Version" rel="Chapter" href="Version.html"><title></title> </head> <body> -<center><h1></h1></center> -<a href="index_types.html">Index of types</a><br> -<a href="index_exceptions.html">Index of exceptions</a><br> -<a href="index_values.html">Index of values</a><br> -<a href="index_modules.html">Index of modules</a><br> -<a href="index_module_types.html">Index of module types</a><br> +<h1></h1> +<ul class="indexlist"> +<li><a href="index_types.html">Index of types</a></li> +<li><a href="index_exceptions.html">Index of exceptions</a></li> +<li><a href="index_values.html">Index of values</a></li> +<li><a href="index_modules.html">Index of modules</a></li> +<li><a href="index_module_types.html">Index of module types</a></li> +</ul> <br/><br> <table class="indextable"> -<tr><td><a href="Utils.html">Utils</a></td><td><div class="info"> +<tr><td class="module"><a href="Utils.html">Utils</a></td><td><div class="info"> Some utilities. </div> </td></tr> -<tr><td><a href="Time_Zone.html">Time_Zone</a></td><td><div class="info"> +<tr><td class="module"><a href="Time_Zone.html">Time_Zone</a></td><td><div class="info"> Time zone management. </div> </td></tr> -<tr><td><a href="Period.html">Period</a></td><td><div class="info"> +<tr><td class="module"><a href="Period.html">Period</a></td><td><div class="info"> A period represents the time passed between two events (a date, a time...). </div> </td></tr> -<tr><td><a href="Time_sig.html">Time_sig</a></td><td><div class="info"> +<tr><td class="module"><a href="Time_sig.html">Time_sig</a></td><td><div class="info"> Time interface. </div> </td></tr> -<tr><td><a href="Time.html">Time</a></td><td><div class="info"> +<tr><td class="module"><a href="Time.html">Time</a></td><td><div class="info"> Time implementation in which seconds are integers. </div> </td></tr> -<tr><td><a href="Ftime.html">Ftime</a></td><td><div class="info"> +<tr><td class="module"><a href="Ftime.html">Ftime</a></td><td><div class="info"> Time implementation in which seconds are floats. </div> </td></tr> -<tr><td><a href="Date_sig.html">Date_sig</a></td><td><div class="info"> +<tr><td class="module"><a href="Date_sig.html">Date_sig</a></td><td><div class="info"> Date interface. </div> </td></tr> -<tr><td><a href="Date.html">Date</a></td><td><div class="info"> +<tr><td class="module"><a href="Date.html">Date</a></td><td><div class="info"> Date implementation. </div> </td></tr> -<tr><td><a href="Calendar_sig.html">Calendar_sig</a></td><td><div class="info"> +<tr><td class="module"><a href="Calendar_sig.html">Calendar_sig</a></td><td><div class="info"> Calendar interface. </div> </td></tr> -<tr><td><a href="Calendar_builder.html">Calendar_builder</a></td><td><div class="info"> +<tr><td class="module"><a href="Calendar_builder.html">Calendar_builder</a></td><td><div class="info"> Generic calendar implementation. </div> </td></tr> -<tr><td><a href="Calendar.html">Calendar</a></td><td><div class="info"> +<tr><td class="module"><a href="Calendar.html">Calendar</a></td><td><div class="info"> Calendar implementation in which seconds are integer. </div> </td></tr> -<tr><td><a href="Fcalendar.html">Fcalendar</a></td><td><div class="info"> +<tr><td class="module"><a href="Fcalendar.html">Fcalendar</a></td><td><div class="info"> Calendar implementation in which seconds are float. </div> </td></tr> -<tr><td><a href="Printer.html">Printer</a></td><td><div class="info"> +<tr><td class="module"><a href="Printer.html">Printer</a></td><td><div class="info"> Pretty printing and parsing from string. </div> </td></tr> -<tr><td><a href="Version.html">Version</a></td><td><div class="info"> +<tr><td class="module"><a href="Version.html">Version</a></td><td><div class="info"> Information about version of calendar. </div> </td></tr> diff --git a/doc/index_attributes.html b/doc/index_attributes.html index b218fb9..cdd77e2 100644 --- a/doc/index_attributes.html +++ b/doc/index_attributes.html @@ -24,8 +24,10 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of class attributes</title> </head> <body> -<center><h1>Index of class attributes</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of class attributes</h1> <table> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/index_class_types.html b/doc/index_class_types.html index f7fb94d..08686ba 100644 --- a/doc/index_class_types.html +++ b/doc/index_class_types.html @@ -24,8 +24,10 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of class types</title> </head> <body> -<center><h1>Index of class types</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of class types</h1> <table> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/index_classes.html b/doc/index_classes.html index d219bb1..de18ee6 100644 --- a/doc/index_classes.html +++ b/doc/index_classes.html @@ -24,8 +24,10 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of classes</title> </head> <body> -<center><h1>Index of classes</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of classes</h1> <table> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/index_exceptions.html b/doc/index_exceptions.html index 3011ccd..2195cc9 100644 --- a/doc/index_exceptions.html +++ b/doc/index_exceptions.html @@ -24,7 +24,9 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of exceptions</title> </head> <body> -<center><h1>Index of exceptions</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of exceptions</h1> <table> <tr><td align="left"><br>N</td></tr> <tr><td><a href="Calendar_sig.S.Period.html#EXCEPTIONNot_computable">Not_computable</a> [<a href="Calendar_sig.S.Period.html">Calendar_sig.S.Period</a>]</td> @@ -49,6 +51,6 @@ Raised when a date belongs to <code class="code">[<span class="constructor">October</span> 5th, 1582; <span class="constructor">October</span> 14th, 1582]</code>. </div> </td></tr> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/index_methods.html b/doc/index_methods.html index 6b3bba1..09708ab 100644 --- a/doc/index_methods.html +++ b/doc/index_methods.html @@ -24,8 +24,10 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of class methods</title> </head> <body> -<center><h1>Index of class methods</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of class methods</h1> <table> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/index_module_types.html b/doc/index_module_types.html index da3e8ae..747f77e 100644 --- a/doc/index_module_types.html +++ b/doc/index_module_types.html @@ -24,7 +24,9 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of module types</title> </head> <body> -<center><h1>Index of module types</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of module types</h1> <table> <tr><td align="left"><br>C</td></tr> <tr><td><a href="Utils.Comparable.html">Comparable</a> [<a href="Utils.html">Utils</a>]</td> @@ -63,6 +65,6 @@ Common interface for all periods. Interface for seconds. </div> </td></tr> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/index_modules.html b/doc/index_modules.html index 4473f22..34910fa 100644 --- a/doc/index_modules.html +++ b/doc/index_modules.html @@ -24,7 +24,9 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of modules</title> </head> <body> -<center><h1>Index of modules</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of modules</h1> <table> <tr><td align="left"><br>C</td></tr> <tr><td><a href="Printer.Calendar.html">Calendar</a> [<a href="Printer.html">Printer</a>]</td> @@ -39,7 +41,7 @@ Calendar implementation in which seconds are integer. </td></tr> <tr><td><a href="Printer.CalendarPrinter.html">CalendarPrinter</a> [<a href="Printer.html">Printer</a>]</td> <td><div class="info"> -<font color="#CCCCCC"></font></div> +<span class="deprecated"></span></div> </td></tr> <tr><td><a href="Calendar_builder.html">Calendar_builder</a> </td> <td><div class="info"> @@ -69,7 +71,7 @@ Date implementation. </td></tr> <tr><td><a href="Printer.DatePrinter.html">DatePrinter</a> [<a href="Printer.html">Printer</a>]</td> <td><div class="info"> -<font color="#CCCCCC"></font></div> +<span class="deprecated"></span></div> </td></tr> <tr><td><a href="Date_sig.html">Date_sig</a> </td> <td><div class="info"> @@ -189,7 +191,7 @@ Time implementation in which seconds are integers. </td></tr> <tr><td><a href="Printer.TimePrinter.html">TimePrinter</a> [<a href="Printer.html">Printer</a>]</td> <td><div class="info"> -<font color="#CCCCCC"></font></div> +<span class="deprecated"></span></div> </td></tr> <tr><td><a href="Time_Zone.html">Time_Zone</a> </td> <td><div class="info"> @@ -213,6 +215,6 @@ Some utilities. Information about version of calendar. </div> </td></tr> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/index_types.html b/doc/index_types.html index c13db6b..3ef03f6 100644 --- a/doc/index_types.html +++ b/doc/index_types.html @@ -24,7 +24,9 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of types</title> </head> <body> -<center><h1>Index of types</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of types</h1> <table> <tr><td align="left"><br>D</td></tr> <tr><td><a href="Date_sig.S.html#TYPEdate">date</a> [<a href="Date_sig.S.html">Date_sig.S</a>]</td> @@ -131,6 +133,6 @@ Year as an int Year as an <code class="code">int</code>. </div> </td></tr> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/index_values.html b/doc/index_values.html index 2e89016..54d0488 100644 --- a/doc/index_values.html +++ b/doc/index_values.html @@ -24,7 +24,9 @@ <link title="Version" rel="Chapter" href="Version.html"><title>Index of values</title> </head> <body> -<center><h1>Index of values</h1></center> +<div class="navbar"> <a class="up" href="index.html" title="Index">Up</a> + </div> +<h1>Index of values</h1> <table> <tr><td align="left"><br>A</td></tr> <tr><td><a href="Calendar_sig.S.Period.html#VALadd">add</a> [<a href="Calendar_sig.S.Period.html">Calendar_sig.S.Period</a>]</td> @@ -708,8 +710,8 @@ Multiplication. </td></tr> <tr><td><a href="Date_sig.S.Period.html#VALnb_days">nb_days</a> [<a href="Date_sig.S.Period.html">Date_sig.S.Period</a>]</td> <td><div class="info"> -<font color="#CCCCCC">Number of days in a period. -</font></div> +<span class="deprecated">Number of days in a period. +</span></div> </td></tr> <tr><td><a href="Calendar_sig.S.html#VALnext">next</a> [<a href="Calendar_sig.S.html">Calendar_sig.S</a>]</td> <td><div class="info"> @@ -1006,8 +1008,8 @@ Same as <code class="code">sprint d</code> where <code class="code">d</code> is </td></tr> <tr><td><a href="Calendar_sig.S.Period.html#VALto_time">to_time</a> [<a href="Calendar_sig.S.Period.html">Calendar_sig.S.Period</a>]</td> <td><div class="info"> -<font color="#CCCCCC">Convert a calendar period to a date period. -</font></div> +<span class="deprecated">Convert a calendar period to a date period. +</span></div> </td></tr> <tr><td><a href="Calendar_sig.S.html#VALto_time">to_time</a> [<a href="Calendar_sig.S.html">Calendar_sig.S</a>]</td> <td><div class="info"> @@ -1115,6 +1117,6 @@ Number of years, months and days in a period. Number of years, months, days and seconds in a period. </div> </td></tr> -</table><br> +</table> </body> </html>
\ No newline at end of file diff --git a/doc/style.css b/doc/style.css index 9c84d31..993fd5c 100644 --- a/doc/style.css +++ b/doc/style.css @@ -1,7 +1,3 @@ -a:visited {color : #416DFF; text-decoration : none; } -a:link {color : #416DFF; text-decoration : none;} -a:hover {color : Red; text-decoration : none; background-color: #5FFF88} -a:active {color : Red; text-decoration : underline; } .keyword { font-weight : bold ; color : Red } .keywordsign { color : #C04600 } .superscript { font-size : 4 } @@ -11,24 +7,35 @@ a:active {color : Red; text-decoration : underline; } .type { color : #5C6585 } .string { color : Maroon } .warning { color : Red ; font-weight : bold } -.info { margin-left : 3em; margin-right : 3em } +.info { margin-left : 3em; margin-right: 3em } .param_info { margin-top: 4px; margin-left : 3em; margin-right : 3em } .code { color : #465F91 ; } +.typetable { border-style : hidden } +.paramstable { border-style : hidden ; padding: 5pt 5pt} +tr { background-color : White } +td.typefieldcomment { background-color : #FFFFFF ; font-size: smaller ;} +div.sig_block {margin-left: 2em} +*:target { background: yellow; } +body {font: 13px sans-serif; color: black; text-align: left; padding: 5px; margin: 0} h1 { font-size : 20pt ; text-align: center; } h2 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90BDFF ;padding: 2px; } h3 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90DDFF ;padding: 2px; } h4 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90EDFF ;padding: 2px; } h5 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90FDFF ;padding: 2px; } -h6 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #C0FFFF ; padding: 2px; } +h6 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #90BDFF ; padding: 2px; } div.h7 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #E0FFFF ; padding: 2px; } div.h8 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #F0FFFF ; padding: 2px; } div.h9 { font-size : 20pt ; border: 1px solid #000000; margin-top: 5px; margin-bottom: 2px;text-align: center; background-color: #FFFFFF ; padding: 2px; } -.typetable { border-style : hidden } -.indextable { border-style : hidden } -.paramstable { border-style : hidden ; padding: 5pt 5pt} -body { background-color : White } -tr { background-color : White } -td.typefieldcomment { background-color : #FFFFFF ; font-size: smaller ;} -pre { margin-bottom: 4px } -div.sig_block {margin-left: 2em} -*:target { background: yellow; }
\ No newline at end of file +a {color: #416DFF; text-decoration: none} +a:hover {background-color: #ddd; text-decoration: underline} +pre { margin-bottom: 4px; font-family: monospace; } +pre.verbatim, pre.codepre { } +.indextable {border: 1px #ddd solid; border-collapse: collapse} +.indextable td, .indextable th {border: 1px #ddd solid; min-width: 80px} +.indextable td.module {background-color: #eee ; padding-left: 2px; padding-right: 2px} +.indextable td.module a {color: 4E6272; text-decoration: none; display: block; width: 100%} +.indextable td.module a:hover {text-decoration: underline; background-color: transparent} +.deprecated {color: #888; font-style: italic} +.indextable tr td div.info { margin-left: 2px; margin-right: 2px } +ul.indexlist { margin-left: 0; padding-left: 0;} +ul.indexlist li { list-style-type: none ; margin-left: 0; padding-left: 0; }
\ No newline at end of file diff --git a/src/printer.ml b/src/printer.ml index b87d842..32c1f2d 100644 --- a/src/printer.ml +++ b/src/printer.ml @@ -125,10 +125,14 @@ let word_regexp = ref (Str.regexp "[a-zA-Z]+") let set_word_regexp r = word_regexp := r +type 'a second_builder = + | Int of (int -> int -> int -> int -> int -> int -> 'a) + | Float of (int -> int -> int -> int -> int -> float -> 'a) + (* [Make] creates a printer from a small set of functions. *) module Make(X : sig type t - val make : int -> int -> int -> int -> int -> int -> t + val make : t second_builder val from_business: Date.year -> int -> Date.day -> t val default_format : string val hour : t -> int @@ -318,7 +322,7 @@ struct let day_of_week, week = ref min_int, ref min_int in let year, month, day = ref min_int, ref min_int, ref min_int in let hour, minute, second, pm = - ref min_int, ref min_int, ref min_int, ref 0 + ref min_int, ref min_int, ref (float min_int), ref 0 in let tz = ref 0 in let from_biz () = @@ -355,6 +359,12 @@ struct j := jn + String.length w; w in + let read_float = + let regexp = Str.regexp "[0-9][0-9]\\(\\.[0-9]*\\)?" in + fun () -> + try float_of_string (read_word ~regexp ()) + with Failure _ -> not_match f s + in let parse_a () = ignore (day_of_short_name (read_word ())) in let parse_b () = month := month_of_short_name (read_word ()) in let parse_d () = day := read_number 2 in @@ -368,7 +378,10 @@ struct | "PM" -> pm := 12 | s -> not_match "%p" ("\"" ^ s ^ "\"") in - let parse_S () = second := read_number 2 in + let parse_S () = match X.make with + | Int _ -> second := float (read_number 2) + | Float _ -> second := read_float () + in let parse_V fmt = let n = read_number 2 in if n < 1 || n > 53 then not_match fmt (string_of_int n); @@ -507,7 +520,10 @@ struct in parse_format 0; List.iter (fun f -> f ()) !delayed_computations; - X.make !year !month !day (!hour + !pm + !tz) !minute !second + let build mk = mk !year !month !day (!hour + !pm + !tz) !minute in + match X.make with + | Int f -> build f (Utils.Float.round !second) + | Float f -> build f !second let from_string = from_fstring X.default_format @@ -523,6 +539,7 @@ module Date = let make y m d _ _ _ = cannot_create_event "date" [ y; m; d ]; make y m d + let make = Int make let default_format = "%i" let hour _ = bad_format "hour" let minute _ = bad_format "minute" @@ -539,6 +556,7 @@ module Time = let make _ _ _ h m s = cannot_create_event "time" [ h; m; s ]; make h m s + let make = Int make let default_format = "%T" let from_business _ _ _ = bad_format "from_business" let day_of_week _ = bad_format "day_of_week" @@ -558,8 +576,9 @@ module Ftime = Make(struct include Ftime let make _ _ _ h m s = - cannot_create_event "time" [ h; m; s ]; - make h m (Second.from_int s) + cannot_create_event "time" [ h; m; Utils.Float.round s ]; + make h m s + let make = Float make let second x = Second.to_int (second x) let default_format = "%T" let from_business _ _ _ = bad_format "from_business" @@ -586,6 +605,7 @@ module Precise_Calendar = let seconds_since_1970 c = let p = sub c (make 1970 1 1 0 0 0) in Time.Second.to_int (Time.Period.to_seconds (Period.to_time p)) + let make = Int make end) module Calendar = @@ -600,6 +620,7 @@ module Calendar = let seconds_since_1970 c = let p = sub c (make 1970 1 1 0 0 0) in Time.Second.to_int (Time.Period.to_seconds (Period.to_time p)) + let make = Int make end) module CalendarPrinter = Calendar @@ -608,28 +629,32 @@ module Precise_Fcalendar = Make(struct include Fcalendar.Precise let make y m d h mn s = - cannot_create_event "calendar" [ y; m; d; h; mn; s ]; - make y m d h mn (Time.Second.from_int s) + cannot_create_event + "calendar" [ y; m; d; h; mn; Utils.Float.round s ]; + make y m d h mn s let from_business y w d = from_date (Date.from_business y w d) let second s = Time.Second.to_int (second s) let default_format = "%i %T" let century c = Date.century (year c) let seconds_since_1970 c = - let p = sub c (make 1970 1 1 0 0 0) in + let p = sub c (make 1970 1 1 0 0 0.) in Time.Second.to_int (Time.Period.to_seconds (Period.to_time p)) + let make = Float make end) module Fcalendar = Make(struct include Fcalendar let make y m d h mn s = - cannot_create_event "calendar" [ y; m; d; h; mn; s ]; - make y m d h mn (Time.Second.from_int s) + cannot_create_event + "calendar" [ y; m; d; h; mn; Utils.Float.round s ]; + make y m d h mn s let from_business y w d = from_date (Date.from_business y w d) let second s = Time.Second.to_int (second s) let default_format = "%i %T" let century c = Date.century (year c) let seconds_since_1970 c = - let p = sub c (make 1970 1 1 0 0 0) in + let p = sub c (make 1970 1 1 0 0 0.) in Time.Second.to_int (Time.Period.to_seconds (Period.to_time p)) + let make = Float make end) diff --git a/tests/gen_test.ml b/tests/gen_test.ml index 844582b..4c466e8 100644 --- a/tests/gen_test.ml +++ b/tests/gen_test.ml @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: gen_test.ml 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: gen_test.ml 259 2014-10-29 10:00:46Z signoles $ i*) let ok_ref = ref 0 let ok () = incr ok_ref diff --git a/tests/gen_test.mli b/tests/gen_test.mli index 1b81968..64b1c6f 100644 --- a/tests/gen_test.mli +++ b/tests/gen_test.mli @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: gen_test.mli 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: gen_test.mli 259 2014-10-29 10:00:46Z signoles $ i*) (* Generic functions used in the tests. *) diff --git a/tests/test.ml b/tests/test.ml index 538e572..0af8f95 100644 --- a/tests/test.ml +++ b/tests/test.ml @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: test.ml 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: test.ml 259 2014-10-29 10:00:46Z signoles $ i*) (* Display the results *) diff --git a/tests/test_fcalendar.ml b/tests/test_fcalendar.ml index bf6a6a3..b6f4afc 100644 --- a/tests/test_fcalendar.ml +++ b/tests/test_fcalendar.ml @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: test_fcalendar.ml 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: test_fcalendar.ml 259 2014-10-29 10:00:46Z signoles $ i*) Printf.printf "Tests of Fcalendar:\n";; diff --git a/tests/test_fpcalendar.ml b/tests/test_fpcalendar.ml index e8b2643..e1299e1 100644 --- a/tests/test_fpcalendar.ml +++ b/tests/test_fpcalendar.ml @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: test_fpcalendar.ml 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: test_fpcalendar.ml 259 2014-10-29 10:00:46Z signoles $ i*) Printf.printf "Tests of FPcalendar:\n";; diff --git a/tests/test_ftime.ml b/tests/test_ftime.ml index 60cadda..9e6d4ae 100644 --- a/tests/test_ftime.ml +++ b/tests/test_ftime.ml @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: test_ftime.ml 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: test_ftime.ml 259 2014-10-29 10:00:46Z signoles $ i*) Printf.printf "Tests of Ftime:\n";; diff --git a/tests/test_pcalendar.ml b/tests/test_pcalendar.ml index 5606756..304bf92 100644 --- a/tests/test_pcalendar.ml +++ b/tests/test_pcalendar.ml @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: test_pcalendar.ml 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: test_pcalendar.ml 259 2014-10-29 10:00:46Z signoles $ i*) Printf.printf "Tests of Precise Calendar:\n";; diff --git a/tests/test_printer.ml b/tests/test_printer.ml index e6d1b47..fd4768f 100644 --- a/tests/test_printer.ml +++ b/tests/test_printer.ml @@ -20,8 +20,6 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: test_printer.ml 249 2012-06-27 08:11:14Z signoles $ i*) - Printf.printf "Tests of Printer:\n";; open CalendarLib;; @@ -115,6 +113,12 @@ test test (sprint "%s" (Calendar.make 1971 1 1 0 0 0) = "31536000") "sprint %s";; +test (Utils.Float.equal + (Ftime.second + (Printer.Ftime.from_fstring + "%Y-%m-%dT%H:%M:%S%:z" "2014-03-19T15:51:25.05-07:00")) + 25.05) + "from_string with floating seconds";; let ok = nb_ok ();; let bug = nb_bug ();; diff --git a/tests/test_time.ml b/tests/test_time.ml index b5bbe3e..ba2fd37 100644 --- a/tests/test_time.ml +++ b/tests/test_time.ml @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: test_time.ml 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: test_time.ml 259 2014-10-29 10:00:46Z signoles $ i*) Printf.printf "Tests of Time:\n";; diff --git a/tests/test_timezone.ml b/tests/test_timezone.ml index 8cfc2af..940a460 100644 --- a/tests/test_timezone.ml +++ b/tests/test_timezone.ml @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(*i $Id: test_timezone.ml 249 2012-06-27 08:11:14Z signoles $ i*) +(*i $Id: test_timezone.ml 259 2014-10-29 10:00:46Z signoles $ i*) Printf.printf "Tests of Time_Zone:\n";; diff --git a/utils/example.ml.3 b/utils/example.ml.3 index 50f51e2..1d49b04 100644 --- a/utils/example.ml.3 +++ b/utils/example.ml.3 @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(* $Id: example.ml.3 249 2012-06-27 08:11:14Z signoles $ *) +(** Version for OCaml 3.* *) (** Add a tag @example *) class example = object (self) diff --git a/utils/example.ml.4 b/utils/example.ml.4 index 28d42d4..76e3852 100644 --- a/utils/example.ml.4 +++ b/utils/example.ml.4 @@ -20,7 +20,7 @@ (* LICENSE. *) (**************************************************************************) -(* $Id: example.ml 236 2011-03-24 16:02:29Z signoles $ *) +(** Version for OCaml 4.* *) (** Add a tag @example *) |