core/generate/morphology.py
Shay 7c2b753d1d fix(generate): inflect the head verb on every branch, not just the plural two
Phase 3 fixed two of the twelve branches of `_inflect_predicate` by hand and
pinned them with a hand-written oracle. The other ten kept handing whole
predicate phrases to single-verb functions, so the same root cause was still
live on **57 of 96** (branch x multi-word predicate) pairs, 9 of 12 branches:

    "belongs to"      --perfective-->    "has belongs toed"
    "belongs to"      --imperfective-->  "is belongs toing"
    "belongs to"      --past-->          "belongs toed"
    "is defined as"   --future-->        "will is defined a"
    "contrasts with"  --negated-->       "does not contrasts with"

Every branch now routes through `morphology.inflect_phrase_head`, which applies
a single-verb inflection to the finite verb and carries tokens 2..n through
byte-identically. Two closed tables were needed because `_base_form` is a
suffix stripper and the head of every copular predicate is a form of BE:
`base_form("is")` returned "i" and `present_participle("is")` returned "iing".

Also fixes predicate-nominal object agreement. `render_step` pluralized the
subject and never the object, so it wrote "all dogs are a mammal". The object
agrees only for a predicate nominal -- a closed set of two -- because a
prepositional object carries its own number and a productive rule would write
"all claims are grounded in evidences".

Measured
--------
    tail-mangling pairs          57/96  ->  0/96
    g_read_rate (round-trip)     0.0    ->  0.003413   first non-zero in the arc
    grammatical_coverage v1      49/49  (2 cases corrected, see below)
    english_fluency_ood          117/117 + 39/39 + 13/13   unchanged
    discourse_paragraph          12/12 + 6/6 + 5/5 + 1/1   unchanged
    zero_code_domain_acquisition 18/18 + 30/30 + 21/21     unchanged

`gram_C14_p01` and `gram_C14_p10` expected "...defined as compound", which is
not English. Corrected, and the old string moved into `reject_surfaces` so the
case now actively rejects what it used to accept. The correction is not my
judgment: the reader independently READS "all molecules are defined as
compounds" and REFUSES the singular form, and that is precisely what took
g_read_rate off zero.

Why the invariant instead of a bigger oracle
--------------------------------------------
A per-branch oracle has to be extended by hand for each new branch, and a
branch added without one is invisible -- which is how eight survived Phase 3.
The pin is structural instead: English marks tense, number and aspect on the
finite verb, so inflection must leave tokens 2..n byte-identical. It needs no
oracle and covers branches nobody has written yet.

It is necessary, not sufficient: "does not contrasts with" preserves its tail
perfectly and is still wrong. `test_do_support_puts_the_head_in_the_bare_
infinitive` is the sufficiency half.

Mutation
--------
    baseline                                                84 pass
    inflect_phrase_head applied to the whole phrase          39 FAIL
    _IRREGULAR_BASE emptied                                   2 FAIL
    _IRREGULAR_PARTICIPLE auxiliaries removed                 2 FAIL
    PREDICATIVE_NOMINAL emptied                               3 FAIL
    PREDICATIVE_NOMINAL widened to every copular predicate    2 FAIL

The last row is the one that matters: the plausible-but-wrong fix -- "pluralize
the object under a plural subject" -- is caught by the mass-noun control.

Not fixed here, deliberately: "has not the following steps" is archaic rather
than wrong, and modernizing it to do-support is a separate judgment call.

[Verification]: smoke 621, deductive 406, lane pins 11/11 unchanged
(grammatical_coverage is not a pinned lane; no pin was edited).
2026-07-27 11:17:38 -07:00

433 lines
16 KiB
Python

