mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-27 17:08:54 -06:00
One more mixed conjugation verb - last one
This commit is contained in:
@@ -1,3 +1,3 @@
|
|||||||
--# -path=.:../abstract:../common:../api:../prelude
|
--# -path=.:../abstract:../common:../api:../prelude
|
||||||
|
|
||||||
concrete AllRus of AllRusAbs = LangRus, ExtraRus, ExtendRus ** {flags optimize=all ; coding=utf8;}
|
concrete AllRus of AllRusAbs = LangRus, ExtraRus, DictRus, ExtendRus ** {flags optimize=all ; coding=utf8;}
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
--# -path=.:../abstract:../common:prelude
|
--# -path=.:../abstract:../common:prelude
|
||||||
|
|
||||||
abstract AllRusAbs = Lang, ExtraRusAbs, Extend ** {};
|
abstract AllRusAbs = Lang, ExtraRusAbs, DictRusAbs, Extend ** {};
|
||||||
|
|||||||
@@ -968,7 +968,7 @@ lin
|
|||||||
|
|
||||||
arestovatq_V = mkV perfective transitive "арестовать" "арестую" "арестует" "2a" ;
|
arestovatq_V = mkV perfective transitive "арестовать" "арестую" "арестует" "2a" ;
|
||||||
begatq_V = mkV imperfective transitive "бегать" "бегаю" "бегает" "1a" ;
|
begatq_V = mkV imperfective transitive "бегать" "бегаю" "бегает" "1a" ;
|
||||||
bezhatq_V = mkV imperfective transitive "бежать" "бегу" "бежит" ;
|
bezhatq_V = mkV imperfective transitive "бежать" ;
|
||||||
besedovatq_V = mkV imperfective transitive "беседовать" "беседую" "беседует" "2a" ;
|
besedovatq_V = mkV imperfective transitive "беседовать" "беседую" "беседует" "2a" ;
|
||||||
bespokoitqsja_V = mkV imperfective intransitive "беспокоиться" "беспокоюсь" "беспокоится" "4a" ;
|
bespokoitqsja_V = mkV imperfective intransitive "беспокоиться" "беспокоюсь" "беспокоится" "4a" ;
|
||||||
bitq_V = mkV imperfective transitive "бить" "бью" "бьёт" "11b" ;
|
bitq_V = mkV imperfective transitive "бить" "бью" "бьёт" "11b" ;
|
||||||
@@ -1220,7 +1220,7 @@ lin
|
|||||||
igratq_V = mkV imperfective transitive "играть" "играю" "играет" "1a" ;
|
igratq_V = mkV imperfective transitive "играть" "играю" "играет" "1a" ;
|
||||||
idti_V = mkV imperfective intransitive "идти" ;
|
idti_V = mkV imperfective intransitive "идти" ;
|
||||||
izbavitqsja_V = mkV perfective intransitive "избавиться" "избавлюсь" "избавится" "4a" ;
|
izbavitqsja_V = mkV perfective intransitive "избавиться" "избавлюсь" "избавится" "4a" ;
|
||||||
izbezhatq_V = mkV perfective transitive "избежать" "избегу" "избежит" "5b" ;
|
izbezhatq_V = mkV perfective transitive "избежать" ;
|
||||||
izbratq_V = mkV perfective transitive "избрать" "изберу" "изберёт" "6°b/c" ;
|
izbratq_V = mkV perfective transitive "избрать" "изберу" "изберёт" "6°b/c" ;
|
||||||
izvinitq_V = mkV perfective transitive "извинить" "извиню" "извинит" "4b" ;
|
izvinitq_V = mkV perfective transitive "извинить" "извиню" "извинит" "4b" ;
|
||||||
izdatq_V = mkV perfective transitive "издать" ;
|
izdatq_V = mkV perfective transitive "издать" ;
|
||||||
@@ -1465,7 +1465,7 @@ lin
|
|||||||
platitq_V = mkV imperfective transitive "платить" "плачу" "платит" "4c" ;
|
platitq_V = mkV imperfective transitive "платить" "плачу" "платит" "4c" ;
|
||||||
plytq_V = mkV imperfective transitive "плыть" "плыву" "плывёт" "16b/c" ;
|
plytq_V = mkV imperfective transitive "плыть" "плыву" "плывёт" "16b/c" ;
|
||||||
pobeditq_V = mkV perfective transitive "победить" "побежу" "победит" "4b" ;
|
pobeditq_V = mkV perfective transitive "победить" "побежу" "победит" "4b" ;
|
||||||
pobezhatq_V = mkV perfective transitive "побежать" "побегу" "побежит" "5b" ;
|
pobezhatq_V = mkV perfective transitive "побежать" ;
|
||||||
pobyvatq_V = mkV perfective transitive "побывать" "побываю" "побывает" "1a" ;
|
pobyvatq_V = mkV perfective transitive "побывать" "побываю" "побывает" "1a" ;
|
||||||
povezti_V = mkV perfective transitive "повезти" "повезу" "повезёт" ;
|
povezti_V = mkV perfective transitive "повезти" "повезу" "повезёт" ;
|
||||||
poveritq_V = mkV perfective transitive "поверить" "поверю" "поверит" "4a" ;
|
poveritq_V = mkV perfective transitive "поверить" "поверю" "поверит" "4a" ;
|
||||||
@@ -1889,7 +1889,7 @@ lin
|
|||||||
tjanutqsja_V = mkV imperfective intransitive "тянуться" "тянусь" "тянется" "3c" ;
|
tjanutqsja_V = mkV imperfective intransitive "тянуться" "тянусь" "тянется" "3c" ;
|
||||||
ubeditq_V = mkV perfective transitive "убедить" "убежу" "убедит" "4b" ;
|
ubeditq_V = mkV perfective transitive "убедить" "убежу" "убедит" "4b" ;
|
||||||
ubeditqsja_V = mkV perfective intransitive "убедиться" "убежусь" "убедится" "4b" ;
|
ubeditqsja_V = mkV perfective intransitive "убедиться" "убежусь" "убедится" "4b" ;
|
||||||
ubezhatq_V = mkV perfective transitive "убежать" "убегу" "убежит" "5b" ;
|
ubezhatq_V = mkV perfective transitive "убежать" ;
|
||||||
ubivatq_V = mkV imperfective transitive "убивать" "убиваю" "убивает" "1a" ;
|
ubivatq_V = mkV imperfective transitive "убивать" "убиваю" "убивает" "1a" ;
|
||||||
ubitq_V = mkV perfective transitive "убить" "убью" "убьёт" "11b" ;
|
ubitq_V = mkV perfective transitive "убить" "убью" "убьёт" "11b" ;
|
||||||
ubratq_V = mkV perfective transitive "убрать" "уберу" "уберёт" "6°b/c" ;
|
ubratq_V = mkV perfective transitive "убрать" "уберу" "уберёт" "6°b/c" ;
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ lin
|
|||||||
youFem_Pron = personalPron (Ag (GSg Fem) P2) ;
|
youFem_Pron = personalPron (Ag (GSg Fem) P2) ;
|
||||||
|
|
||||||
-- : N -> N -> N ;
|
-- : N -> N -> N ;
|
||||||
CompoundN n1 n2 = mkCompoundN n1 "-" n2 ;
|
--CompoundN n1 n2 = mkCompoundN n1 "-" n2 ;
|
||||||
|
|
||||||
-- VPSlash -> AP ; -- lost (opportunity) ; (opportunity) lost in space
|
-- VPSlash -> AP ; -- lost (opportunity) ; (opportunity) lost in space
|
||||||
PastPartAP vps = {
|
PastPartAP vps = {
|
||||||
|
|||||||
@@ -596,6 +596,7 @@ oper
|
|||||||
s + ("есть" |"есться") => makeVerbEst asp tran inf ;
|
s + ("есть" |"есться") => makeVerbEst asp tran inf ;
|
||||||
s + ("дать" |"даться") => makeVerbDat6 asp tran inf ;
|
s + ("дать" |"даться") => makeVerbDat6 asp tran inf ;
|
||||||
s + ("хотеть"|"хотеться") => makeVerbKhotet6 asp tran inf ;
|
s + ("хотеть"|"хотеться") => makeVerbKhotet6 asp tran inf ;
|
||||||
|
s + ("бежать"|"бежаться") => makeVerbBezhat6 asp tran inf ;
|
||||||
s + ("быть" |"быться") => makeVerbByt6 asp tran inf ;
|
s + ("быть" |"быться") => makeVerbByt6 asp tran inf ;
|
||||||
"идти" => makeVerbJti asp tran inf ;
|
"идти" => makeVerbJti asp tran inf ;
|
||||||
s + ("йти" |"йтись") => makeVerbJti asp tran inf ;
|
s + ("йти" |"йтись") => makeVerbJti asp tran inf ;
|
||||||
|
|||||||
@@ -1094,6 +1094,35 @@ oper
|
|||||||
tran=tran
|
tran=tran
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
makeVerbBezhat6 : Aspect -> Transitivity -> Str -> VerbForms
|
||||||
|
= \asp,tran,inf ->
|
||||||
|
let inf1 = dropRefl inf in
|
||||||
|
let stem_info = infStemFromVerb inf in
|
||||||
|
let inf_s : Str = stem_info.p1 in
|
||||||
|
let com : Str = case inf_s of {c + "жа" => c ; _ => inf_s} in
|
||||||
|
let refl = stem_info.p2 in {
|
||||||
|
inf=inf1 ;
|
||||||
|
infrefl=inf1 + "ся" ;
|
||||||
|
prsg1=com + "гу";
|
||||||
|
prsg2=com + "жишь";
|
||||||
|
prsg3=com + "жит";
|
||||||
|
prpl1=com + "жим";
|
||||||
|
prpl2=com + "жите";
|
||||||
|
prpl3=com + "гут";
|
||||||
|
fut=NormalFuture ; -- ?
|
||||||
|
psgm=com + "жал";
|
||||||
|
psgs=com + "жа";
|
||||||
|
isg2=com + "ги";
|
||||||
|
isg2refl=com + "гись";
|
||||||
|
ipl1=[];
|
||||||
|
pppss="";
|
||||||
|
prtr=com + "жа"; -- *
|
||||||
|
ptr=com + "жав";
|
||||||
|
asp=asp;
|
||||||
|
refl=refl;
|
||||||
|
tran=tran
|
||||||
|
} ;
|
||||||
|
|
||||||
makeVerbEst : Aspect -> Transitivity -> Str -> VerbForms
|
makeVerbEst : Aspect -> Transitivity -> Str -> VerbForms
|
||||||
= \asp,tran,inf ->
|
= \asp,tran,inf ->
|
||||||
let inf1 = dropRefl inf in
|
let inf1 = dropRefl inf in
|
||||||
|
|||||||
Reference in New Issue
Block a user