From 90ee23cb84d7a394d7fe97f5c153079c6a06c351 Mon Sep 17 00:00:00 2001 From: Stephane Glondu Date: Mon, 18 May 2015 17:29:08 +0200 Subject: Imported Upstream version 2.04 --- .depend | 126 +++++++++++++++++---------------- CHANGES | 8 +++ Makefile.in | 15 ++-- config.status | 4 +- doc/Calendar.Precise.html | 63 +++++++++-------- doc/Calendar.html | 13 ++-- doc/Calendar_builder.Make.html | 65 ++++++++--------- doc/Calendar_builder.Make_Precise.html | 65 ++++++++--------- doc/Calendar_builder.html | 13 ++-- doc/Calendar_sig.S.Date.html | 73 +++++++++---------- doc/Calendar_sig.S.Period.html | 21 +++--- doc/Calendar_sig.S.Time.html | 33 ++++----- doc/Calendar_sig.S.html | 63 +++++++++-------- doc/Calendar_sig.html | 13 ++-- doc/Date.html | 13 ++-- doc/Date_sig.S.Period.html | 15 ++-- doc/Date_sig.S.html | 71 ++++++++++--------- doc/Date_sig.html | 13 ++-- doc/Fcalendar.Precise.html | 63 +++++++++-------- doc/Fcalendar.html | 13 ++-- doc/Ftime.html | 13 ++-- doc/Period.S.html | 13 ++-- doc/Period.html | 13 ++-- doc/Printer.Calendar.html | 15 ++-- doc/Printer.CalendarPrinter.html | 15 ++-- doc/Printer.Date.html | 13 ++-- doc/Printer.DatePrinter.html | 15 ++-- doc/Printer.Fcalendar.html | 13 ++-- doc/Printer.Ftime.html | 15 ++-- doc/Printer.Precise_Calendar.html | 15 ++-- doc/Printer.Precise_Fcalendar.html | 15 ++-- doc/Printer.S.html | 11 +-- doc/Printer.Time.html | 15 ++-- doc/Printer.TimePrinter.html | 15 ++-- doc/Printer.html | 25 +++---- doc/Time.html | 13 ++-- doc/Time_Zone.html | 21 +++--- doc/Time_sig.S.Period.html | 17 ++--- doc/Time_sig.S.Second.html | 11 +-- doc/Time_sig.S.html | 31 ++++---- doc/Time_sig.Second.html | 11 +-- doc/Time_sig.html | 13 ++-- doc/Utils.Comparable.html | 9 +-- doc/Utils.Float.html | 11 +-- doc/Utils.Int.html | 11 +-- doc/Utils.html | 11 +-- doc/Version.html | 11 +-- doc/index.html | 42 +++++------ doc/index_attributes.html | 6 +- doc/index_class_types.html | 6 +- doc/index_classes.html | 6 +- doc/index_exceptions.html | 6 +- doc/index_methods.html | 6 +- doc/index_module_types.html | 6 +- doc/index_modules.html | 12 ++-- doc/index_types.html | 6 +- doc/index_values.html | 14 ++-- doc/style.css | 37 ++++++---- src/printer.ml | 49 +++++++++---- tests/gen_test.ml | 2 +- tests/gen_test.mli | 2 +- tests/test.ml | 2 +- tests/test_fcalendar.ml | 2 +- tests/test_fpcalendar.ml | 2 +- tests/test_ftime.ml | 2 +- tests/test_pcalendar.ml | 2 +- tests/test_printer.ml | 8 ++- tests/test_time.ml | 2 +- tests/test_timezone.ml | 2 +- utils/example.ml.3 | 2 +- utils/example.ml.4 | 2 +- 71 files changed, 747 insertions(+), 633 deletions(-) diff --git a/.depend b/.depend index d537c94..2b491b9 100644 --- a/.depend +++ b/.depend @@ -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 : diff --git a/CHANGES b/CHANGES index a9fc2ef..374cf24 100644 --- a/CHANGES +++ b/CHANGES @@ -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 @@ Calendar.Precise -
 Up +
 Up  
-

Module Calendar.Precise

-
-
module Precise: Calendar_sig.S  with module Date = Date and module Time = Time
More precise implementation of calendar in which seconds are integer.
+

Module Calendar.Precise

+
module Precise: Calendar_sig.S  with module Date = Date and module Time = Time
+More precise implementation of calendar in which seconds are integer.
Since 2.0
+

-

Datatypes


+

Datatypes


module Date: Date_sig.S
Date implementation used by this calendar.
@@ -56,49 +57,49 @@ Time implementation used by this calendar. | -Sun +Sun | -Mon +Mon | -Tue +Tue | -Wed +Wed | -Thu +Thu | -Fri +Fri | -Sat +Sat (*Days of the week.*) @@ -108,84 +109,84 @@ Time implementation used by this calendar. | -Jan +Jan | -Feb +Feb | -Mar +Mar | -Apr +Apr | -May +May | -Jun +Jun | -Jul +Jul | -Aug +Aug | -Sep +Sep | -Oct +Oct | -Nov +Nov | -Dec +Dec (*Months of the year.*) @@ -203,7 +204,7 @@ The different fields of a calendar.

-

Constructors


+

Constructors


val make : int -> int -> int -> int -> int -> second -> t
make year month day hour minute second makes the calendar "year-month-day; hour-minute-second".
@@ -239,7 +240,7 @@ Return the Modified Julian day. It is Julian day - 2 400 000.5 (more precise than Date.from_mjd).

-

Conversions


+

Conversions



Those functions have the same behaviour as those defined in Time_sig.S.
@@ -253,7 +254,7 @@ Those functions have the same behaviour as those defined in See also Time_sig.S.from_gmt

-

Getters


+

Getters



Those functions have the same behavious as those defined in Date_sig.S.
@@ -294,7 +295,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.second

-

Calendars are comparable


+

Calendars are comparable


val equal : t -> t -> bool
Equality function between two calendars.
See also Utils.Comparable.equal.
@@ -330,7 +331,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.is_am

-

Coercions


+

Coercions


val to_unixtm : t -> Unix.tm
Convert a calendar into the unix.tm type. The field isdst is always false. More precise than @@ -368,12 +369,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.
Since 1.03

-

Period


+

Period