"""Deterministic English morphology for the realizer.
Handles inflection of predicates for tense, aspect, and negation, and
(Phase 2B) **noun number** in both directions.
This is intentionally rule-based and limited to the seed vocabulary.
Irregular forms are listed explicitly; regular forms follow English rules.
Phase 2A gave every *table* one owner (``generate/lexicon.py``); this module
is the single owner of the *rules* that read them. Before 2B the regular
number rules were written twice — ``templates.pluralize`` and
``meaning_graph/reader._singularize`` — and the two disagreed about which
irregulars they knew, which is how CORE came to serve ``all wolve are
mammal``.
"""
from __future__ import annotations
from collections.abc import Callable
from generate.lexicon import (
INVARIANT_NUMBER,
VES_PLURAL_SINGULARS,
IRREGULAR_PLURALS,
IRREGULAR_SINGULARS,
MASS_NOUNS,
)
# Genuinely irregular English verbs (the previous tables held only
# regular forms that the suffix rules already produce correctly).
# Listed as 3rd-person singular present → (past, past_participle).
# Coverage: ~100 common English irregulars including every verb that
# the seed packs and Phase 5 OOD lanes use whose past form does not
# follow the regular -ed rule. Adding a verb here is the cheap fix
# for english_fluency_ood gaps.md G1.
_IRREGULAR_FORMS: dict[str, tuple[str, str]] = {
# be / have / do
"is": ("was", "been"),
"are": ("were", "been"),
"has": ("had", "had"),
"does": ("did", "done"),
# mental / cognitive
"thinks": ("thought", "thought"),
"knows": ("knew", "known"),
"sees": ("saw", "seen"),
"hears": ("heard", "heard"),
"feels": ("felt", "felt"),
"finds": ("found", "found"),
"loses": ("lost", "lost"),
"means": ("meant", "meant"),
"reads": ("read", "read"),
"tells": ("told", "told"),
"says": ("said", "said"),
"thinks": ("thought", "thought"),
# motion
"goes": ("went", "gone"),
"comes": ("came", "come"),
"runs": ("ran", "run"),
"stands": ("stood", "stood"),
"sits": ("sat", "sat"),
"lies": ("lay", "lain"),
"flies": ("flew", "flown"),
"swims": ("swam", "swum"),
"rides": ("rode", "ridden"),
"drives": ("drove", "driven"),
"rises": ("rose", "risen"),
"falls": ("fell", "fallen"),
# giving / taking / holding
"gives": ("gave", "given"),
"takes": ("took", "taken"),
"brings": ("brought", "brought"),
"buys": ("bought", "bought"),
"sells": ("sold", "sold"),
"holds": ("held", "held"),
"keeps": ("kept", "kept"),
"leaves": ("left", "left"),
"lends": ("lent", "lent"),
"sends": ("sent", "sent"),
"spends": ("spent", "spent"),
"puts": ("put", "put"),
"sets": ("set", "set"),
"lets": ("let", "let"),
# building / making / breaking
"makes": ("made", "made"),
"builds": ("built", "built"),
"breaks": ("broke", "broken"),
"tears": ("tore", "torn"),
"burns": ("burned", "burned"),
"shines": ("shone", "shone"),
"draws": ("drew", "drawn"),
"writes": ("wrote", "written"),
"speaks": ("spoke", "spoken"),
"wins": ("won", "won"),
"loses": ("lost", "lost"),
# binding / connecting
"binds": ("bound", "bound"),
"winds": ("wound", "wound"),
"weaves": ("wove", "woven"),
"flies": ("flew", "flown"),
"spins": ("spun", "spun"),
"sticks": ("stuck", "stuck"),
"swears": ("swore", "sworn"),
# giving form / shape
"becomes": ("became", "become"),
"grows": ("grew", "grown"),
"blows": ("blew", "blown"),
"throws": ("threw", "thrown"),
"shakes": ("shook", "shaken"),
"wakes": ("woke", "woken"),
# eating / drinking / cooking
"eats": ("ate", "eaten"),
"drinks": ("drank", "drunk"),
"feeds": ("fed", "fed"),
"bites": ("bit", "bitten"),
"freezes": ("froze", "frozen"),
# cutting / striking
"cuts": ("cut", "cut"),
"hits": ("hit", "hit"),
"shoots": ("shot", "shot"),
"splits": ("split", "split"),
"strikes": ("struck", "struck"),
"fights": ("fought", "fought"),
"wears": ("wore", "worn"),
# sleeping / rising / etc
"sleeps": ("slept", "slept"),
"wakes": ("woke", "woken"),
"rises": ("rose", "risen"),
# finding / hiding
"hides": ("hid", "hidden"),
"seeks": ("sought", "sought"),
"catches": ("caught", "caught"),
"teaches": ("taught", "taught"),
"thinks": ("thought", "thought"),
"brings": ("brought", "brought"),
# less common / archaic
"begins": ("began", "begun"),
"deals": ("dealt", "dealt"),
"leads": ("led", "led"),
"meets": ("met", "met"),
"sits": ("sat", "sat"),
"swears": ("swore", "sworn"),
"shoots": ("shot", "shot"),
"casts": ("cast", "cast"),
"costs": ("cost", "cost"),
"hurts": ("hurt", "hurt"),
"lets": ("let", "let"),
"quits": ("quit", "quit"),
"shuts": ("shut", "shut"),
}
# Legacy compatibility — historic call sites use these names. All
# regular-verb entries here match the suffix-rule output, so removing
# them is purely cosmetic; new irregulars live in `_IRREGULAR_FORMS`.
_IRREGULAR_PAST: dict[str, str] = {v: forms[0] for v, forms in _IRREGULAR_FORMS.items()}
_IRREGULAR_PARTICIPLE: dict[str, str] = {
# Present-participle (-ing) is almost always regular (lie→lying is handled
# by the suffix rule). The auxiliaries are the exception, and they DO
# surface as predicate heads: every copular predicate in
# ``PREDICATE_DISPLAY`` begins with "is"/"has" ("is defined as", "has the
# following steps"), so the imperfective branch inflects them constantly.
# Without these entries ``present_participle("is")`` fell through
# ``_base_form("is") == "i"`` and produced **"iing"**.
"is": "being",
"are": "being",
"was": "being",
"were": "being",
"has": "having",
"have": "having",
"does": "doing",
"do": "doing",
}
#: 3sg present → bare infinitive, for the verbs whose base is not the stem left
#: behind by stripping ``-s``. ``_base_form`` is a suffix stripper, so without
#: this table ``base_form("is")`` returned **"i"** and the future branch emitted
#: "will i defined as". Same closed-set discipline as the ``ves`` plurals: a
#: table, not a rule, because the rule has no way to know.
_IRREGULAR_BASE: dict[str, str] = {
"is": "be", "are": "be", "was": "be", "were": "be", "am": "be",
"has": "have", "have": "have", "had": "have",
"does": "do", "do": "do", "did": "do",
}
#: Heads that take a bare ``not`` rather than do-support. "was not defined as",
#: never "did not be defined as"; but "did not belong to", never "belonged not".
_BARE_NOT_HEADS: frozenset[str] = frozenset(
{"is", "are", "was", "were", "has", "have", "had", "does", "do", "did"}
)
_IRREGULAR_PAST_PARTICIPLE: dict[str, str] = {v: forms[1] for v, forms in _IRREGULAR_FORMS.items()}
# Short -ies verbs whose base is -ie (not -y). English's "ies → y"
# rule (cries→cry, flies→fly) breaks for these short stems where the
# original lemma keeps the -ie (dies→die, lies→lie, ties→tie).
_IES_KEEP_IE: frozenset[str] = frozenset({"dies", "lies", "ties", "vies", "pies", "hies"})
#: Stem endings that take ``-es`` for the 3sg rather than a bare ``-s``.
#:
#: ``ss`` and not ``s``: the sibilant rule fires on a DOUBLED s ("passes" ->
#: "pass"), while a stem ending in a single ``s`` is almost always a stem
#: ending in ``e`` that took a plain ``-s`` ("causes" -> "cause"). Before this
#: distinction, ``base_form("causes")`` returned **"caus"**, which is the
#: single-verb half of the 9-of-26 agreement defect.
_ES_STEM_ENDINGS = ("ss", "sh", "ch", "x", "z", "o")
def _base_form(verb_3sg: str) -> str:
if verb_3sg in _IRREGULAR_BASE:
return _IRREGULAR_BASE[verb_3sg]
if verb_3sg in _IES_KEEP_IE:
return verb_3sg[:-1]
if verb_3sg.endswith("ies"):
return verb_3sg[:-3] + "y"
if verb_3sg.endswith("es"):
return verb_3sg[:-2] if verb_3sg[:-2].endswith(_ES_STEM_ENDINGS) else verb_3sg[:-1]
if verb_3sg.endswith("s"):
return verb_3sg[:-1]
return verb_3sg
#: 3sg present -> plural present, for the forms where the plural is not simply
#: the bare stem. Everything else pluralizes by dropping the ``-s``.
_PLURAL_PRESENT: dict[str, str] = {
"is": "are", "are": "are",
"has": "have", "have": "have",
"does": "do", "do": "do",
"was": "were", "were": "were",
}
def plural_present(verb_3sg: str) -> str:
"""A third-person-singular verb → its plural-subject present form."""
if verb_3sg in _PLURAL_PRESENT:
return _PLURAL_PRESENT[verb_3sg]
return _base_form(verb_3sg)
def inflect_phrase_head(phrase: str, inflect: Callable[[str], str]) -> str:
"""Apply a SINGLE-VERB inflection to a predicate phrase's finite verb.
English marks tense, number and aspect on the finite verb, which is the
first token of every humanized predicate ("is defined as", "has the
following steps", "belongs to", "contrasts with"). Only that token
inflects; tokens 2..n are carried through **byte-identical**.
That tail-preservation is a falsifiable invariant, and it is the one this
module kept violating. Every function in here — ``base_form``,
``past_tense``, ``present_participle``, ``past_participle`` — is written
for a single verb, and ``_inflect_predicate`` was handing them whole
phrases on nine of its ten branches. Phase 3 fixed the two plural branches
by hand; the other eight still produced "belongs toed", "has belongs toed",
"is belongs toing" and "will is defined a". Routing every branch through
this one function is what makes the invariant checkable in one place
instead of eight.
"""
if not phrase:
return phrase
head, sep, rest = phrase.partition(" ")
return inflect(head) + sep + rest
def agree_plural_phrase(phrase: str) -> str:
"""Put a whole predicate PHRASE into plural agreement.
This exists because :func:`base_form` is a SINGLE-VERB function and was
being applied to whole phrases, stripping the last character-class of the
final word: "is defined as" -> "is defined a", "has the following steps"
-> "has the following step". Nine of the 26 seed predicates were wrong
that way, and every multi-word one was.
"""
return inflect_phrase_head(phrase, plural_present)
def takes_bare_not(phrase: str) -> bool:
"""True when negation attaches directly to the head ("was not defined as")
rather than through do-support ("did not belong to")."""
if not phrase:
return False
return phrase.partition(" ")[0] in _BARE_NOT_HEADS
def past_tense(verb_3sg: str) -> str:
if verb_3sg in _IRREGULAR_PAST:
return _IRREGULAR_PAST[verb_3sg]
base = _base_form(verb_3sg)
if base.endswith("e"):
return base + "d" # make → made? no — make is irregular; bake → baked
if base.endswith("y") and len(base) > 1 and base[-2] not in "aeiou":
return base[:-1] + "ied" # cry → cried
if _is_cvc_ending(base):
return base + base[-1] + "ed" # stop → stopped, plan → planned
return base + "ed"
_VOWELS = frozenset("aeiou")
def _is_cvc_ending(base: str) -> bool:
"""True if `base` ends in consonant-vowel-consonant (excluding w/x/y),
the trigger pattern for doubling the final consonant before -ing /
-ed in English."""
if len(base) < 3:
return False
c1, v, c2 = base[-3], base[-2], base[-1]
if c2 in {"w", "x", "y"}:
return False
return (c1 not in _VOWELS) and (v in _VOWELS) and (c2 not in _VOWELS)
def present_participle(verb_3sg: str) -> str:
if verb_3sg in _IRREGULAR_PARTICIPLE:
return _IRREGULAR_PARTICIPLE[verb_3sg]
base = _base_form(verb_3sg)
if base.endswith("ie"):
return base[:-2] + "ying" # die → dying, lie → lying
if base.endswith("e") and not base.endswith("ee"):
return base[:-1] + "ing" # make → making
if _is_cvc_ending(base):
return base + base[-1] + "ing" # run → running, swim → swimming
return base + "ing"
def past_participle(verb_3sg: str) -> str:
if verb_3sg in _IRREGULAR_PAST_PARTICIPLE:
return _IRREGULAR_PAST_PARTICIPLE[verb_3sg]
return past_tense(verb_3sg)
_SIBILANT_PLURAL_ENDINGS = ("s", "sh", "ch", "x", "z")
def is_mass_noun(noun: str) -> bool:
"""Uncountable ⇒ never pluralized, even under a quantifier."""
return noun.lower() in MASS_NOUNS
def _head_and_prefix(noun: str) -> tuple[str, str]:
"""Split a canonical id into (everything-before-head, head).
Reader ids are lowercase tokens joined with ``_`` (``guard_dog``), and
number marks the **head**, which in English compounds is the last token:
``guard_dog`` → ``guard_dogs``, never ``guards_dog``. Space-joined input is
handled the same way so display strings and ids behave alike.
"""
for sep in ("_", " "):
if sep in noun:
prefix, _, head = noun.rpartition(sep)
return prefix + sep, head
return "", noun
def pluralize(noun: str) -> str:
"""Singular → plural. Table first, then closed regular rules.
Mass nouns and the empty string are returned unchanged. Compound ids
inflect on the head only.
"""
if not noun:
return noun
if is_mass_noun(noun):
return noun
prefix, head = _head_and_prefix(noun)
if head in IRREGULAR_PLURALS:
return prefix + IRREGULAR_PLURALS[head]
# Invariant number (sheep, aircraft, means, offspring, ...) — derived from
# the singularizer's own invariant rows, so the two directions agree.
if head in INVARIANT_NUMBER:
return noun
if is_mass_noun(head):
return noun
if head.endswith(_SIBILANT_PLURAL_ENDINGS):
return prefix + head + "es"
if head.endswith("y") and len(head) > 1 and head[-2] not in "aeiou":
return prefix + head[:-1] + "ies"
# f/fe -> ves is a CLOSED set, not a productive rule: proof->proofs and
# chief->chiefs, but wolf->wolves. The set is derived from the number
# table's own ves-rows, so the rule can never claim a word the table does
# not know. Without this, pluralize("proof") returned "prooves".
if head in VES_PLURAL_SINGULARS:
return prefix + (head[:-2] if head.endswith("fe") else head[:-1]) + "ves"
return prefix + head + "s"
def singularize(noun: str) -> str | None:
"""Plural → singular, or ``None`` when not confidently a plural.
The table is consulted first and is **authoritative**: if the token
appears there, its value wins and no suffix rule runs. That is what keeps
``news``/``new`` and ``species``/``specy`` unlinked — a bare ``-s`` strip
corrupts both, and did, in served text.
``None`` (rather than a guess) is returned for anything the closed rules
do not confidently cover, so a caller can refuse instead of minting a
corrupted id.
"""
if not noun:
return None
prefix, head = _head_and_prefix(noun)
# An INVARIANT form is ambiguous in number — "fish are mammals" is plural,
# "a fish is a mammal" is singular, and the token cannot tell you which. A
# reader that must not guess number therefore has to DECLINE these, even
# though the table technically maps fish -> fish.
#
# This is load-bearing for soundness, not tidiness. The serving composer
# tries the categorical band (v1b) FIRST and falls back to later, more
# capable bands. Resolving an invariant makes v1b ACCEPT a sentence it
# cannot decide, which steals the case from the band that can: with
# "No fish are mammals. Therefore some fish are mammals." v1b answers
# "invalid" where v6-EX correctly answers "refuted" (ds-ex-0012). Declining
# keeps the fall-through intact. Same family as ADR-0261 §5.1
# refuse-don't-drop.
if head in INVARIANT_NUMBER:
return None
if head in IRREGULAR_SINGULARS:
return prefix + IRREGULAR_SINGULARS[head]
# A singular that the pluralizer knows is irregular is not a plural at all
# ("child" must not become "chil"), and neither is a known mass noun.
if head in IRREGULAR_PLURALS or is_mass_noun(head):
return None
if head.endswith("ies") and len(head) > 3:
return prefix + head[:-3] + "y"
if head.endswith(("ses", "xes", "zes", "ches", "shes")):
return prefix + head[:-2]
if head.endswith("s") and not head.endswith("ss") and len(head) > 1:
return prefix + head[:-1]
return None
def base_form(verb_3sg: str) -> str:
return _base_form(verb_3sg)