Freed datetime from its srfi-19 prison.

8 files changed, 16 insertions, 18 deletions

diff --git a/module/vcomponent/datetime.scm b/module/vcomponent/datetime.scm
index 016eeaac..27153cea 100644
--- a/module/vcomponent/datetime.scm
+++ b/module/vcomponent/datetime.scm
@@ -1,7 +1,7 @@
 (define-module (vcomponent datetime)
   #:use-module (vcomponent base)
-  #:use-module (srfi srfi-19 alt)
-  #:use-module (srfi srfi-19 alt util)
+  #:use-module (datetime)
+  #:use-module (datetime util)
   #:use-module (util)
 
   #:export (#;parse-datetime
diff --git a/module/vcomponent/group.scm b/module/vcomponent/group.scm
index 0cd274d1..1309ae6d 100644
--- a/module/vcomponent/group.scm
+++ b/module/vcomponent/group.scm
@@ -1,8 +1,8 @@
 (define-module (vcomponent group)
   #:use-module (vcomponent)
   #:use-module (vcomponent datetime)
-  #:use-module (srfi srfi-19 alt)
-  #:use-module (srfi srfi-19 alt util)
+  #:use-module (datetime)
+  #:use-module (datetime util)
   #:use-module (srfi srfi-41)
   #:use-module (srfi srfi-41 util)
   #:export (group-stream get-groups-between))
diff --git a/module/vcomponent/load.scm b/module/vcomponent/load.scm
index e0324cbf..0cb03b42 100644
--- a/module/vcomponent/load.scm
+++ b/module/vcomponent/load.scm
@@ -2,8 +2,8 @@
   :export (load-calendars load-calendars*)
   :use-module (util)
   :use-module (srfi srfi-1)
-  :use-module (srfi srfi-19 alt)
-  :use-module (srfi srfi-19 alt util)
+  :use-module (datetime)
+  :use-module (datetime util)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
   :use-module (parameters)
diff --git a/module/vcomponent/output.scm b/module/vcomponent/output.scm
index d38095e7..631e37e2 100644
--- a/module/vcomponent/output.scm
+++ b/module/vcomponent/output.scm
@@ -3,8 +3,8 @@
   #:use-module (vcomponent control)
   #:use-module (util)
   #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-19 alt)
-  #:use-module (srfi srfi-19 alt util)
+  #:use-module (datetime)
+  #:use-module (datetime util)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 format)
   #:export (print-vcomponent
diff --git a/module/vcomponent/parse.scm b/module/vcomponent/parse.scm
index 4caabe0b..821e2d92 100644
--- a/module/vcomponent/parse.scm
+++ b/module/vcomponent/parse.scm
@@ -3,9 +3,8 @@
   :use-module (rnrs bytevectors)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9)
-  :use-module (srfi srfi-19 alt)
-  ;; :use-module (srfi srfi-19 setters)
-  :use-module (srfi srfi-19 alt util)
+  :use-module (datetime)
+  :use-module (datetime util)
   :use-module (srfi srfi-26)
   :use-module ((ice-9 rdelim) :select (read-line))
   :use-module ((ice-9 textual-ports) :select (unget-char))
@@ -15,7 +14,7 @@
   :use-module (util strbuf)
   :use-module (vcomponent base)
   :use-module (vcomponent datetime)
-  :use-module (srfi srfi-19 alt util)
+  :use-module (datetime util)
   )
 
 (use-modules ((rnrs base) #:select (assert)))
diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm
index f51759e0..f786a586 100644
--- a/module/vcomponent/recurrence/generate.scm
+++ b/module/vcomponent/recurrence/generate.scm
@@ -1,8 +1,7 @@
 (define-module (vcomponent recurrence generate)
   #:use-module ((srfi srfi-1) :select (find))
-  #:use-module (srfi srfi-19 alt)           ; Datetime
-  #:use-module (srfi srfi-19 alt util)
-  ;; #:use-module (srfi srfi-19 setters)
+  #:use-module (datetime)
+  #:use-module (datetime util)
   #:use-module (srfi srfi-26)           ; Cut
   #:use-module (srfi srfi-41)           ; Streams
   #:use-module (ice-9 match)
diff --git a/module/vcomponent/recurrence/internal.scm b/module/vcomponent/recurrence/internal.scm
index 50c44a60..07fc4cf5 100644
--- a/module/vcomponent/recurrence/internal.scm
+++ b/module/vcomponent/recurrence/internal.scm
@@ -38,7 +38,7 @@
                      (display
                       (case field
                         ;; TODO check over date/time/datetime here
-                        ((until) ((@ (srfi srfi-19 alt util) time->string) it))
+                        ((until) ((@ (datetime util) time->string) it))
                         (else it))
                       port)))
          (display ">" port))))))
diff --git a/module/vcomponent/recurrence/parse.scm b/module/vcomponent/recurrence/parse.scm
index a4724918..a93b81df 100644
--- a/module/vcomponent/recurrence/parse.scm
+++ b/module/vcomponent/recurrence/parse.scm
@@ -4,8 +4,8 @@
   #:export (parse-recurrence-rule)
 
   #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-19 alt)           ; Datetime
-  #:use-module (srfi srfi-19 alt util)
+  #:use-module (datetime)
+  #:use-module (datetime util)
   #:use-module (srfi srfi-26)
   #:use-module (vcomponent recurrence internal)
   #:use-module (util)