module Period: sig .. end
A period is the number of seconds between two calendars.

-

Arithmetic operations on calendars and periods


+

Arithmetic operations on calendars and periods



Those functions have the same behavious as those defined in Date_sig.S.
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 @@ Calendar -
Previous - Up - Next +
Previous + Up + Next
-

Module Calendar

-
-
module Calendar: sig .. end
Calendar implementation in which seconds are integer. +

Module Calendar

+
module Calendar: sig .. end
+Calendar implementation in which seconds are integer.

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 Precise.
+

include Calendar_sig.S
module Precise: Calendar_sig.S  with module Date = Date and module Time = Time
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 @@ Calendar_builder.Make -
 Up - Next +
 Up + Next
-

Functor Calendar_builder.Make

-
-
module Make: 
functor (D : Date_sig.S) -> 
functor (T : Time_sig.S) -> Calendar_sig.S  with module Date = D and module Time = T
Implement a calendar from a date implementation and a time implementation. +

Functor Calendar_builder.Make

+
module Make: 
functor (D : Date_sig.S) -> 
functor (T : Time_sig.S) -> Calendar_sig.S  with module Date = D and module Time = T
+Implement a calendar from a date implementation and a time implementation.

This module uses float. Then results may be very unprecise.
Since 2.0
+

@@ -66,7 +67,7 @@
Parameters:

-

Datatypes


+

Datatypes


module Date: Date_sig.S
Date implementation used by this calendar.
@@ -80,49 +81,49 @@ Time implementation used by this calendar. | -Sun +Sun | -Mon +Mon | -Tue +Tue | -Wed +Wed | -Thu +Thu | -Fri +Fri | -Sat +Sat (*Days of the week.*) @@ -132,84 +133,84 @@ Time implementation used by this calendar. | -Jan +Jan | -Feb +Feb | -Mar +Mar | -Apr +Apr | -May +May | -Jun +Jun | -Jul +Jul | -Aug +Aug | -Sep +Sep | -Oct +Oct | -Nov +Nov | -Dec +Dec (*Months of the year.*) @@ -227,7 +228,7 @@ The different fields of a calendar.

-

Constructors


+

Constructors


val make : int -> int -> int -> int -> int -> second -> t
make year month day hour minute second makes the calendar "year-month-day; hour-minute-second".
@@ -263,7 +264,7 @@ Return the Modified Julian day. It is Julian day - 2 400 000.5 (more precise than Date.from_mjd).

-

Conversions


+

Conversions



Those functions have the same behaviour as those defined in Time_sig.S.
@@ -277,7 +278,7 @@ Those functions have the same behaviour as those defined in See also Time_sig.S.from_gmt

-

Getters


+

Getters



Those functions have the same behavious as those defined in Date_sig.S.
@@ -318,7 +319,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.second

-

Calendars are comparable


+

Calendars are comparable


val equal : t -> t -> bool
Equality function between two calendars.
See also Utils.Comparable.equal.
@@ -354,7 +355,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.is_am

-

Coercions


+

Coercions


val to_unixtm : t -> Unix.tm
Convert a calendar into the unix.tm type. The field isdst is always false. More precise than @@ -392,12 +393,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.
Since 1.03

-

Period


+

Period


module Period: sig .. end
A period is the number of seconds between two calendars.

-

Arithmetic operations on calendars and periods


+

Arithmetic operations on calendars and periods



Those functions have the same behavious as those defined in Date_sig.S.
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 @@ Calendar_builder.Make_Precise -
Previous - Up +
Previous + Up  
-

Functor Calendar_builder.Make_Precise

-
-
module Make_Precise: 
functor (D : Date_sig.S) -> 
functor (T : Time_sig.S) -> Calendar_sig.S  with module Date = D and module Time = T
Similar to Calendar_builder.Make but results are more precise. The counterpart is that +

Functor Calendar_builder.Make_Precise

+
module Make_Precise: 
functor (D : Date_sig.S) -> 
functor (T : Time_sig.S) -> Calendar_sig.S  with module Date = D and module Time = T
+Similar to Calendar_builder.Make but results are more precise. The counterpart is that some operations are less efficient.
Since 2.0
+
@@ -64,7 +65,7 @@
Parameters:

-

Datatypes


+

Datatypes


module Date: Date_sig.S
Date implementation used by this calendar.
@@ -78,49 +79,49 @@ Time implementation used by this calendar. | -Sun +Sun | -Mon +Mon | -Tue +Tue | -Wed +Wed | -Thu +Thu | -Fri +Fri | -Sat +Sat (*Days of the week.*) @@ -130,84 +131,84 @@ Time implementation used by this calendar. | -Jan +Jan | -Feb +Feb | -Mar +Mar | -Apr +Apr | -May +May | -Jun +Jun | -Jul +Jul | -Aug +Aug | -Sep +Sep | -Oct +Oct | -Nov +Nov | -Dec +Dec (*Months of the year.*) @@ -225,7 +226,7 @@ The different fields of a calendar.

-

Constructors


+

Constructors


val make : int -> int -> int -> int -> int -> second -> t
make year month day hour minute second makes the calendar "year-month-day; hour-minute-second".
@@ -261,7 +262,7 @@ Return the Modified Julian day. It is Julian day - 2 400 000.5 (more precise than Date.from_mjd).

-

Conversions


+

Conversions



Those functions have the same behaviour as those defined in Time_sig.S.
@@ -275,7 +276,7 @@ Those functions have the same behaviour as those defined in See also Time_sig.S.from_gmt

-

Getters


+

Getters



Those functions have the same behavious as those defined in Date_sig.S.
@@ -316,7 +317,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.second

-

Calendars are comparable


+

Calendars are comparable


val equal : t -> t -> bool
Equality function between two calendars.
See also Utils.Comparable.equal.
@@ -352,7 +353,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.is_am

-

Coercions


+

Coercions


val to_unixtm : t -> Unix.tm
Convert a calendar into the unix.tm type. The field isdst is always false. More precise than @@ -390,12 +391,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.
Since 1.03

-

Period


+

Period


module Period: sig .. end
A period is the number of seconds between two calendars.

-

Arithmetic operations on calendars and periods


+

Arithmetic operations on calendars and periods



