diff --git a/src/api/TryCze.gf b/src/api/TryCze.gf index ef63511a..3f0e6bd3 100644 --- a/src/api/TryCze.gf +++ b/src/api/TryCze.gf @@ -1,12 +1,18 @@ --# -path=.:../czech:../common:../abstract:../prelude -resource TryCze = ExtraCze, SyntaxCze, LexiconCze, ParadigmsCze -[mkAdv,mkAdN,mkIAdv,mkDet,mkIDet,mkIP,mkQuant,mkCard,mkPConj,mkVoc]** - open (P = ParadigmsCze) in { +resource TryCze = ExtraCze, SyntaxCze-[mkVoc], LexiconCze, ParadigmsCze -[mkAdv,mkAdN,mkIAdv,mkDet,mkIDet,mkIP,mkQuant,mkCard,mkPConj,mkVoc]** + open (P = ParadigmsCze),(S = SyntaxCze) in { --- oper - --- mkAdv = overload SyntaxCze { --- mkAdv : Str -> Adv = P.mkAdv ; --- } ; +oper + mkAdv = overload SyntaxCze { + mkAdv : Str -> Adv = P.mkAdv ; + } ; + mkVoc = overload { + mkVoc : NP -> Voc = S.mkVoc ; + mkVoc : Str -> Voc = P.mkVoc ; + } ; + mkIP = overload SyntaxCze { + mkIP : Str -> IP = P.mkIP ; + } ; } diff --git a/src/czech/ParadigmsCze.gf b/src/czech/ParadigmsCze.gf index f6b66f57..f5e40251 100644 --- a/src/czech/ParadigmsCze.gf +++ b/src/czech/ParadigmsCze.gf @@ -285,7 +285,7 @@ oper c = {s = [] ; c = Acc ; hasPrep = False}}) ; mkV2V : Str -> V2V = \s -> lin V2V ((mkVerb s) ** { c = {s = [] ; c = Acc ; hasPrep = False}}) ; - mkVoc : Str -> {s : Str} = \s -> {s = s} ; + mkVoc : Str -> CatCze.Voc = \s -> lin Voc {s = s} ; } diff --git a/tests/czech/regressions.gfs b/tests/czech/regressions.gfs index 65e672d7..ea385434 100644 --- a/tests/czech/regressions.gfs +++ b/tests/czech/regressions.gfs @@ -19,7 +19,7 @@ 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.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.mkVoc (mkNP L.year_N)) +cc -one (mkVoc (mkNP L.year_N)) cc -one (SyntaxCze.mkAdv in_Prep (mkNP plNum L.apple_N)) -- Náš/váš inflect for the possessed noun, independently of addressee number. @@ -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. 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. -cc -one (SyntaxCze.mkVoc (mkNP (mkCard "5") L.child_N)) -cc -one (SyntaxCze.mkVoc (mkNP all_Predet (mkNP (mkCard "5") L.child_N))) +cc -one (mkVoc (mkNP (mkCard "5") L.child_N)) +cc -one (mkVoc (mkNP all_Predet (mkNP (mkCard "5") L.child_N))) -- Pronominal heads retain their order after modification and binding. cc -one (SyntaxCze.mkAdv with_Prep (mkNP all_Predet (mkNP youPl_Pron))) -- The outer pronoun controls all, independently of the reflexive's antecedent.