msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

(Pes) Fix bug in creating subjunctive form in S

Browse Source
This commit is contained in:
Inari Listenmaa
2019-04-30 18:42:03 +02:00
parent 5b7fae3c20
commit ae3ada90e9
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/persian/ResPes.gf
View File

@@ -70,7 +70,7 @@ param
VVType = NoVV | FullVV | DefVV ; VVType = NoVV | FullVV | DefVV ;
VVForm = Indic | Subj ; ---| SubjPast ; -- TODO extend this to VV, VS and Subj VVForm = Indic | Subj ; ---| SubjPast ; -- TODO extend this to VV, VS and Subj
VVTense = VVPres | VVPast VVForm ; VVTense = VVPres | VVPast VVForm ;
TAnt = TA Tense Anteriority ; TAnt = Ind Tense Anteriority | Sub Anteriority ;
oper oper
@@ -78,10 +78,10 @@ oper
-- قاتل نمی توانسته آنجا بوده باشد، چون او آن زمان در پاریس بوده -- قاتل نمی توانسته آنجا بوده باشد، چون او آن زمان در پاریس بوده
-- The form is created in complVV, but not currently used in other functions. /IL -- The form is created in complVV, but not currently used in other functions. /IL
ta2vvt : TAnt -> VVType -> VVTense = \ta,vvtype -> case ta of { ta2vvt : TAnt -> VVType -> VVTense = \ta,vvtype -> case ta of {
TA Pres Anter | Ind Pres Anter |
TA Past _ => VVPast Indic ; Ind Past _ => VVPast Indic ;
TA Cond Simul => VVPres ; Ind Cond Simul => VVPres ;
TA Cond Anter => Ind Cond Anter =>
case vvtype of { case vvtype of {
DefVV => VVPast Indic ; DefVV => VVPast Indic ;
_ => VVPres } ; _ => VVPres } ;
@@ -224,23 +224,23 @@ oper
clTable : VPH -> (Agr => TAnt => Polarity => Str) = \vp -> clTable : VPH -> (Agr => TAnt => Polarity => Str) = \vp ->
\\agr,vt,pol => vp.prefix ++ case vt of { \\agr,vt,pol => vp.prefix ++ case vt of {
TA Pres Simul => vp.s ! ImpPrefix pol ++ vp.s ! VAor pol agr ; -- for reg. verbs, VAor pol is invariant and negation comes in ImpPrefix. Ind Pres Simul => vp.s ! ImpPrefix pol ++ vp.s ! VAor pol agr ; -- for reg. verbs, VAor pol is invariant and negation comes in ImpPrefix.
TA Pres Anter => vp.s ! VPerf pol agr ; Ind Pres Anter => vp.s ! VPerf pol agr ;
TA Past Simul => vp.s ! VPast pol agr ; -- Past Simul: simple past Ind Past Simul => vp.s ! VPast pol agr ; -- Past Simul: simple past
TA Past Anter | TA Cond _ => -- Past Anter & Cond _: continuous past Ind Past Anter | Ind Cond _ => -- Past Anter & Cond _: continuous past
case vp.vvtype of { case vp.vvtype of {
DefVV => vp.s ! VPast pol agr ; DefVV => vp.s ! VPast pol agr ;
_ => vp.s ! ImpPrefix pol ++ vp.s ! VPast Pos agr } ; _ => vp.s ! ImpPrefix pol ++ vp.s ! VPast Pos agr } ;
TA Fut Simul => Ind Fut Simul =>
case vp.vvtype of { case vp.vvtype of {
DefVV => vp.s ! ImpPrefix pol ++ vp.s ! VAor pol agr ; DefVV => vp.s ! ImpPrefix pol ++ vp.s ! VAor pol agr ;
_ => futAux pol agr ++ vp.s ! PastStem _ => futAux pol agr ++ vp.s ! PastStem
} ; -- PastStem is, despite the name, used for future too. /IL } ; -- PastStem is, despite the name, used for future too. /IL
TA Fut Anter => Ind Fut Anter =>
case vp.vvtype of { case vp.vvtype of {
DefVV => vp.s ! VPerf pol agr ; DefVV => vp.s ! VPerf pol agr ;
_ => futAux pol agr ++ vp.s ! PastStem _ => futAux pol agr ++ vp.s ! PastStem } ;
} Sub _ => vp.s ! VSubj pol agr -- TODO: anterior subjunctive ?
} ; } ;
mkClause : NP -> VPH -> Clause = \np,vp -> mkClause : NP -> VPH -> Clause = \np,vp ->

12
src/persian/SentencePes.gf
View File

@@ -43,22 +43,22 @@ concrete SentencePes of Sentence = CatPes ** open Prelude, ResPes,Predef in {
UseCl temp p cl = { UseCl temp p cl = {
s = \\vvf => temp.s ++ p.s ++ case vvf of { s = \\vvf => temp.s ++ p.s ++ case vvf of {
Indic => cl.s ! TA temp.t temp.a ! p.p ! ODir ; Indic => cl.s ! Ind temp.t temp.a ! p.p ! ODir ;
Subj => cl.s ! TA Cond temp.a ! p.p ! ODir } Subj => cl.s ! Sub temp.a ! p.p ! ODir }
} ; } ;
UseQCl temp p qcl = let vt = TA temp.t temp.a in { UseQCl temp p qcl = let vt = Ind temp.t temp.a in {
s = temp.s ++ p.s ++ qcl.s ! vt ! p.p ; s = temp.s ++ p.s ++ qcl.s ! vt ! p.p ;
} ; } ;
UseRCl temp p rcl = let vt = TA temp.t temp.a in rcl ** { UseRCl temp p rcl = let vt = Ind temp.t temp.a in rcl ** {
s = \\a => temp.s ++ p.s ++ rcl.s ! vt ! p.p ! a s = \\a => temp.s ++ p.s ++ rcl.s ! vt ! p.p ! a
} ; } ;
UseSlash temp p cls = cls ** { UseSlash temp p cls = cls ** {
s = \\vvf => temp.s ++ p.s ++ cls.subj ++ case vvf of { s = \\vvf => temp.s ++ p.s ++ cls.subj ++ case vvf of {
Indic => cls.vp ! TA temp.t temp.a ! p.p ! ODir ; Indic => cls.vp ! Ind temp.t temp.a ! p.p ! ODir ;
Subj => cls.vp ! TA Cond temp.a ! p.p ! ODir } Subj => cls.vp ! Sub temp.a ! p.p ! ODir }
} ; } ;
AdvS a s = {s = \\vvf => a.s ++ s.s ! vvf} ; AdvS a s = {s = \\vvf => a.s ++ s.s ! vvf} ;