Those functions have the same behavious as those defined in Date_sig.S.
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 @@ Calendar_builder -
Previous - Up - Next +
Previous + Up + Next
-

Module Calendar_builder

-
-
module Calendar_builder: sig .. end
Generic calendar implementation.
+

Module Calendar_builder

+
module Calendar_builder: sig .. end
+Generic calendar implementation.
Since 2.0
+
module Make: 
functor (D : Date_sig.S) -> 
functor (T : Time_sig.S) -> Calendar_sig.S  with module Date = D and module Time = T
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 @@ Calendar_sig.S.Date -
 Up - Next +
 Up + Next
-

Module Calendar_sig.S.Date

-
-
module Date: Date_sig.S
Date implementation used by this calendar.
+

Module Calendar_sig.S.Date

+
module Date: Date_sig.S
+Date implementation used by this calendar.
Since 2.0
+

-

Datatypes


+

Datatypes


type field = Period.date_field
The different fields of a date.
@@ -64,54 +65,54 @@ Type of a date, without specifying any precision level.
Type of a date.
-
type day = +
type day =
+Sun +Mon +Tue +Wed +Thu +Fri +Sat
| -Sun
| -Mon
| -Tue
| -Wed
| -Thu
| -Fri
| -Sat
@@ -119,89 +120,89 @@ Type of a date.
Days of the week.
-
type month = +
type month =
+Jan +Feb +Mar +Apr +May +Jun +Jul +Aug +Sep +Oct +Nov +Dec
| -Jan
| -Feb
| -Mar
| -Apr
| -May
| -Jun
| -Jul
| -Aug
| -Sep
| -Oct
| -Nov
| -Dec
@@ -215,7 +216,7 @@ Year as an int.

-

Exceptions


+

Exceptions


exception Out_of_bounds
Raised when a date is outside the Julian period.
@@ -226,7 +227,7 @@ Raised when a date belongs to [October 5th, 1582; October 14th, 1582].

-

Constructors


+

Constructors


val make : year -> int -> int -> t
make year month day makes the date year-month-day. A BC year y corresponds to the year -(y+1).
@@ -274,7 +275,7 @@ Make a date from a year and its day of the year.
Example: from_day_of_year 2008 39 returns the date 2008-2-8.

-

Getters


+

Getters


val days_in_month : [< field > `Month `Year ] date -> int
Number of days in the month of a date.
Example: days_in_month (make 2003 6 26) returns 30.
@@ -317,7 +318,7 @@ Modified Julian day (i.e. Julian day - 2 400 001). Example: to_mjd (make 1858 11 17) returns 0.

-

Dates are comparable


+

Dates are comparable


val equal : [< field ] date ->
       [< field ] date -> bool
Equality function between two dates.
Since 1.09.0
@@ -333,7 +334,7 @@ Hash function for dates.
See also Utils.Comparable.hash

-

Boolean operations on dates


+

Boolean operations on dates


val is_valid_date : year -> int -> int -> bool
Check if a date is valid, that is the date has not been coerced to look like a real date.
@@ -354,7 +355,7 @@ Return true iff a date be false otherwise.

-

Coercions


+

Coercions


val to_unixtm : t -> Unix.tm
Convert a date into the Unix.tm type. The field is_isdst is always false. The fields Unix.tm_sec, @@ -410,12 +411,12 @@ Inverse of int_of_month.
Raises Invalid_argument if the argument does not belong to 1; 12.

-

Period


+

Period


module Period: sig .. end
A period is the number of days between two dates.

-

Arithmetic operations on dates and periods


+

Arithmetic operations on dates and periods


val add : ([< field ] as 'a) date ->
       'a Period.period -> 'a date
add d p returns d + p.
Raises
  • Out_of_bounds 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).

-

Operations on years


+

Operations on years


val is_leap_year : year -> bool
Return true if a year is a leap year; false otherwise.
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 @@ Calendar_sig.S.Period -
Previous - Up +
Previous + Up  
-

Module Calendar_sig.S.Period

-
-
module Period: sig .. end
A period is the number of seconds between two calendars.
+

Module Calendar_sig.S.Period

+
module Period: sig .. end
+A period is the number of seconds between two calendars.
+

-

Arithmetic operations


+

Arithmetic operations


type +[< Period.date_field ] period 
type t = Period.date_field period
@@ -49,7 +50,7 @@ Type of a period.

-

Period is an additive monoid


+

Period is an additive monoid


val empty : [< Period.date_field ] period
The empty period.
@@ -63,7 +64,7 @@ Substraction of periods.
Opposite of a period.

-

Periods are comparable


+

Periods are comparable


val equal : [< Period.date_field ] period ->
       [< Period.date_field ] period -> bool
Equality function between two periods.
Since 1.09.0
@@ -79,7 +80,7 @@ Hash function for periods.
See also Utils.Comparable.hash

-

Constructors


+

Constructors


val make : int ->
       int -> int -> int -> int -> Calendar_sig.S.second -> t
make year month day hour minute second makes a period of the specified length.
@@ -116,7 +117,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.Period.second

-

Coercions


+

Coercions


