mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-23 19:42:50 -06:00
IP now depends on the Case, i.e. koi/kogo
This commit is contained in:
@@ -37,7 +37,7 @@ concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in {
|
|||||||
-- Question
|
-- Question
|
||||||
|
|
||||||
QCl = {s : ResBul.Tense => Anteriority => Polarity => QForm => Str} ;
|
QCl = {s : ResBul.Tense => Anteriority => Polarity => QForm => Str} ;
|
||||||
IP = {s : Str ; gn : GenNum} ;
|
IP = {s : Case => Str; gn : GenNum} ;
|
||||||
IComp = {s : Str} ;
|
IComp = {s : Str} ;
|
||||||
IDet = {s : GenNum => Str; n : Number} ;
|
IDet = {s : GenNum => Str; n : Number} ;
|
||||||
|
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
|
|||||||
i8fem_Pron = mkNP "ŕç" "ěĺí" "ěîé" "ěî˙" "ěî˙ň" "ěî˙" "ěî˙ňŕ" "ěîĺ" "ěîĺňî" "ěîč" "ěîčňĺ" (GSg Fem) P1 ;
|
i8fem_Pron = mkNP "ŕç" "ěĺí" "ěîé" "ěî˙" "ěî˙ň" "ěî˙" "ěî˙ňŕ" "ěîĺ" "ěîĺňî" "ěîč" "ěîčňĺ" (GSg Fem) P1 ;
|
||||||
i8neut_Pron = mkNP "ŕç" "ěĺí" "ěîé" "ěî˙" "ěî˙ň" "ěî˙" "ěî˙ňŕ" "ěîĺ" "ěîĺňî" "ěîč" "ěîčňĺ" (GSg Neut) P1 ;
|
i8neut_Pron = mkNP "ŕç" "ěĺí" "ěîé" "ěî˙" "ěî˙ň" "ěî˙" "ěî˙ňŕ" "ěîĺ" "ěîĺňî" "ěîč" "ěîčňĺ" (GSg Neut) P1 ;
|
||||||
|
|
||||||
whatSg8fem_IP = mkIP "ęŕęâŕ" (GSg Fem) ;
|
whatSg8fem_IP = mkIP "ęŕęâŕ" "ęŕęâŕ" (GSg Fem) ;
|
||||||
whatSg8neut_IP = mkIP "ęŕęâî" (GSg Neut) ;
|
whatSg8neut_IP = mkIP "ęŕęâî" "ęŕęâî" (GSg Neut) ;
|
||||||
|
|
||||||
whoSg8fem_IP = mkIP "ęî˙" (GSg Fem) ;
|
whoSg8fem_IP = mkIP "ęî˙" "ęîăî" (GSg Fem) ;
|
||||||
whoSg8neut_IP = mkIP "ęîĺ" (GSg Neut) ;
|
whoSg8neut_IP = mkIP "ęîĺ" "ęîăî" (GSg Neut) ;
|
||||||
|
|
||||||
youSg8fem_Pron = mkNP "ňč" "ňĺá" "ňâîé" "ňâî˙" "ňâî˙ň" "ňâî˙" "ňâî˙ňŕ" "ňâîĺ" "ňâîĺňî" "ňâîč" "ňâîčňĺ" (GSg Fem) P2 ;
|
youSg8fem_Pron = mkNP "ňč" "ňĺá" "ňâîé" "ňâî˙" "ňâî˙ň" "ňâî˙" "ňâî˙ňŕ" "ňâîĺ" "ňâîĺňî" "ňâîč" "ňâîčňĺ" (GSg Fem) P2 ;
|
||||||
youSg8neut_Pron = mkNP "ňč" "ňĺá" "ňâîé" "ňâî˙" "ňâî˙ň" "ňâî˙" "ňâî˙ňŕ" "ňâîĺ" "ňâîĺňî" "ňâîč" "ňâîčňĺ" (GSg Neut) P2 ;
|
youSg8neut_Pron = mkNP "ňč" "ňĺá" "ňâîé" "ňâî˙" "ňâî˙ň" "ňâî˙" "ňâî˙ňŕ" "ňâîĺ" "ňâîĺňî" "ňâîč" "ňâîčňĺ" (GSg Neut) P2 ;
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ concrete QuestionBul of Question = CatBul ** open ResBul, Prelude in {
|
|||||||
QuestIComp icomp np =
|
QuestIComp icomp np =
|
||||||
mkQuestion icomp (mkClause (np.s ! Nom) np.a (predV auxBe)) ;
|
mkQuestion icomp (mkClause (np.s ! Nom) np.a (predV auxBe)) ;
|
||||||
|
|
||||||
PrepIP p ip = {s = p.s ++ ip.s} ;
|
PrepIP p ip = {s = p.s ++ ip.s ! Nom} ;
|
||||||
|
|
||||||
AdvIP ip adv = {
|
AdvIP ip adv = {
|
||||||
s = ip.s ++ adv.s ;
|
s = \\c => ip.s ! c ++ adv.s ;
|
||||||
gn = ip.gn
|
gn = ip.gn
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -420,9 +420,12 @@ resource ResBul = ParamX ** open Prelude in {
|
|||||||
DNeutDef => addDef dve
|
DNeutDef => addDef dve
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
mkIP : Str -> GenNum -> {s : Str ; gn : GenNum} =
|
mkIP : Str -> Str -> GenNum -> {s : Case => Str ; gn : GenNum} =
|
||||||
\s,gn -> {
|
\koi,kogo,gn -> {
|
||||||
s = s ;
|
s = table {
|
||||||
|
Nom => koi ;
|
||||||
|
Acc => kogo
|
||||||
|
} ;
|
||||||
gn = gn
|
gn = gn
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -131,8 +131,8 @@ concrete StructuralBul of Structural = CatBul **
|
|||||||
want_VV = P.mkVV (P.regV "want") ;
|
want_VV = P.mkVV (P.regV "want") ;
|
||||||
-}
|
-}
|
||||||
we_Pron = mkNP "íèå" "íàñ" "íàø" "íàøèÿ" "íàøèÿò" "íàøà" "íàøàòà" "íàøå" "íàøåòî" "íàøè" "íàøèòå" GPl P1 ;
|
we_Pron = mkNP "íèå" "íàñ" "íàø" "íàøèÿ" "íàøèÿò" "íàøà" "íàøàòà" "íàøå" "íàøåòî" "íàøè" "íàøèòå" GPl P1 ;
|
||||||
whatPl_IP = mkIP "êàêâè" GPl ;
|
whatPl_IP = mkIP "êàêâè" "êàêâè" GPl ;
|
||||||
whatSg_IP = mkIP "êàêúâ" (GSg Masc) ;
|
whatSg_IP = mkIP "êàêúâ" "êàêúâ" (GSg Masc) ;
|
||||||
when_IAdv = ss "êîãà" ;
|
when_IAdv = ss "êîãà" ;
|
||||||
{-
|
{-
|
||||||
when_Subj = ss "when" ;
|
when_Subj = ss "when" ;
|
||||||
@@ -140,8 +140,8 @@ concrete StructuralBul of Structural = CatBul **
|
|||||||
where_IAdv = ss "êúäå" ;
|
where_IAdv = ss "êúäå" ;
|
||||||
whichPl_IDet = {s = table GenNum ["êîé";"êîÿ";"êîå";"êîè"]; n = Pl} ;
|
whichPl_IDet = {s = table GenNum ["êîé";"êîÿ";"êîå";"êîè"]; n = Pl} ;
|
||||||
whichSg_IDet = {s = table GenNum ["êîé";"êîÿ";"êîå";"êîè"]; n = Sg} ;
|
whichSg_IDet = {s = table GenNum ["êîé";"êîÿ";"êîå";"êîè"]; n = Sg} ;
|
||||||
whoSg_IP = mkIP "êîé" (GSg Masc) ;
|
whoSg_IP = mkIP "êîé" "êîãî" (GSg Masc) ;
|
||||||
whoPl_IP = mkIP "êîè" GPl ;
|
whoPl_IP = mkIP "êîè" "êîãî" GPl ;
|
||||||
why_IAdv = ss "çàùî" ;
|
why_IAdv = ss "çàùî" ;
|
||||||
without_Prep = ss "áåç" ;
|
without_Prep = ss "áåç" ;
|
||||||
with_Prep = ss (pre { "ñ" ;
|
with_Prep = ss (pre { "ñ" ;
|
||||||
|
|||||||
Reference in New Issue
Block a user