1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
|
module D = Colitur_kernel.Date
module C = Colitur_kernel.Computus
let fmt d = Printf.sprintf "%04d-%02d-%02d" (D.year d) (D.month d) (D.day d)
let easter_report y =
[ ("easter", C.gregorian_easter y);
("ash-wednesday", C.ash_wednesday y);
("palm-sunday", C.palm_sunday y);
("ascension", C.ascension y);
("pentecost", C.pentecost y);
("corpus-christi", C.corpus_christi y) ]
|> List.iter (fun (name, d) -> Printf.printf "%s %s\n" name (fmt d))
let temporal_report y =
let jan1 = match D.make ~year:y ~month:1 ~day:1 with
| Ok t -> t
| Error e -> failwith e
in
let dec31 = match D.make ~year:y ~month:12 ~day:31 with
| Ok t -> t
| Error e -> failwith e
in
(* [week] is "" for roughly 30 days a year (outside any numbered week);
printed as-is, that collapses two of the seven space-separated fields
into a double space, so naive field-position parsing (e.g. awk '{print
$4}') silently reads the wrong column on those days. Emit "-" instead,
so every line always has exactly seven single-space-separated fields. *)
let field s = if s = "" then "-" else s in
let d = ref jan1 in
while D.compare !d dec31 <= 0 do
let t = Rite_ef.Temporal_ef.temporal !d in
let r =
Colitur_kernel.Record.of_temporal ~rite:Rite_ef.Temporal_ef.id
Rite_ef.Vocab_ef.vocab !d t
in
Printf.printf "%s %s %s %s %s %s %s\n" r.Colitur_kernel.Record.date
r.Colitur_kernel.Record.weekday r.Colitur_kernel.Record.season
(field r.Colitur_kernel.Record.week) r.Colitur_kernel.Record.slug
r.Colitur_kernel.Record.rank r.Colitur_kernel.Record.colour;
d := D.add_days !d 1
done
(* Task 11: the fully resolved EF calendar (temporal AND sanctoral,
occurrence and transfers applied), one line per civil-year day --
"YYYY-MM-DD weekday season week slug rank colour [+commemoration-slug]...".
[temporal_report] above only ever showed the temporal cycle in isolation
([Rite_ef.Temporal_ef.temporal] directly, no sanctoral layer, no
[Precedence] contest); this is the first CLI path that runs every piece
Plan 3 built -- [Colitur_kernel.Layer], [Overlay], [Precedence_ef],
[Calendar] -- against real data. *)
(* [data/ef/sanctoral.sexp] and [data/ef/adjustments.sexp] are located
relative to the BUILD TREE, not the process's own cwd: cwd varies with
how the binary is invoked (a user's shell for `dune exec colitur --`, a
dune cram test's own sandboxed temp directory for `test/cli.t`) and
nothing in this project's build pins it to the repository root. A
build-time constant substituted via dune's [%{workspace_root}] was tried
first and rejected: it is resolved RELATIVE TO THE BUILD ACTION'S OWN
directory (empirically "." here, not an absolute path -- dune keeps
build actions relocatable), so it silently reproduces the same
cwd-dependence this is trying to eliminate, just baked in at build time
instead of read at run time; confirmed by the resulting `colitur day`
failing to find its own data outside the exact directory the build
happened to run in.
[Sys.executable_name] does not have that problem -- on Linux it resolves
through /proc/self/exe, which the kernel always reports as the
executable's own canonical absolute path, even when the process was
launched through a symlink (verified against dune's own cram sandbox,
which places exactly such a symlink; see the task report). dune's default
("no [(sandbox ...)] declared") build context mirrors the ENTIRE source
tree under _build/default/, unconditionally, so climbing from
_build/default/bin/main.exe up two directories and back down into data/
always finds both files, regardless of the caller's own cwd.
RESOLVED: the "known limitation" this comment used to end on -- that a
`dune install`-style deployment (executable copied to a prefix with no
adjacent _build/default/data/) had no resolution strategy, and would exit 2
unable to find sanctoral.sexp -- is now handled by probing candidates in
order rather than computing one path and hoping. data/dune installs the
four runtime files into <prefix>/share/colitur/ef/.
Two layouts are probed, and one override short-circuits both:
[COLITUR_DATA_DIR], when set and non-blank -- an explicit override. It
NEVER falls through: if it is set and does not contain the data, that is
an error naming the directory, not a reason to quietly use different
data. A packager or operator who names a directory has stated an
intent, and silently calendaring off some other copy because theirs was
wrong is precisely the silent substitution this project refuses
everywhere else (CLAUDE.md's first binding decision: divergence is
flagged LOUDLY, never silently swallowed). Getting this wrong is not
hypothetical -- the first version of this function did fall through, and
a deliberately bogus COLITUR_DATA_DIR produced a full, plausible,
entirely un-flagged year off the build tree's data.
Otherwise, in order:
1. <exedir>/../share/colitur/ef -- the INSTALLED layout, from an opam or
`dune install` prefix where the binary sits at <prefix>/bin/colitur.
data/dune puts the four runtime files there.
2. <exedir>/../data/ef -- the BUILD TREE, which is what `dune exec` and
the cram tests use.
A candidate is accepted only if sanctoral.sexp is actually readable inside
it, not merely because the directory exists: an empty or half-populated
share/colitur/ef (a failed install, a partially removed package) falls
through to a working build tree rather than shadowing it and then failing
at load time with a confusing per-file error. Verified by simulation, not
assumed.
Environment reads are fine HERE and only here: this is bin/, not the
kernel, whose contract forbids them (CLAUDE.md, "Kernel is total &
deterministic: no wall-clock, randomness, or environment reads"). Nothing
below the CLI ever learns where the data came from -- the loaders take a
path. *)
let data_dir () =
let has_data d = Sys.file_exists (Filename.concat d "sanctoral.sexp") in
let prefix = Filename.dirname (Filename.dirname Sys.executable_name) in
let installed = List.fold_left Filename.concat prefix [ "share"; "colitur"; "ef" ] in
let build_tree = Filename.concat prefix (Filename.concat "data" "ef") in
match Sys.getenv_opt "COLITUR_DATA_DIR" with
| Some d when String.trim d <> "" ->
if has_data d then d
else begin
Printf.eprintf
"colitur: COLITUR_DATA_DIR is set to %s, which contains no sanctoral.sexp\n\
colitur: refusing to fall back to another data directory -- unset it, or point it at one\n"
d;
exit 2
end
| _ -> if has_data installed then installed else build_tree
(* Loads the universal sanctoral layer and applies the one hand-authored
overlay over it (data/ef/adjustments.sexp -- see that file's own header):
[Overlay.apply]'s diagnostics are never silently dropped (Overlay.mli),
so any that come back -- expected to be none in the committed data; see
the overlay file's own comment on when one WOULD fire -- are printed to
stderr, loudly, without aborting the run. *)
let load_ef_layer () =
let dir = data_dir () in
let sanctoral_path = Filename.concat dir "sanctoral.sexp" in
let adjustments_path = Filename.concat dir "adjustments.sexp" in
match Colitur_kernel.Layer.load Rite_ef.Vocab_ef.rank_of_sexp sanctoral_path with
| Error e -> Error (Printf.sprintf "failed to load %s: %s" sanctoral_path e)
| Ok layer -> (
match Colitur_kernel.Overlay.load Rite_ef.Vocab_ef.rank_of_sexp adjustments_path with
| Error e -> Error (Printf.sprintf "failed to load %s: %s" adjustments_path e)
| Ok overlay ->
let layer, diagnostics = Colitur_kernel.Overlay.apply layer overlay in
List.iter
(fun d -> Printf.eprintf "colitur: %s\n" (Colitur_kernel.Overlay.diagnostic_to_string d))
diagnostics;
Ok layer)
(* Sibling to [load_ef_layer] above, same reasoning: [Rite_ef.context] now
takes [~lectionary] rather than loading data/ef/lectionary.sexp itself
(fix round 1, coordinator review -- a prior version had [Rite_ef]'s own
[context] load the file as a side effect of being linked, which killed
`colitur easter <year>` -- no lectionary data touched at all -- the
moment that file was missing from a bare `dune build`'s own default
target). Routed through the same [result] failure path as
[load_ef_layer], so a missing/malformed file is reported via
`colitur: %s` and `exit 2`, never an uncaught exception -- restoring the
promise [Lectionary.load]'s own .mli makes ("failures come back as
[Error], never as an exception"), which the reverted version broke by
re-wrapping it in [failwith] at module init where no caller could catch
it. *)
let load_ef_lectionary () =
let path = Filename.concat (data_dir ()) "lectionary.sexp" in
match Colitur_kernel.Lectionary.load path with
| Error e -> Error (Printf.sprintf "failed to load %s: %s" path e)
| Ok lectionary -> Ok lectionary
(* Sibling to [load_ef_lectionary] above, same reasoning and the same
[result] failure path: data/ef/commons.sexp holds the Commons of the
1962 Missal plus the per-saint assignments that route a readingless
class-3 feast to one, and [Rite_ef.context] takes it as [~commons]
rather than reading it itself. Its own loader validates the file
(duplicate ids, empty formularies, assignments naming a common that does
not exist) and reports every failure as [Error]. *)
let load_ef_commons () =
let path = Filename.concat (data_dir ()) "commons.sexp" in
match Rite_ef.Lectionary_ef.Commons.load path with
| Error e -> Error (Printf.sprintf "failed to load %s: %s" path e)
| Ok commons -> Ok commons
let day_line (d : (Rite_ef.Vocab_ef.season, Rite_ef.Vocab_ef.rank) Colitur_kernel.Liturgical_day.t)
=
let t = d.Colitur_kernel.Liturgical_day.temporal in
let cel = d.Colitur_kernel.Liturgical_day.observed in
let week =
match t.Colitur_kernel.Temporal.week with Some n -> string_of_int n | None -> "-"
in
let commemoration_suffix (c, _) =
" +" ^ Colitur_kernel.Slug.to_string c.Colitur_kernel.Celebration.slug
in
let commemorations =
String.concat "" (List.map commemoration_suffix d.Colitur_kernel.Liturgical_day.commemorations)
in
Printf.printf "%s %s %s %s %s %s %s%s\n" (D.to_iso8601 d.Colitur_kernel.Liturgical_day.date)
(D.weekday_to_string t.Colitur_kernel.Temporal.weekday)
(Rite_ef.Vocab_ef.season_to_string t.Colitur_kernel.Temporal.season)
week
(Colitur_kernel.Slug.to_string cel.Colitur_kernel.Celebration.slug)
(Rite_ef.Vocab_ef.rank_to_string cel.Colitur_kernel.Celebration.rank)
(Colitur_kernel.Colour.to_string cel.Colitur_kernel.Celebration.colour)
commemorations
(* The reading citations for a day, as its own row shape rather than extra
columns on [day_line]'s.
A SEPARATE COMMAND, not a widening of `colitur day`, and the reason is
mechanical rather than aesthetic: a citation contains spaces and commas
("Ezech 34:11-16", "Ecclus 51:1-8, 12"), while [day_line]'s row is
space-separated with a variable-length "+slug" commemoration tail.
Appending citations there would leave the row unsplittable -- no [awk]/
[cut] field number could recover where the Epistle ends -- which is the
opposite of the composability the row is shaped for. So `day` keeps its
format byte-identical (nothing downstream of it changes at all) and the
citations get a row whose own fields are " | "-delimited, safe for values
containing spaces.
This is deliberately a stopgap, and should not be mistaken for the
project's answer to output formatting: the design calls for one schema
rendered through a logic-less template engine (CSV/JSON/S-expression),
which is where this belongs eventually. Two ad-hoc column formats are
easier to retire later than one overloaded format with parsing rules
nobody wrote down.
"-" for an absent part, matching [temporal_report]'s own [field]
convention for an empty column. On the EF data as it stands no day can
actually print "-" -- {!Colitur_kernel.Validate}'s "citations"/
"citations-unresolved" checks assert exactly one First and one Gospel on
every day of every year 1583..9999 -- but the CLI must not assume a
guarantee the kernel makes about DATA rather than about types. *)
let readings_line (d : (Rite_ef.Vocab_ef.season, Rite_ef.Vocab_ef.rank) Colitur_kernel.Liturgical_day.t)
=
let cel = d.Colitur_kernel.Liturgical_day.observed in
let part_ref p =
match
List.find_opt
(fun (c : Colitur_kernel.Citation.t) -> c.Colitur_kernel.Citation.part = p)
d.Colitur_kernel.Liturgical_day.citations
with
| Some c -> c.Colitur_kernel.Citation.reference
| None -> "-"
in
Printf.printf "%s %s | %s | %s\n"
(D.to_iso8601 d.Colitur_kernel.Liturgical_day.date)
(Colitur_kernel.Slug.to_string cel.Colitur_kernel.Celebration.slug)
(part_ref Colitur_kernel.Citation.First)
(part_ref Colitur_kernel.Citation.Gospel)
(* One civil year, Jan 1 - Dec 31, matching [temporal_report]'s own scan --
NOT one liturgical year: [Colitur_kernel.Calendar.year] resolves a single
Advent-anchored liturgical year, which straddles two civil years, so a
civil year's worth of output needs the tail of the liturgical year that
opened the PREVIOUS civil year (covers roughly 1 Jan - 28 Nov) plus the
liturgical year that opens within this one (roughly 29 Nov - 31 Dec).
Both are computed once each -- not once per day via [Calendar.day], which
would recompute the whole (~365-day) placement pass up to 365 times over
for the days sharing one liturgical year (calendar.mli's own "pays it
once" cost model assumes exactly this usage: call [year], not [day] in a
loop). *)
(* The three data files this subcommand needs, loaded once and reported
through ONE failure path. Flattened out of the nested [match] this used
to be when a third loader (the Commons, Task 6) joined the first two:
each additional caller-supplied table would otherwise add a level of
indentation and a third verbatim copy of the same two-line error-and-exit
block. Every loader already returns [(_, string) result] (never raises,
never reads at module-initialisation time -- see [load_ef_lectionary]),
so chaining them costs nothing and keeps that promise intact. *)
let load_ef_data () =
match load_ef_layer () with
| Error msg -> Error msg
| Ok layer -> (
match load_ef_lectionary () with
| Error msg -> Error msg
| Ok lectionary -> (
match load_ef_commons () with
| Error msg -> Error msg
| Ok commons -> Ok (layer, lectionary, commons)))
(* The resolved-year walk, shared by [day_report] and [readings_report]: they
differ only in how each day is printed, and the two-liturgical-year
indexing below (with its own reasoning about civil-vs-liturgical spans) is
exactly the part that must not be duplicated and drift. [line] is the only
difference between the two commands. *)
let resolved_year_report ~line y =
match load_ef_data () with
| Error msg ->
Printf.eprintf "colitur: %s\n" msg;
exit 2
| Ok (layer, lectionary, commons) ->
let context = Rite_ef.context ~lectionary ~commons in
let module Cal = Colitur_kernel.Calendar in
let by_rata : (int, (Rite_ef.Vocab_ef.season, Rite_ef.Vocab_ef.rank) Colitur_kernel.Liturgical_day.t) Hashtbl.t =
Hashtbl.create 400
in
let index days =
Array.iter
(fun (d : (Rite_ef.Vocab_ef.season, Rite_ef.Vocab_ef.rank) Colitur_kernel.Liturgical_day.t) ->
Hashtbl.replace by_rata (D.to_rata d.Colitur_kernel.Liturgical_day.date) d)
days
in
index (Cal.year context layer (y - 1));
index (Cal.year context layer y);
let jan1 = match D.make ~year:y ~month:1 ~day:1 with Ok t -> t | Error e -> failwith e in
let dec31 = match D.make ~year:y ~month:12 ~day:31 with Ok t -> t | Error e -> failwith e in
let d = ref jan1 in
while D.compare !d dec31 <= 0 do
(match Hashtbl.find_opt by_rata (D.to_rata !d) with
| Some day -> line day
| None ->
(* Unreachable for any [y] in 1583..9999: the two indexed
liturgical years jointly cover [year_start (y-1), year_start
(y+1)), which contains all of civil year [y]
(calendar.mli). Not a [failwith] -- an out-of-domain [d]
inside this loop is impossible by construction (jan1/dec31
are themselves validated in range, and [add_days] only ever
advances within the same civil year here) -- but a silent
skip would violate the same "never silently dropped"
standard the kernel holds itself to, so a gap surfaces
loudly on stderr rather than as a quietly short year. *)
Printf.eprintf "colitur: internal error: no resolved day for %s\n" (D.to_iso8601 !d));
d := D.add_days !d 1
done
let day_report y = resolved_year_report ~line:day_line y
let readings_report y = resolved_year_report ~line:readings_line y
let usage () =
prerr_endline
"colitur: usage: colitur easter <year> | colitur temporal <year> | colitur day <year> | colitur \
readings <year>";
exit 2
let with_year ys f =
match int_of_string_opt ys with
| Some y when y >= 1583 && y <= 9999 -> f y
| Some y ->
Printf.eprintf "colitur: year %d out of range 1583..9999\n" y;
exit 2
| None -> usage ()
let () =
match Sys.argv with
| [| _; "easter"; ys |] -> with_year ys easter_report
| [| _; "temporal"; ys |] -> with_year ys temporal_report
| [| _; "day"; ys |] -> with_year ys day_report
| [| _; "readings"; ys |] -> with_year ys readings_report
| _ -> usage ()
|