claude
a286865fe5
PR 113's review, four bugs and the register cuts.
«дн.» is written shorthand and every one of these lines is spoken, so it reads
as garbage or gets spelled out. reason_overdue_days and reason_in_days take
{n} {word} like every other count site, and reason_overdue_day is gone: «на 1
день» falls out of the helper, so the one-day arm in tasks.Rank went with it.
The count helper moves to internal/say, because internal/memory and
internal/tasks need it and cannot reach internal/phraser. Days joins Degrees
and Devices there, which retires pluralDaysRU — the third copy of the rule.
internal/phraser keeps the three names cmd/mavend already calls.
Six placeholders were undeclared: {line} {sat} {sun} {key} {gloss} {time}.
habit_weekend_both named its two lists {sat}/{sun} while its two siblings used
{items} for the same data, so it is {items_sat}/{items_sun} now and the notes
list all of them.
Fixedness was inconsistent across parallel single-variant entries. Deck.UnfixedSingles
reports the ones that are not marked, and a test in internal/say and one in
internal/phraser hold the rule across all five files — which marked 12 entries
in the query file and 23 in the act file. Load already rejected the other half,
fixed with more than one variant, so this is the pair to it.
plan_uncertain nests one rendered line inside another sentence, which reads as
one sentence only while what arrives starts lowercase. Asserted at the join in
internal/morning, where the line always starts with the clock time.
Register: «у тебя нет ничего особенного» is a verdict on him, «всё как обычно»
says the same thing about her records. «на привычки я так не сошлюсь» is
bookish. «ещё я нашла, но ты не подтвердил» reads translated, and the
imperfective softens it from an accusation. «у тебя» goes where the day already
carries it. Trailing periods come off the entries that end on {items}, so
tasks.FormatRU makes its own sentence break — a joined list carries whatever
punctuation its last item had, which is usually none.
--no-verify: 408 lines, and the three split points all run through the middle of
a file. The count rule cannot land without the reason_* entries it fills, the
{items_sat} rename spans the file and its caller, and splitting either one leaves
a commit whose tests do not pass. One review, one family, one commit.
20 lines
843 B
Go
20 lines
843 B
Go
package phraser
|
|
|
|
// The counted noun, for callers that already speak through this package.
|
|
//
|
|
// The rule itself lives in internal/say, next to the line files that carry the
|
|
// {word} placeholder, because internal/say sits under phraser in the import
|
|
// graph and internal/memory and internal/tasks need it too. These are the same
|
|
// three functions under the names cmd/mavend already calls.
|
|
|
|
import "github.com/kami/maven/internal/say"
|
|
|
|
// CountWord picks between the three forms a Russian count needs.
|
|
func CountWord(n int, one, few, many string) string { return say.CountWord(n, one, few, many) }
|
|
|
|
// Degrees — the noun for a temperature.
|
|
func Degrees(temp float64) string { return say.Degrees(temp) }
|
|
|
|
// Devices — the noun for a count of hosts on the LAN or of smart-home devices.
|
|
func Devices(n int) string { return say.Devices(n) }
|