val from_date : ([< Period.date_field ] as 'a) Date.Period.period ->
       'a period
Convert a date period to a calendar period.
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 @@ Calendar_sig.S.Time -
Previous - Up - Next +
Previous + Up + Next
-

Module Calendar_sig.S.Time

-
-
module Time: Time_sig.S
Time implementation used by this calendar.
+

Module Calendar_sig.S.Time

+
module Time: Time_sig.S
+Time implementation used by this calendar.
Since 2.0
+

-

Datatypes


+

Datatypes


type t
Type of a time.
@@ -60,7 +61,7 @@ The different fields of a time.

-

Second


+

Second


type second
Type of a second.
@@ -71,7 +72,7 @@ Type of a second.
Second implementation

-

Constructors


+

Constructors


val make : int -> int -> second -> t
make hour minute second makes the time hour-minute-second.
@@ -91,7 +92,7 @@ The current time based on Time_Zone So, it has always the same behaviour as make 12 0 0.

-

Conversions


+

Conversions


val convert : t -> Time_Zone.t -> Time_Zone.t -> t
convert t t1 t2 converts the time t expressed in the time zone t1 to the same time expressed in the time zone t2.
@@ -115,7 +116,7 @@ The current time based on Time_Zone (make (-73) 0 0) returns the time 23-0-0 and (-4).

-

Getters


+

Getters


val hour : t -> int
Hour.
Example: hour (make 20 0 0) returns 20.
@@ -143,7 +144,7 @@ Number of hours of a time. The resulting fractional part represents Example: to_hours (make 1 3 0) returns 1 + 0.05 = 1.05.

-

Times are comparable


+

Times are comparable


val equal : t -> t -> bool
Equality function between two times.
Since 1.09.0
@@ -159,7 +160,7 @@ Hash function for times.
See also Utils.Comparable.hash.

-

Boolean operations on times


+

Boolean operations on times


val is_pm : t -> bool
Return true is the time is before midday in the current time zone; false otherwise.
@@ -173,7 +174,7 @@ Return true is the time i true.

-

Coercions


+

Coercions


val from_seconds : second -> t
Inverse of to_seconds.
@@ -184,12 +185,12 @@ Inverse of to_minutes.
Inverse of to_hours.

-

Period


+

Period


module Period: sig .. end
A period is the number of seconds between two times.

-

Arithmetic operations on times and periods


+

Arithmetic operations on times and periods


val add : t ->
       [< Period.date_field ] Period.period -> t
app t p returns t + p.
Example: add (make 20 0 0) (Period.minute 70) 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 @@ Calendar_sig.S -
 Up +
 Up  
-

Module type Calendar_sig.S

-
-
module type S = sig .. end
Common operations for all calendar representations.
+

Module type Calendar_sig.S

+
module type S = sig .. end
+Common operations for all calendar representations.
Since 2.0 (this signature was before inlined in interface of Calendar).
+

-

Datatypes


+

Datatypes


module Date: Date_sig.S
Date implementation used by this calendar.
@@ -56,49 +57,49 @@ Time implementation used by this calendar. | -Sun +Sun | -Mon +Mon | -Tue +Tue | -Wed +Wed | -Thu +Thu | -Fri +Fri | -Sat +Sat (*Days of the week.*) @@ -108,84 +109,84 @@ Time implementation used by this calendar. | -Jan +Jan | -Feb +Feb | -Mar +Mar | -Apr +Apr | -May +May | -Jun +Jun | -Jul +Jul | -Aug +Aug | -Sep +Sep | -Oct +Oct | -Nov +Nov | -Dec +Dec (*Months of the year.*) @@ -203,7 +204,7 @@ The different fields of a calendar.

-

Constructors


+

Constructors


val make : int -> int -> int -> int -> int -> second -> t
make year month day hour minute second makes the calendar "year-month-day; hour-minute-second".
@@ -239,7 +240,7 @@ Return the Modified Julian day. It is Julian day - 2 400 000.5 (more precise than Date.from_mjd).

-

Conversions


+

Conversions



Those functions have the same behaviour as those defined in Time_sig.S.
@@ -253,7 +254,7 @@ Those functions have the same behaviour as those defined in See also Time_sig.S.from_gmt

-

Getters


+

Getters



Those functions have the same behavious as those defined in Date_sig.S.
@@ -294,7 +295,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.second

-

Calendars are comparable


+

Calendars are comparable


val equal : t -> t -> bool
Equality function between two calendars.
See also Utils.Comparable.equal.
@@ -330,7 +331,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.is_am

-

Coercions


+

Coercions


val to_unixtm : t -> Unix.tm
Convert a calendar into the unix.tm type. The field isdst is always false. More precise than @@ -368,12 +369,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.
Since 1.03

-

Period


+

Period


module Period: sig .. end
A period is the number of seconds between two calendars.

-

Arithmetic operations on calendars and periods


+

Arithmetic operations on calendars and periods



Those functions have the same behavious as those defined in Date_sig.S.
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 @@ Calendar_sig -
Previous - Up - Next +
Previous + Up + Next
-

Module Calendar_sig

-
-
module Calendar_sig: sig .. end
Calendar interface. A calendar combines a date and a time: it may be seen +

Module Calendar_sig

+
module Calendar_sig: sig .. end
+Calendar interface. A calendar combines a date and a time: it may be seen as a 6-uple (year, month, day, hour, minute, second).

@@ -42,6 +42,7 @@ implementation (like module Date). But if you need to manage more precise dates, use this module. The exact Julian period is now [January, 1st 4713 BC at midday GMT; January 22th, 3268 AC at midday GMT].
+

module type S = sig .. end
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 @@ Date -
Previous - Up - Next +
Previous + Up + Next +
+

Module Date

+
module Date: sig .. end
+Date implementation.
-

Module Date

-
-
module Date: sig .. end
Date implementation.
include Date_sig.S
\ 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 @@ Date_sig.S.Period -
 Up +
 Up  
-

Module Date_sig.S.Period

-
-
module Period: sig .. end
A period is the number of days between two dates.
+

Module Date_sig.S.Period

+
module Period: sig .. end
+A period is the number of days between two dates.
+

-

Arithmetic operations


+

Arithmetic operations


type +[< Date_sig.S.field ] p 
include Period.S

-

Constructors


+

Constructors


val make : int -> int -> int -> Date_sig.S.t
make year month day makes a period of the specified length.
@@ -62,7 +63,7 @@ Labelled version of make. day n makes a period of n days.

-

Getters


+

Getters


exception Not_computable
Since 1.04
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 @@ Date_sig.S -
 Up +
 Up  
-

Module type Date_sig.S

-
-
module type S = sig .. end
Common operations for all date representations.
+

Module type Date_sig.S

+
module type S = sig .. end
+Common operations for all date representations.
Since 2.0 (this signature was before inlined in interface of Date).
+

-

Datatypes


+

Datatypes


type field = Period.date_field
The different fields of a date.
@@ -62,54 +63,54 @@ Type of a date, without specifying any precision level.
Type of a date.
-
type day = +
type day =
+Sun +Mon +Tue +Wed +Thu +Fri +Sat
| -Sun
| -Mon
| -Tue
| -Wed
| -Thu
| -Fri
| -Sat
@@ -117,89 +118,89 @@ Type of a date.
Days of the week.
-
type month = +
type month =
+Jan +Feb +Mar +Apr +May +Jun +Jul +Aug +Sep +Oct +Nov +Dec
| -Jan
| -Feb
| -Mar
| -Apr
| -May
| -Jun
| -Jul
| -Aug
| -Sep
| -Oct
| -Nov
| -Dec
@@ -213,7 +214,7 @@ Year as an int.

-

Exceptions


+

Exceptions


exception Out_of_bounds
Raised when a date is outside the Julian period.
@@ -224,7 +225,7 @@ Raised when a date belongs to [October 5th, 1582; October 14th, 1582].

-

Constructors


+

Constructors


val make : year -> int -> int -> t
make year month day makes the date year-month-day. A BC year y corresponds to the year -(y+1).
@@ -272,7 +273,7 @@ Make a date from a year and its day of the year.
Example: from_day_of_year 2008 39 returns the date 2008-2-8.

-

Getters


+

Getters


val days_in_month : [< field > `Month `Year ] date -> int
Number of days in the month of a date.
Example: days_in_month (make 2003 6 26) returns 30.
@@ -315,7 +316,7 @@ Modified Julian day (i.e. Julian day - 2 400 001). Example: to_mjd (make 1858 11 17) returns 0.

-

Dates are comparable


+

Dates are comparable


val equal : [< field ] date ->
       [< field ] date -> bool
Equality function between two dates.
Since 1.09.0
@@ -331,7 +332,7 @@ Hash function for dates.
See also Utils.Comparable.hash

-

Boolean operations on dates


+

Boolean operations on dates


val is_valid_date : year -> int -> int -> bool
Check if a date is valid, that is the date has not been coerced to look like a real date.
@@ -352,7 +353,7 @@ Return true iff a date be false otherwise.

-

Coercions


+

Coercions


val to_unixtm : t -> Unix.tm
Convert a date into the Unix.tm type. The field is_isdst is always false. The fields Unix.tm_sec, @@ -408,12 +409,12 @@ Inverse of int_of_month.
Raises Invalid_argument if the argument does not belong to 1; 12.

-

Period


+

Period


module Period: sig .. end
A period is the number of days between two dates.

-

Arithmetic operations on dates and periods


+

Arithmetic operations on dates and periods


val add : ([< field ] as 'a) date ->
       'a Period.period -> 'a date
add d p returns d + p.
Raises
  • Out_of_bounds 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).

-

Operations on years


+

Operations on years


val is_leap_year : year -> bool
Return true if a year is a leap year; false otherwise.
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 @@ Date_sig -
Previous - Up - Next +
Previous + Up + Next
-

Module Date_sig

-
-
module Date_sig: sig .. end
Date interface. A date may be seen as a triple (year, month, day). +

Module Date_sig

+
module Date_sig: sig .. end
+Date interface. A date may be seen as a triple (year, month, day).

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.
+

module type S = sig .. end
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 @@ Fcalendar.Precise -
 Up +
 Up  
-

Module Fcalendar.Precise

-
-
module Precise: Calendar_sig.S  with module Date = Date and module Time = Ftime
More precise implementation of calendar in which seconds are float.
+

Module Fcalendar.Precise

+
module Precise: Calendar_sig.S  with module Date = Date and module Time = Ftime
+More precise implementation of calendar in which seconds are float.
Since 2.0
+

-

Datatypes


+

Datatypes


module Date: Date_sig.S
Date implementation used by this calendar.
@@ -56,49 +57,49 @@ Time implementation used by this calendar. | -Sun +Sun | -Mon +Mon | -Tue +Tue | -Wed +Wed | -Thu +Thu | -Fri +Fri | -Sat +Sat (*Days of the week.*) @@ -108,84 +109,84 @@ Time implementation used by this calendar. | -Jan +Jan | -Feb +Feb | -Mar +Mar | -Apr +Apr | -May +May | -Jun +Jun | -Jul +Jul | -Aug +Aug | -Sep +Sep | -Oct +Oct | -Nov +Nov | -Dec +Dec (*Months of the year.*) @@ -203,7 +204,7 @@ The different fields of a calendar.

-

Constructors


+

Constructors


val make : int -> int -> int -> int -> int -> second -> t
make year month day hour minute second makes the calendar "year-month-day; hour-minute-second".
@@ -239,7 +240,7 @@ Return the Modified Julian day. It is Julian day - 2 400 000.5 (more precise than Date.from_mjd).

-

Conversions


+

Conversions



Those functions have the same behaviour as those defined in Time_sig.S.
@@ -253,7 +254,7 @@ Those functions have the same behaviour as those defined in See also Time_sig.S.from_gmt

-

Getters


+

Getters



Those functions have the same behavious as those defined in Date_sig.S.
@@ -294,7 +295,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.second

-

Calendars are comparable


+

Calendars are comparable


val equal : t -> t -> bool
Equality function between two calendars.
See also Utils.Comparable.equal.
@@ -330,7 +331,7 @@ Those functions have the same behavious as those defined in See also Time_sig.S.is_am

-

Coercions


+

Coercions


val to_unixtm : t -> Unix.tm
Convert a calendar into the unix.tm type. The field isdst is always false. More precise than @@ -368,12 +369,12 @@ Convert a calendar to a time. Date part of the calendar is ignored.
Since 1.03

-

Period


+

Period


module Period: sig .. end
A period is the number of seconds between two calendars.

-

Arithmetic operations on calendars and periods


+

Arithmetic operations on calendars and periods



Those functions have the same behavious as those defined in Date_sig.S.
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 @@ Fcalendar -
Previous - Up - Next +
Previous + Up + Next
-

Module Fcalendar

-
-
module Fcalendar: sig .. end
Calendar implementation in which seconds are float. +

Module Fcalendar

+
module Fcalendar: sig .. end
+Calendar implementation in which seconds are float.

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 Precise.
Since 2.0
+

include Calendar_sig.S
module Precise: Calendar_sig.S  with module Date = Date and module Time = Ftime
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 @@ Ftime -
Previous - Up - Next +
Previous + Up + Next
-

Module Ftime

-
-
module Ftime: sig .. end
Time implementation in which seconds are floats. +

Module Ftime

+
module Ftime: sig .. end
+Time implementation in which seconds are floats.

This module uses float. Then results may be very unprecise.
Since 2.0
+

include Time_sig.S
\ 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 @@ Period.S -
 Up +
 Up  
-

Module type Period.S

-
-
module type S = sig .. end
Common interface for all periods.
+

Module type Period.S

+
module type S = sig .. end
+Common interface for all periods.
+
type +[< Period.date_field ] period
@@ -42,7 +43,7 @@ Type of a period.

-

Period is an additive monoid


+

Period is an additive monoid


val empty : [< Period.date_field ] period
The empty period.
@@ -56,7 +57,7 @@ Substraction of periods.
Opposite of a period.

-

Periods are comparable


+

Periods are comparable


val equal : [< Period.date_field ] period ->
       [< Period.date_field ] period -> bool
Equality function between two periods.
Since 1.09.0
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 @@ Period -
Previous - Up - Next +
Previous + Up + Next
-

Module Period

-
-
module Period: sig .. end
A period represents the time passed between two events (a date, a time...). +

Module Period

+
module Period: sig .. end
+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 Time.Period, Date.Period and Calendar.Period).
+
type date_field = [ `Day | `Month | `Week | `Year ]
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 @@ Printer.Calendar -
Previous - Up - Next +
Previous + Up + Next
-

