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

(Pes) make Subj take indicative or subjunctive

Browse Source
This commit is contained in:
Inari Listenmaa
2019-03-01 15:21:45 +01:00
parent a51a31ca7f
commit d005032374
10 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/persian/SentencePes.gf
+14 -10
View File
@@ -32,17 +32,19 @@ concrete SentencePes of Sentence = CatPes ** open Prelude, ResPes,Predef in {
} ;
SlashVS np vs slash =
mkSlClause np
(embComp (conjThat ++ slash.s) (predV vs)) **
mkSlClause np
(embComp (conjThat ++ slash.s ! Indic) (predV vs)) **
{c2 = slash.c2} ;
EmbedS s = {s = conjThat ++ s.s} ;
EmbedS s = {s = conjThat ++ s.s ! Indic} ;
EmbedQS qs = {s = qs.s ! QIndir} ;
EmbedVP vp = {s = showVPH Inf defaultAgr vp} ; --- agr
UseCl temp p cl = let vt = TA temp.t temp.a in {
s = temp.s ++ p.s ++ cl.s ! vt ! p.p ! ODir
UseCl temp p cl = {
s = \\vvf => temp.s ++ p.s ++ case vvf of {
Indic => cl.s ! TA temp.t temp.a ! p.p ! ODir ;
Subj => cl.s ! TA Cond temp.a ! p.p ! ODir }
} ;
UseQCl temp p qcl = let vt = TA temp.t temp.a in {
@@ -53,13 +55,15 @@ concrete SentencePes of Sentence = CatPes ** open Prelude, ResPes,Predef in {
s = \\q => temp.s ++ p.s ++ rcl.s ! vt ! p.p ! ODir ! q
} ;
UseSlash temp p cls = let vt = TA temp.t temp.a in cls ** {
s = temp.s ++ p.s ++ cls.subj ++ cls.vp ! vt ! p.p ! ODir
UseSlash temp p cls = cls ** {
s = \\vvf => temp.s ++ p.s ++ cls.subj ++ case vvf of {
Indic => cls.vp ! TA temp.t temp.a ! p.p ! ODir ;
Subj => cls.vp ! TA Cond temp.a ! p.p ! ODir }
} ;
AdvS a s = {s = a.s ++ s.s} ;
AdvS a s = {s = \\vvf => a.s ++ s.s ! vvf} ;
RelS s r = {s = s.s ++ r.s ! agrP3 Sg} ;
SSubjS s1 sj s2 = { s = s1.s ++ sj.s ++ s2.s};
RelS s r = {s = \\vvf => s.s ! vvf ++ r.s ! agrP3 Sg} ;
SSubjS s1 sj s2 = {s = \\vvf => s1.s ! vvf ++ sj.s ++ s2.s ! sj.compl};
}