GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 17:08:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Pes) Word order + add c2 for VA and V2A

Browse Source
This commit is contained in:
Inari Listenmaa
2019-03-05 16:38:27 +01:00
parent 08bcfe60f6
commit 7649fbf175
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/persian/ResPes.gf
View File

@@ -99,7 +99,7 @@ oper
-- A hack: we reuse the obj field for the VP complement in -- A hack: we reuse the obj field for the VP complement in
-- SlashV2V and this is needed to get the right word order for complVV. -- SlashV2V and this is needed to get the right word order for complVV.
showVPHvv : VerbForm -> Agr -> VPH -> Str = \vf,agr,vp -> showVPHvv : VerbForm -> Agr -> VPH -> Str = \vf,agr,vp ->
vp.comp ! agr ++ vp.prefix ++ vp.s ! vf ++ vp.ad vp.ad ++ vp.comp ! agr ++ vp.prefix ++ vp.s ! vf
++ vp.obj ++ vp.vComp ! agr ! VVPres ++ vp.embComp ; ++ vp.obj ++ vp.vComp ! agr ! VVPres ++ vp.embComp ;
Compl : Type = {s : Str ; ra : Str} ; Compl : Type = {s : Str ; ra : Str} ;
@@ -236,6 +236,7 @@ oper
quest = case ord of { ODir => [] ; OQuest => "آیا" } ; quest = case ord of { ODir => [] ; OQuest => "آیا" } ;
vvt = ta2vvt ta ; vvt = ta2vvt ta ;
in quest ++ subj ++ vp.ad ++ vp.comp ! agr ++ vp.obj in quest ++ subj ++ vp.ad ++ vp.comp ! agr ++ vp.obj
-- in quest ++ vp.ad ++ subj ++ vp.comp ! agr ++ vp.obj -- TODO check which word order is better /IL
++ vps ++ vp.vComp ! agr ! vvt ++ vp.embComp ++ vps ++ vp.vComp ! agr ! vvt ++ vp.embComp
}; };

4
src/persian/VerbPes.gf
View File

@@ -15,12 +15,12 @@ concrete VerbPes of Verb = CatPes ** open ResPes,Prelude in {
ComplVV = insertVV ; ComplVV = insertVV ;
ComplVS v s = embComp (conjThat ++ s.s ! Indic) (predV v) ; ComplVS v s = embComp (conjThat ++ s.s ! Indic) (predV v) ;
ComplVQ v q = embComp (conjThat ++ q.s ! QIndir) (predV v) ; ComplVQ v q = embComp (conjThat ++ q.s ! QIndir) (predV v) ;
ComplVA v ap = insertObj (ap.s ! Bare) (predV v) ; -- check form of adjective ComplVA v ap = insertObj (appComp v.c2 (ap.s ! Bare)) (predV v) ; -- check form of adjective
SlashVV vv vps = vps ** ComplVV vv vps ; SlashVV vv vps = vps ** ComplVV vv vps ;
SlashV2S v s = predVc v ** embComp (conjThat ++ s.s ! Indic) (predV v) ; SlashV2S v s = predVc v ** embComp (conjThat ++ s.s ! Indic) (predV v) ;
SlashV2Q v q = predVc v ** embComp (q.s ! QIndir) (predV v) ; SlashV2Q v q = predVc v ** embComp (q.s ! QIndir) (predV v) ;
SlashV2A v ap = predVc v ** insertObj (ap.s ! Bare) (predV v) ; ---- paint it red , check form of adjective SlashV2A v ap = predVc v ** insertObj (appComp v.c2 (ap.s ! Bare)) (predV v) ; ---- paint it red , check form of adjective
-- : V2V -> VP -> VPSlash ; -- beg (her) to go -- : V2V -> VP -> VPSlash ; -- beg (her) to go
SlashV2V v2v vp = predVc v2v ** { SlashV2V v2v vp = predVc v2v ** {