Module Printer.Calendar

-
-
module Calendar: S  with type t = Calendar.t
Calendar printer. Default format is %i %T.
+

Module Printer.Calendar

+
module Calendar: S  with type t = Calendar.t
+Calendar printer. Default format is %i %T.
Since 2.0
+
type t
@@ -64,7 +65,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.CalendarPrinter -

Previous - Up - Next +
Previous + Up + Next +
+

Module Printer.CalendarPrinter

+
module CalendarPrinter: S  with type t = Calendar.t
+Deprecated.Replaced by Printer.Calendar.
-

Module Printer.CalendarPrinter

-
-
module CalendarPrinter: S  with type t = Calendar.t
Deprecated.Replaced by Printer.Calendar.
type t
@@ -63,7 +64,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.Date -

 Up - Next +
 Up + Next
-

Module Printer.Date

-
-
module Date: S  with type t = Date.t
Date printer. Specifiers which use time functionalities are not available +

Module Printer.Date

+
module Date: S  with type t = Date.t
+Date printer. Specifiers which use time functionalities are not available on this printer. Default format is %i.
Since 2.0
+
type t
@@ -64,7 +65,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.DatePrinter -

Previous - Up - Next +
Previous + Up + Next +
+

Module Printer.DatePrinter

+
module DatePrinter: S  with type t = Date.t
+Deprecated.Replaced by Printer.Date.
-

