mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-27 17:08:54 -06:00
Cleanup
This commit is contained in:
committed by
Roman Suzi
parent
6661bdff95
commit
42fb9fd465
@@ -1107,8 +1107,6 @@ oper
|
|||||||
ptr=com + "тев";
|
ptr=com + "тев";
|
||||||
asp=asp;
|
asp=asp;
|
||||||
refltran = reflTran refl tran ;
|
refltran = reflTran refl tran ;
|
||||||
-- refl=refl;
|
|
||||||
-- tran=tran
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
makeVerbBezhat6 : Aspect -> Transitivity -> Str -> VerbForms
|
makeVerbBezhat6 : Aspect -> Transitivity -> Str -> VerbForms
|
||||||
@@ -1138,8 +1136,6 @@ oper
|
|||||||
ptr=com + "жав";
|
ptr=com + "жав";
|
||||||
asp=asp;
|
asp=asp;
|
||||||
refltran = reflTran refl tran ;
|
refltran = reflTran refl tran ;
|
||||||
-- refl=refl;
|
|
||||||
-- tran=tran
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
makeVerbEst : Aspect -> Transitivity -> Str -> VerbForms
|
makeVerbEst : Aspect -> Transitivity -> Str -> VerbForms
|
||||||
@@ -1169,8 +1165,6 @@ oper
|
|||||||
ptr=com + "в";
|
ptr=com + "в";
|
||||||
asp=asp;
|
asp=asp;
|
||||||
refltran = reflTran refl tran ;
|
refltran = reflTran refl tran ;
|
||||||
-- refl=refl;
|
|
||||||
-- tran=tran
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
makeVerbDat6 : Aspect -> Transitivity -> Str -> VerbForms
|
makeVerbDat6 : Aspect -> Transitivity -> Str -> VerbForms
|
||||||
@@ -1199,8 +1193,6 @@ oper
|
|||||||
ptr=com + "в";
|
ptr=com + "в";
|
||||||
asp=asp;
|
asp=asp;
|
||||||
refltran = reflTran refl tran ;
|
refltran = reflTran refl tran ;
|
||||||
-- refl=refl;
|
|
||||||
-- tran=tran
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
makeVerbByt6 : Aspect -> Transitivity -> Str -> VerbForms
|
makeVerbByt6 : Aspect -> Transitivity -> Str -> VerbForms
|
||||||
@@ -1230,8 +1222,6 @@ oper
|
|||||||
ptr=com + "ыв";
|
ptr=com + "ыв";
|
||||||
asp=asp;
|
asp=asp;
|
||||||
refltran = reflTran refl tran ;
|
refltran = reflTran refl tran ;
|
||||||
-- refl=refl;
|
|
||||||
-- tran=tran
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
makeVerbJti: Aspect -> Transitivity -> Str -> Str -> VerbForms
|
makeVerbJti: Aspect -> Transitivity -> Str -> Str -> VerbForms
|
||||||
@@ -1262,7 +1252,5 @@ oper
|
|||||||
ptr=[];
|
ptr=[];
|
||||||
asp=asp;
|
asp=asp;
|
||||||
refltran = reflTran refl tran ;
|
refltran = reflTran refl tran ;
|
||||||
-- refl=refl;
|
|
||||||
-- tran=tran
|
|
||||||
} ;
|
} ;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -102,8 +102,6 @@ oper
|
|||||||
fut : SpecialFuture ;
|
fut : SpecialFuture ;
|
||||||
asp : Aspect ;
|
asp : Aspect ;
|
||||||
refltran : ReflTran ;
|
refltran : ReflTran ;
|
||||||
-- refl : Reflexivity ;
|
|
||||||
-- tran : Transitivity
|
|
||||||
} ;
|
} ;
|
||||||
ComplementCase : Type = {s : Str ; c : Case ; hasPrep : Bool} ;
|
ComplementCase : Type = {s : Str ; c : Case ; hasPrep : Bool} ;
|
||||||
VerbForms2 : Type = VerbForms ** {c : ComplementCase} ;
|
VerbForms2 : Type = VerbForms ** {c : ComplementCase} ;
|
||||||
|
|||||||
@@ -662,9 +662,7 @@ oper
|
|||||||
prtr="будучи";
|
prtr="будучи";
|
||||||
ptr="быв";
|
ptr="быв";
|
||||||
asp=Imperfective;
|
asp=Imperfective;
|
||||||
refltran = Intrans ;
|
refltran = Intrans ; -- used to be refl=NonReflexive; tran=Intransitive
|
||||||
-- refl=NonReflexive;
|
|
||||||
-- tran=Intransitive
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
-- normal copula require Nom in Pres. So this is Ins-friendly substitute.
|
-- normal copula require Nom in Pres. So this is Ins-friendly substitute.
|
||||||
@@ -729,9 +727,7 @@ oper
|
|||||||
prtr="могши"; --*
|
prtr="могши"; --*
|
||||||
ptr="могши";
|
ptr="могши";
|
||||||
asp=Imperfective;
|
asp=Imperfective;
|
||||||
refltran = Intrans ;
|
refltran = Intrans ; -- used to be refl=NonReflexive; tran=Intransitive
|
||||||
-- refl=NonReflexive;
|
|
||||||
-- tran=Intransitive
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
want : VerbForms
|
want : VerbForms
|
||||||
@@ -755,9 +751,7 @@ oper
|
|||||||
prtr="хотя";
|
prtr="хотя";
|
||||||
ptr="хотев";
|
ptr="хотев";
|
||||||
asp=Imperfective;
|
asp=Imperfective;
|
||||||
refltran = Trans ;
|
refltran = Trans ; -- used to be refl=NonReflexive; tran=Transitive
|
||||||
-- refl=NonReflexive;
|
|
||||||
-- tran=Transitive
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
nullVerb : VerbForms
|
nullVerb : VerbForms
|
||||||
@@ -770,9 +764,7 @@ oper
|
|||||||
prtr, ptr ="";
|
prtr, ptr ="";
|
||||||
fut=NullFuture ;
|
fut=NullFuture ;
|
||||||
asp=Imperfective;
|
asp=Imperfective;
|
||||||
refltran = Trans ;
|
refltran = Trans ; -- used to be refl=NonReflexive; tran=Transitive
|
||||||
-- refl=NonReflexive;
|
|
||||||
-- tran=Transitive
|
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
verbPastAgree : VerbForms -> Agr -> Str -> Str
|
verbPastAgree : VerbForms -> Agr -> Str -> Str
|
||||||
|
|||||||
Reference in New Issue
Block a user