diff options
Diffstat (limited to '')
-rw-r--r-- | module/datetime.scm (renamed from module/srfi/srfi-19/alt.scm) | 2 | ||||
-rw-r--r-- | module/datetime/util.scm (renamed from module/srfi/srfi-19/alt/util.scm) | 4 | ||||
-rw-r--r-- | module/entry-points/html.scm | 4 | ||||
-rw-r--r-- | module/entry-points/ical.scm | 4 | ||||
-rw-r--r-- | module/entry-points/server.scm | 6 | ||||
-rw-r--r-- | module/entry-points/terminal.scm | 4 | ||||
-rwxr-xr-x | module/main.scm | 1 | ||||
-rw-r--r-- | module/output/html.scm | 4 | ||||
-rw-r--r-- | module/output/ical.scm | 4 | ||||
-rw-r--r-- | module/output/terminal.scm | 4 | ||||
-rw-r--r-- | module/vcomponent/datetime.scm | 4 | ||||
-rw-r--r-- | module/vcomponent/group.scm | 4 | ||||
-rw-r--r-- | module/vcomponent/load.scm | 4 | ||||
-rw-r--r-- | module/vcomponent/output.scm | 4 | ||||
-rw-r--r-- | module/vcomponent/parse.scm | 7 | ||||
-rw-r--r-- | module/vcomponent/recurrence/generate.scm | 5 | ||||
-rw-r--r-- | module/vcomponent/recurrence/internal.scm | 2 | ||||
-rw-r--r-- | module/vcomponent/recurrence/parse.scm | 4 | ||||
-rw-r--r-- | module/vulgar/components.scm | 2 |
19 files changed, 34 insertions, 39 deletions
diff --git a/module/srfi/srfi-19/alt.scm b/module/datetime.scm index 5feee73d..83f49641 100644 --- a/module/srfi/srfi-19/alt.scm +++ b/module/datetime.scm @@ -1,4 +1,4 @@ -(define-module (srfi srfi-19 alt) +(define-module (datetime) :export (date? year month day hour minute second time? datetime? diff --git a/module/srfi/srfi-19/alt/util.scm b/module/datetime/util.scm index 3957190f..0eaf484a 100644 --- a/module/srfi/srfi-19/alt/util.scm +++ b/module/datetime/util.scm @@ -1,5 +1,5 @@ -(define-module (srfi srfi-19 alt util) - :use-module (srfi srfi-19 alt) +(define-module (datetime util) + :use-module (datetime) :use-module ((srfi srfi-1) :select (fold)) :use-module (srfi srfi-26) :use-module (srfi srfi-41) diff --git a/module/entry-points/html.scm b/module/entry-points/html.scm index eaf6cd62..2486fc52 100644 --- a/module/entry-points/html.scm +++ b/module/entry-points/html.scm @@ -3,8 +3,8 @@ :use-module (output html) :use-module (util) :use-module (vcomponent) - :use-module (srfi srfi-19 alt) - :use-module (srfi srfi-19 alt util) + :use-module (datetime) + :use-module (datetime util) :use-module (ice-9 getopt-long) :use-module (parameters) diff --git a/module/entry-points/ical.scm b/module/entry-points/ical.scm index 375613a3..9f7457c3 100644 --- a/module/entry-points/ical.scm +++ b/module/entry-points/ical.scm @@ -5,8 +5,8 @@ :use-module ((vcomponent) :select (load-calendars*)) :use-module ((parameters) :select (calendar-files)) :use-module (ice-9 getopt-long) - :use-module (srfi srfi-19 alt) - :use-module (srfi srfi-19 alt util) + :use-module (datetime) + :use-module (datetime util) ) (define opt-spec diff --git a/module/entry-points/server.scm b/module/entry-points/server.scm index 0b40a6ff..c072d18b 100644 --- a/module/entry-points/server.scm +++ b/module/entry-points/server.scm @@ -11,10 +11,8 @@ iconv regex #| regex here due to bad macros |# )) (srfi (srfi-1 srfi-88))) -(use-modules (srfi srfi-19 alt) - (srfi srfi-19 alt util)) - -;; (use-modules (srfi srfi-19 util)) +(use-modules (datetime) + (datetime util)) (define (file-extension name) (car (last-pair (string-split name #\.)))) diff --git a/module/entry-points/terminal.scm b/module/entry-points/terminal.scm index e53a3d05..09ae8004 100644 --- a/module/entry-points/terminal.scm +++ b/module/entry-points/terminal.scm @@ -3,8 +3,8 @@ :use-module (output terminal) :use-module (vcomponent) :use-module (ice-9 getopt-long) - :use-module (srfi srfi-19 alt) - :use-module (srfi srfi-19 alt util) + :use-module (datetime) + :use-module (datetime util) :use-module (parameters) :use-module (vulgar) ) diff --git a/module/main.scm b/module/main.scm index 1765ef43..15079dc5 100755 --- a/module/main.scm +++ b/module/main.scm @@ -7,7 +7,6 @@ exec guile -e main -s $0 "$@" !# (use-modules (srfi srfi-1) - ;; (srfi srfi-19) (srfi srfi-41) (srfi srfi-41 util) (srfi srfi-88) ; keyword syntax diff --git a/module/output/html.scm b/module/output/html.scm index 4f12dab2..2717dc50 100644 --- a/module/output/html.scm +++ b/module/output/html.scm @@ -9,8 +9,8 @@ #:use-module (util) #:use-module (util tree) #:duplicates (last) - #:use-module (srfi srfi-19 alt) - #:use-module (srfi srfi-19 alt util) + #:use-module (datetime) + #:use-module (datetime util) #:use-module (output general) diff --git a/module/output/ical.scm b/module/output/ical.scm index c7a6503c..03109940 100644 --- a/module/output/ical.scm +++ b/module/output/ical.scm @@ -4,8 +4,8 @@ :use-module (util) :use-module (vcomponent) :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) ) diff --git a/module/output/terminal.scm b/module/output/terminal.scm index 0e5a1910..68e66eb9 100644 --- a/module/output/terminal.scm +++ b/module/output/terminal.scm @@ -2,8 +2,8 @@ #:use-module (output general) #:use-module (output text) #: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 (srfi srfi-41) #:use-module (srfi srfi-41 util) 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) diff --git a/module/vulgar/components.scm b/module/vulgar/components.scm index e0467a52..83c702b6 100644 --- a/module/vulgar/components.scm +++ b/module/vulgar/components.scm @@ -1,5 +1,5 @@ (define-module (vulgar components) - #:use-module (srfi srfi-19 alt) + #:use-module (datetime) #:use-module (util) #:export ()) |