Module Printer.DatePrinter

-
-
module DatePrinter: S  with type t = Date.t
Deprecated.Replaced by Printer.Date.
type t
@@ -63,7 +64,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.Fcalendar -

Previous - Up +
Previous + Up  
-

Module Printer.Fcalendar

-
-
module Fcalendar: S  with type t = Fcalendar.t
Fcalendar printer. Seconds are rounded to integers before pretty printing. +

Module Printer.Fcalendar

+
module Fcalendar: S  with type t = Fcalendar.t
+Fcalendar printer. Seconds are rounded to integers before pretty printing. Default format is %i %T.
Since 2.0
+
type t
@@ -63,7 +64,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.Ftime -

Previous - Up - Next +
Previous + Up + Next
-

Module Printer.Ftime

-
-
module Ftime: S  with type t = Ftime.t
Ftime printer. Seconds are rounded to integers before pretty printing. +

Module Printer.Ftime

+
module Ftime: S  with type t = Ftime.t
+Ftime printer. Seconds are rounded to integers before pretty printing. Specifiers which use date functionalities are not available on this printer. Default format is %T.
Since 2.0
+
type t
@@ -67,7 +68,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.Precise_Calendar -

Previous - Up - Next +
Previous + Up + Next
-

Module Printer.Precise_Calendar

-
-
module Precise_Calendar: S  with type t = Calendar.Precise.t
Precise Calendar printer. Default format is %i %T.
+

Module Printer.Precise_Calendar

+
module Precise_Calendar: S  with type t = Calendar.Precise.t
+Precise Calendar printer. Default format is %i %T.
Since 2.0
+
type t
@@ -64,7 +65,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.Precise_Fcalendar -

Previous - Up - Next +
Previous + Up + Next
-

Module Printer.Precise_Fcalendar

-
-
module Precise_Fcalendar: S  with type t = Fcalendar.Precise.t
Precise Fcalendar printer. +

Module Printer.Precise_Fcalendar

+
module Precise_Fcalendar: S  with type t = Fcalendar.Precise.t
+Precise Fcalendar printer. Seconds are rounded to integers before pretty printing. Default format is %i %T.
Since 2.0
+
type t
@@ -66,7 +67,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.S -

 Up +
 Up  
-

Module type Printer.S

-
-
module type S = sig .. end
Generic signature of a printer-parser.
+

Module type Printer.S

+
module type S = sig .. end
+Generic signature of a printer-parser.
+
type t
@@ -59,7 +60,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.Time -

Previous - Up - Next +
Previous + Up + Next
-

Module Printer.Time

-
-
module Time: S  with type t = Time.t
Time printer. Specifiers which use date functionalities are not available +

Module Printer.Time

+
module Time: S  with type t = Time.t
+Time printer. Specifiers which use date functionalities are not available on this printer. Default format is %T.
Since 2.0
+
type t
@@ -66,7 +67,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer.TimePrinter -

Previous - Up - Next +
Previous + Up + Next +
+

Module Printer.TimePrinter

+
module TimePrinter: S  with type t = Time.t
+Deprecated.Replaced by Printer.Time.
-

Module Printer.TimePrinter

-
-
module TimePrinter: S  with type t = Time.t
Deprecated.Replaced by Printer.Time.
type t
@@ -63,7 +64,7 @@ Same as sprint d where d is (see the printer implementations).

-

Parsers from string


+

Parsers from string


val from_fstring : string -> string -> t
from_fstring format s converts s to a date according to format.

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 @@ Printer -

Previous - Up - Next +
Previous + Up + Next
-

Module Printer

-
-
module Printer: sig .. end
Pretty printing and parsing from string. +

Module Printer

+
module Printer: sig .. end
+Pretty printing and parsing from string. In the following, an "event" is either a date or a time or a calendar.

