more changes to fix the testsuite

This commit is contained in:
Krasimir Angelov
2026-10-03 11:01:03 +02:00
parent a52e08bcff
commit ed55dfa22e
3 changed files with 18 additions and 15 deletions
+5 -2
View File
@@ -11,11 +11,14 @@ oper
mkVoc : NP -> Voc = S.mkVoc ; mkVoc : NP -> Voc = S.mkVoc ;
mkVoc : Str -> Voc = P.mkVoc ; mkVoc : Str -> Voc = P.mkVoc ;
} ; } ;
mkDet = overload SyntaxCze {
mkDet : Str -> Det = P.mkDeterminer ;
} ;
mkIP = overload SyntaxCze { mkIP = overload SyntaxCze {
mkIP : Str -> IP = P.mkIP ; mkIP : Str -> IP = P.mkIPron ;
} ; } ;
mkCard = overload SyntaxCze { mkCard = overload SyntaxCze {
mkCard : Str -> Card = P.mkCard ; mkCard : Str -> Card = P.mkCardinal ;
} ; } ;
} }
+3 -3
View File
@@ -254,8 +254,8 @@ oper
mkVerb : Str -> VerbForms = guessVerbForms ; mkVerb : Str -> VerbForms = guessVerbForms ;
mkCard : Str -> Card = \s -> lin Card (invarDeterminer s Num5) ; mkCardinal : Str -> Card = \s -> lin Card (invarDeterminer s Num5) ;
mkDet : Str -> Det = \s -> lin Det (invarDeterminer s Num5) ; mkDeterminer : Str -> Det = \s -> lin Det (invarDeterminer s Num5) ;
mkQuant : Str -> Quant = \s -> mkQuant : Str -> Quant = \s ->
lin Quant (adjFormsAdjective (guessAdjForms s)) ; lin Quant (adjFormsAdjective (guessAdjForms s)) ;
@@ -267,7 +267,7 @@ oper
mkGN : Str -> GN = \s -> lin GN {s = s} ; mkGN : Str -> GN = \s -> lin GN {s = s} ;
mkIAdv : Str -> IAdv = \s -> lin IAdv {s = s} ; mkIAdv : Str -> IAdv = \s -> lin IAdv {s = s} ;
mkIDet : Str -> IDet = \s -> lin IDet {s = \\_,_=>s; size=Num1; head=CountedHead} ; mkIDet : Str -> IDet = \s -> lin IDet {s = \\_,_=>s; size=Num1; head=CountedHead} ;
mkIP : Str -> IP = \s -> lin IP {s = \\_=>s; a = Ag (Masc Anim) Sg P3} ; mkIPron : Str -> IP = \s -> lin IP {s = \\_=>s; a = Ag (Masc Anim) Sg P3} ;
mkIQuant : Str -> IQuant = \s -> lin IQuant {s = \\_,_,_=>s} ; mkIQuant : Str -> IQuant = \s -> lin IQuant {s = \\_,_,_=>s} ;
mkInterj : Str -> Interj = \s -> lin Interj {s = s} ; mkInterj : Str -> Interj = \s -> lin Interj {s = s} ;
mkLN : Str -> LN = \s -> lin LN {s = s} ; mkLN : Str -> LN = \s -> lin LN {s = s} ;
+10 -10
View File
@@ -18,9 +18,9 @@ cc -one ((zenaN "Naďa").sgen ++ (zenaN "Naďa").sdat ++ (zenaN "Káťa").sgen +
cc -one ((zenaN "Zoja").sgen ++ (zenaN "Zoja").sdat) cc -one ((zenaN "Zoja").sgen ++ (zenaN "Zoja").sdat)
cc -one (L.school_N.sdat ++ (zenaN "váza").sdat ++ (zenaN "mísa").sdat ++ (zenaN "banka").sdat) cc -one (L.school_N.sdat ++ (zenaN "váza").sdat ++ (zenaN "mísa").sdat ++ (zenaN "banka").sdat)
cc -one (L.salt_N.snom ++ L.salt_N.sacc ++ L.salt_N.svoc) cc -one (L.salt_N.snom ++ L.salt_N.sacc ++ L.salt_N.svoc)
cc -one (SyntaxCze.mkAdv in_Prep (mkNP plNum L.milk_N)) cc -one (SyntaxCze.mkAdv in_Prep (mkNP a_Quant plNum L.milk_N))
cc -one (mkVoc (mkNP L.year_N)) cc -one (SyntaxCze.mkVoc (mkNP L.year_N))
cc -one (SyntaxCze.mkAdv in_Prep (mkNP plNum L.apple_N)) cc -one (SyntaxCze.mkAdv in_Prep (mkNP a_Quant plNum L.apple_N))
-- Náš/váš inflect for the possessed noun, independently of addressee number. -- Náš/váš inflect for the possessed noun, independently of addressee number.
cc -one (SyntaxCze.mkAdv possess_Prep (mkNP we_Pron L.woman_N)) cc -one (SyntaxCze.mkAdv possess_Prep (mkNP we_Pron L.woman_N))
@@ -169,7 +169,7 @@ cc -one (SyntaxCze.mkAdv in_Prep (mkNP (mkCN (mkA "nový") ((hradN "mlýn") ** {
cc -one (SyntaxCze.mkAdv with_Prep (mkNP i_Pron)) cc -one (SyntaxCze.mkAdv with_Prep (mkNP i_Pron))
cc -one (SyntaxCze.mkAdv with_Prep (mkNP (zenaN "žena"))) cc -one (SyntaxCze.mkAdv with_Prep (mkNP (zenaN "žena")))
cc -one (SyntaxCze.mkAdv from_Prep (mkNP L.school_N)) cc -one (SyntaxCze.mkAdv from_Prep (mkNP L.school_N))
cc -one (SyntaxCze.mkAdv from_Prep (mkNP all_Predet (mkNP plNum L.child_N))) cc -one (SyntaxCze.mkAdv from_Prep (mkNP all_Predet (mkNP a_Quant plNum L.child_N)))
cc -one (SyntaxCze.mkAdv in_Prep (mkNP (zenaN "mzda"))) cc -one (SyntaxCze.mkAdv in_Prep (mkNP (zenaN "mzda")))
cc -one (SyntaxCze.mkAdv in_Prep (mkNP i_Pron)) cc -one (SyntaxCze.mkAdv in_Prep (mkNP i_Pron))
cc -one (SyntaxCze.mkAdv (v_Prep accusative) (mkNP i_Pron)) cc -one (SyntaxCze.mkAdv (v_Prep accusative) (mkNP i_Pron))
@@ -184,14 +184,14 @@ cc -one (mkUtt (mkS (mkCl (mkNP (E.ProDrop i_Pron)) L.love_V2 (mkNP only_Predet
cc -one (mkUtt (mkS (mkCl (mkNP all_Predet (mkNP (genderPron feminine they_Pron))) wash_V))) cc -one (mkUtt (mkS (mkCl (mkNP all_Predet (mkNP (genderPron feminine they_Pron))) wash_V)))
-- NP focus restores the full form even when given a ProDrop pronoun. -- NP focus restores the full form even when given a ProDrop pronoun.
cc -one (mkUtt (mkS (mkCl (mkNP only_Predet (mkNP (E.ProDrop i_Pron))) wash_V))) cc -one (mkUtt (mkS (mkCl (mkNP only_Predet (mkNP (E.ProDrop i_Pron))) wash_V)))
cc -one (mkUtt (mkNP all_Predet (mkNP plNum (panN "student")))) cc -one (mkUtt (mkNP all_Predet (mkNP a_Quant plNum (panN "student"))))
cc -one (mkUtt (mkNP all_Predet (mkNP (mkCard "5") L.child_N))) cc -one (mkUtt (mkNP all_Predet (mkNP (mkCard "5") L.child_N)))
cc -one (SyntaxCze.mkAdv with_Prep (mkNP all_Predet (mkNP plNum L.child_N))) cc -one (SyntaxCze.mkAdv with_Prep (mkNP all_Predet (mkNP a_Quant plNum L.child_N)))
cc -one (mkUtt (mkNP all_Predet (mkNP (mkCN (zenaN "voda"))))) cc -one (mkUtt (mkNP all_Predet (mkNP (mkCN (zenaN "voda")))))
cc -one (mkUtt (mkNP all_Predet (mkNP (mkCard (N.num N.pot31)) (zenaN "koruna")))) cc -one (mkUtt (mkNP all_Predet (mkNP (mkCard (N.num N.pot31)) (zenaN "koruna"))))
-- Shared preposed modifiers agree with the first conjunct, also after ConsNP. -- Shared preposed modifiers agree with the first conjunct, also after ConsNP.
cc -one (mkUtt (mkNP all_Predet (mkNP and_Conj (mkNP plNum L.man_N) (mkNP plNum L.woman_N)))) cc -one (mkUtt (mkNP all_Predet (mkNP and_Conj (mkNP a_Quant plNum L.man_N) (mkNP a_Quant plNum L.woman_N))))
cc -one (mkUtt (mkNP all_Predet (mkNP and_Conj (mkListNP (mkNP plNum L.woman_N) (mkListNP (mkNP plNum L.man_N) (mkNP plNum L.child_N)))))) cc -one (mkUtt (mkNP all_Predet (mkNP and_Conj (mkListNP (mkNP a_Quant plNum L.woman_N) (mkListNP (mkNP a_Quant plNum L.man_N) (mkNP a_Quant plNum L.child_N))))))
-- Complement forms distinguish bare case government from prepositions. -- Complement forms distinguish bare case government from prepositions.
cc -one (mkUtt (mkS (mkCl (mkNP (E.ProDrop i_Pron)) (mkAP (mkA2 (mkA "hrdý") (ParadigmsCze.mkPrep "na" accusative)) (mkNP he_Pron))))) cc -one (mkUtt (mkS (mkCl (mkNP (E.ProDrop i_Pron)) (mkAP (mkA2 (mkA "hrdý") (ParadigmsCze.mkPrep "na" accusative)) (mkNP he_Pron)))))
@@ -245,8 +245,8 @@ cc -one (SyntaxCze.mkAdv with_Prep (mkNP (mkCN (mkAP L.young_A (mkNP he_Pron)) (
-- A ProDrop comparison pronoun must still be overt. -- A ProDrop comparison pronoun must still be overt.
cc -one (mkUtt (mkS (mkCl (mkNP (E.ProDrop i_Pron)) (mkAP L.young_A (mkNP (E.ProDrop she_Pron)))))) cc -one (mkUtt (mkS (mkCl (mkNP (E.ProDrop i_Pron)) (mkAP L.young_A (mkNP (E.ProDrop she_Pron))))))
-- Addressing a quantified group retains genitive government. -- Addressing a quantified group retains genitive government.
cc -one (mkVoc (mkNP (mkCard "5") L.child_N)) cc -one (SyntaxCze.mkVoc (mkNP (mkCard "5") L.child_N))
cc -one (mkVoc (mkNP all_Predet (mkNP (mkCard "5") L.child_N))) cc -one (SyntaxCze.mkVoc (mkNP all_Predet (mkNP (mkCard "5") L.child_N)))
-- Pronominal heads retain their order after modification and binding. -- Pronominal heads retain their order after modification and binding.
cc -one (SyntaxCze.mkAdv with_Prep (mkNP all_Predet (mkNP youPl_Pron))) cc -one (SyntaxCze.mkAdv with_Prep (mkNP all_Predet (mkNP youPl_Pron)))
-- The outer pronoun controls all, independently of the reflexive's antecedent. -- The outer pronoun controls all, independently of the reflexive's antecedent.