forked from GitHub/gf-rgl
removed gfcc via gfc everywhere; workaround for russian in present
This commit is contained in:
@@ -196,7 +196,10 @@ oper
|
|||||||
case t of { Present => VPresent p ; PastRus => VPast; Future => VFuture p } ;
|
case t of { Present => VPresent p ; PastRus => VPast; Future => VFuture p } ;
|
||||||
|
|
||||||
getTense : Tense -> RusTense= \t ->
|
getTense : Tense -> RusTense= \t ->
|
||||||
case t of { Pres => Present ; Fut => Future; _ => PastRus} ;
|
case t of { Pres => Present
|
||||||
|
; Fut => Future --# notpresent
|
||||||
|
; _ => PastRus --# notpresent
|
||||||
|
} ;
|
||||||
|
|
||||||
|
|
||||||
getVoice: VerbForm -> Voice = \vf ->
|
getVoice: VerbForm -> Voice = \vf ->
|
||||||
|
|||||||
@@ -84,19 +84,23 @@ concrete SentenceRus of Sentence = CatRus ** open Prelude, ResRus in {
|
|||||||
|
|
||||||
UseCl t a p cl = {s = case t.t of {
|
UseCl t a p cl = {s = case t.t of {
|
||||||
Cond => cl.s! p.p ! ClCondit ; --# notpresent
|
Cond => cl.s! p.p ! ClCondit ; --# notpresent
|
||||||
|
Pres => cl.s! p.p ! ClIndic Present a.a ; ---- AR work-around 13/12/2007
|
||||||
_ => cl.s! p.p ! ClIndic (getTense t.t) a.a}};
|
_ => cl.s! p.p ! ClIndic (getTense t.t) a.a}};
|
||||||
|
|
||||||
UseQCl t a p qcl= {s = case t.t of {
|
UseQCl t a p qcl= {s = case t.t of {
|
||||||
Cond => qcl.s! p.p ! ClCondit ; --# notpresent
|
Cond => qcl.s! p.p ! ClCondit ; --# notpresent
|
||||||
|
Pres => qcl.s! p.p ! ClIndic Present a.a ;
|
||||||
_ => qcl.s!p.p! ClIndic (getTense t.t) a.a }};
|
_ => qcl.s!p.p! ClIndic (getTense t.t) a.a }};
|
||||||
|
|
||||||
UseRCl t a p rcl ={s = \\gn,c,anim => case t.t of {
|
UseRCl t a p rcl ={s = \\gn,c,anim => case t.t of {
|
||||||
Cond => [", "] ++ rcl.s! p.p ! ClCondit ! gn !c !anim ; --# notpresent
|
Cond => [", "] ++ rcl.s! p.p ! ClCondit ! gn !c !anim ; --# notpresent
|
||||||
|
Pres => [", "] ++ rcl.s! p.p ! ClIndic Present a.a !gn !c !anim;
|
||||||
_ => [", "] ++ rcl.s! p.p ! ClIndic (getTense t.t) a.a !gn !c !anim}};
|
_ => [", "] ++ rcl.s! p.p ! ClIndic (getTense t.t) a.a !gn !c !anim}};
|
||||||
|
|
||||||
UseSlash t a p cl = {
|
UseSlash t a p cl = {
|
||||||
s = case t.t of {
|
s = case t.t of {
|
||||||
Cond => cl.s! p.p ! ClCondit ; --# notpresent
|
Cond => cl.s! p.p ! ClCondit ; --# notpresent
|
||||||
|
Pres => cl.s! p.p ! ClIndic Present a.a ;
|
||||||
_ => cl.s! p.p ! ClIndic (getTense t.t) a.a
|
_ => cl.s! p.p ! ClIndic (getTense t.t) a.a
|
||||||
} ;
|
} ;
|
||||||
s2 = cl.s2 ;
|
s2 = cl.s2 ;
|
||||||
|
|||||||
Reference in New Issue
Block a user