@@ -108,9 +108,10 @@

  • a possible output of the date is %B, the %-dth is the date is January, the 6th is matched by ;
  • a possible output of %D is 01/06/03
    -
    • +
    +

    -

    Internationalization

     +

    Internationalization

    You can manage the string representations of days and months. @@ -145,7 +146,7 @@ Set the regular expression used to recognize words in Since 1.10


    -

    Printers (including parsers from string)

     +

    Printers (including parsers from string)

    Printers also contain parsers which allow to build events from strings.
    @@ -156,12 +157,12 @@ Generic signature of a printer-parser. Date printer. 

    module DatePrinter: S  with type t = Date.t
    -
    +
    module Time: S  with type t = Time.t
    Time printer. 
    module TimePrinter: S  with type t = Time.t
    -
    +
    module Ftime: S  with type t = Ftime.t
    Ftime printer.
    @@ -172,7 +173,7 @@ Precise Calendar printer. Calendar printer. 
    module CalendarPrinter: S  with type t = Calendar.t
    -
    +
    module Precise_Fcalendar: S  with type t = Fcalendar.Precise.t
    Precise Fcalendar printer.
    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 @@ Time -
    Previous - Up - Next +
    Previous + Up + Next +
    +

    Module Time

    +
    module Time: sig .. end
    +Time implementation in which seconds are integers.
    -

    Module Time

    -
    -
    module Time: sig .. end
    Time implementation in which seconds are integers.
    include Time_sig.S
    \ 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 @@ Time_Zone -
    Previous - Up - Next +
    Previous + Up + Next
    -

    Module Time_Zone

    -
    -
    module Time_Zone: sig .. end
    Time zone management. +

    Module Time_Zone

    +
    module Time_Zone: sig .. end
    +Time zone management.

    You can change the current time zone in your program by side effect.
    +

    -
    type t = +
    type t =
    +UTC +Local +UTC_Plus of int
    | -UTC (*Greenwich Meridian Time*)
    | -Local (*Local Time*)
    | -UTC_Plus of int (*Another time zone specified from UTC*)
    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 @@ Time_sig.S.Period -
    Previous - Up +
    Previous + Up  
    -

    Module Time_sig.S.Period

    -
    -
    module Period: sig .. end
    A period is the number of seconds between two times.
    +

    Module Time_sig.S.Period

    +
    module Period: sig .. end
    +A period is the number of seconds between two times.
    +

    -

    Arithmetic operations


    +

    Arithmetic operations


    include Period.S
    val length : [< Period.date_field ] period -> Time_sig.S.second
    Number of seconds of a period.
    @@ -50,7 +51,7 @@ Multiplication.
    Division.

    -

    Constructors


    +

    Constructors


    val make : int -> int -> Time_sig.S.second -> [< Period.date_field ] period
    make hour minute second makes a period of the specified length.
    @@ -68,7 +69,7 @@ Labelled version of make. second n makes a period of n seconds.

    -

    Getters


    +

    Getters


    val to_seconds : [< Period.date_field ] period -> Time_sig.S.second
    Number of seconds of a period.
    Since 1.04
    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 @@ Time_sig.S.Second -
     Up - Next +
     Up + Next
    -

    Module Time_sig.S.Second

    -
    -
    module Second: Time_sig.Second  with type t = second
    Second implementation
    +

    Module Time_sig.S.Second

    +
    module Second: Time_sig.Second  with type t = second
    +Second implementation
    Since 2.0
    +
    type t
    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 @@ Time_sig.S -
    Previous - Up +
    Previous + Up  
    -

    Module type Time_sig.S

    -
    -
    module type S = sig .. end
    Common operations for all time representations.
    +

    Module type Time_sig.S

    +
    module type S = sig .. end
    +Common operations for all time representations.
    Since 2.0 (this signature was before inlined in interface of Time).
    +

    -

    Datatypes


    +

    Datatypes


    type t
    Type of a time.
    @@ -58,7 +59,7 @@ The different fields of a time.

    -

    Second


    +

    Second


    type second
    Type of a second.
    @@ -69,7 +70,7 @@ Type of a second.
    Second implementation

    -

    Constructors


    +

    Constructors


    val make : int -> int -> second -> t
    make hour minute second makes the time hour-minute-second.
    @@ -89,7 +90,7 @@ The current time based on Time_Zone So, it has always the same behaviour as make 12 0 0.

    -

    Conversions


    +

    Conversions


    val convert : t -> Time_Zone.t -> Time_Zone.t -> t
    convert t t1 t2 converts the time t expressed in the time zone t1 to the same time expressed in the time zone t2.
    @@ -113,7 +114,7 @@ The current time based on Time_Zone (make (-73) 0 0) returns the time 23-0-0 and (-4).

    -

    Getters


    +

    Getters


    val hour : t -> int
    Hour.
    Example: hour (make 20 0 0) returns 20.
    @@ -141,7 +142,7 @@ Number of hours of a time. The resulting fractional part represents Example: to_hours (make 1 3 0) returns 1 + 0.05 = 1.05.

    -

    Times are comparable


    +

    Times are comparable


    val equal : t -> t -> bool
    Equality function between two times.
    Since 1.09.0
    @@ -157,7 +158,7 @@ Hash function for times.
    See also Utils.Comparable.hash.

    -

    Boolean operations on times


    +

    Boolean operations on times


    val is_pm : t -> bool
    Return true is the time is before midday in the current time zone; false otherwise.
    @@ -171,7 +172,7 @@ Return true is the time i true.

    -

    Coercions


    +

    Coercions


    val from_seconds : second -> t
    Inverse of to_seconds.
    @@ -182,12 +183,12 @@ Inverse of to_minutes.
    Inverse of to_hours.

    -

    Period


    +

    Period


    module Period: sig .. end
    A period is the number of seconds between two times.

    -

    Arithmetic operations on times and periods


    +

    Arithmetic operations on times and periods


    val add : t ->
           [< Period.date_field ] Period.period -> t
    app t p returns t + p.
    Example: add (make 20 0 0) (Period.minute 70) 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 @@ Time_sig.Second -
     Up - Next +
     Up + Next
    -

    Module type Time_sig.Second

    -
    -
    module type Second = sig .. end
    Interface for seconds.
    +

    Module type Time_sig.Second

    +
    module type Second = sig .. end
    +Interface for seconds.
    Since 2.0
    +
    type t
    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 @@ Time_sig -
    Previous - Up - Next +
    Previous + Up + Next
    -

    Module Time_sig

    -
    -
    module Time_sig: sig .. end
    Time interface. A time may be seen as a triple (hour, minute, second). +

    Module Time_sig

    +
    module Time_sig: sig .. end
    +Time interface. A time may be seen as a triple (hour, minute, second).

    If minutes and seconds do not belong to [0; 60[, they are coerced into @@ -48,6 +48,7 @@ Time_Zone.change), each time consequently changes. If you want to express a time in another time zone (and do not affect others times), use the convert function.
    +

    module type Second = sig .. end
    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 @@ Utils.Comparable -
     Up +
     Up  
    -

    Module type Utils.Comparable

    -
    -
    module type Comparable = sig .. end
    Interface for comparable and hashable types. +

    Module type Utils.Comparable

    +
    module type Comparable = sig .. end
    +Interface for comparable and hashable types. Modules implementing this interface can be an argument of Map.Make, Set.Make or Hashtbl.Make.
    Since 2.0
    +
    type t
    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 @@ Utils.Float -
    Previous - Up +
    Previous + Up  
    -

    Module Utils.Float

    -
    -
    module Float: sig .. end
    Float implementation.
    +

    Module Utils.Float

    +
    module Float: sig .. end
    +Float implementation.
    Since 2.0
    +
    include Utils.Comparable
    val set_precision : float -> unit
    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 @@ Utils.Int -
     Up - Next +
     Up + Next
    -

    Module Utils.Int

    -
    -
    module Int: Comparable  with type t = int
    Integer implementation.
    +

    Module Utils.Int

    +
    module Int: Comparable  with type t = int
    +Integer implementation.
    Since 2.0
    +
    type t
    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 @@ Utils -
     Up - Next +
     Up + Next
    -

    Module Utils

    -
    -
    module Utils: sig .. end
    Some utilities.
    +

    Module Utils

    +
    module Utils: sig .. end
    +Some utilities.
    Since 2.0
    +
    module type Comparable = sig .. end
    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 @@ Version -
    Previous - Up +
    Previous + Up  
    -

    Module Version

    -
    -
    module Version: sig .. end
    Information about version of calendar.
    +

    Module Version

    +
    module Version: sig .. end
    +Information about version of calendar.
    Since 2.0
    +
    val version : string
    Name of this version.
    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 @@ -

    -Index of types
    -Index of exceptions
    -Index of values
    -Index of modules
    -Index of module types
    +

    +

    - - - - - - - - - - - - - - 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 @@ Index of class attributes -

    Index of class attributes

    +
     Up + 
    +

    Index of class attributes

    Utils
    +
    Utils
    Some utilities.
    Time_Zone
    +
    Time_Zone
    Time zone management.
    Period
    +
    Period
    A period represents the time passed between two events (a date, a time...).
    Time_sig
    +
    Time_sig
    Time interface.
    Time
    +
    Time
    Time implementation in which seconds are integers.
    Ftime
    +
    Ftime
    Time implementation in which seconds are floats.
    Date_sig
    +
    Date_sig
    Date interface.
    Date
    +
    Date
    Date implementation.
    Calendar_sig
    +
    Calendar_sig
    Calendar interface.
    Calendar_builder
    +
    Calendar_builder
    Generic calendar implementation.
    Calendar
    +
    Calendar
    Calendar implementation in which seconds are integer.
    Fcalendar
    +
    Fcalendar
    Calendar implementation in which seconds are float.
    Printer
    +
    Printer
    Pretty printing and parsing from string.
    Version
    +
    Version
    Information about version of calendar.
    -

    + \ 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 @@ Index of class types -

    Index of class types

    +
     Up + 
    +

    Index of class types

    -

    + \ 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 @@ Index of classes -

    Index of classes

    +
     Up + 
    +

    Index of classes

    -

    + \ 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 @@ Index of exceptions -

    Index of exceptions

    +
     Up + 
    +

    Index of exceptions

    @@ -49,6 +51,6 @@ Raised when a date belongs to [October 5th, 1582; October 14th, 1582]. -

    N
    Not_computable [Calendar_sig.S.Period]

    + \ 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 @@ Index of class methods -

    Index of class methods

    +
     Up + 
    +

    Index of class methods

    -

    + \ 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 @@ Index of module types -

    Index of module types

    +
     Up + 
    +

    Index of module types

    @@ -63,6 +65,6 @@ Common interface for all periods. Interface for seconds. -

    C
    Comparable [Utils]

    + \ 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 @@ Index of modules -

    Index of modules

    +
     Up + 
    +

    Index of modules

    @@ -39,7 +41,7 @@ Calendar implementation in which seconds are integer. -

    C
    Calendar [Printer]
    CalendarPrinter [Printer]
    -
    +
    Calendar_builder
    @@ -69,7 +71,7 @@ Date implementation.
    DatePrinter [Printer]
    -
    +
    Date_sig
    @@ -189,7 +191,7 @@ Time implementation in which seconds are integers.
    TimePrinter [Printer]
    -
    +
    Time_Zone
    @@ -213,6 +215,6 @@ Some utilities. Information about version of calendar.

    + \ 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 @@ Index of types -

    Index of types

    +
     Up + 
    +

    Index of types

    @@ -131,6 +133,6 @@ Year as an int Year as an int. -

    D
    date [Date_sig.S]

    + \ 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 @@ Index of values -

    Index of values

    +
     Up + 
    +

    Index of values

    @@ -708,8 +710,8 @@ Multiplication. -

    A
    add [Calendar_sig.S.Period]
    nb_days [Date_sig.S.Period]
    -Number of days in a period. -
    +Number of days in a period. +
    next [Calendar_sig.S]
    @@ -1006,8 +1008,8 @@ Same as sprint d where d is
    to_time [Calendar_sig.S.Period]
    -Convert a calendar period to a date period. -
    +Convert a calendar period to a date period. +
    to_time [Calendar_sig.S]
    @@ -1115,6 +1117,6 @@ Number of years, months and days in a period. Number of years, months, days and seconds in a period.

    + \ 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 *) -- cgit v1.2.3