From 7649fbf175bac849e3ab343e91073b8018cc201b Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 5 Mar 2019 16:38:27 +0100
Subject: [PATCH] (Pes) Word order + add c2 for VA and V2A

---
 src/persian/ResPes.gf  | 3 ++-
 src/persian/VerbPes.gf | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/persian/ResPes.gf b/src/persian/ResPes.gf
index f977127d4..fdf5a6673 100644
--- a/src/persian/ResPes.gf
+++ b/src/persian/ResPes.gf
@@ -99,7 +99,7 @@ oper
   -- 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.
   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 ;
 
   Compl : Type = {s : Str ; ra : Str} ;
@@ -236,6 +236,7 @@ oper
           quest = case ord of { ODir => [] ; OQuest => "آیا" } ;
           vvt = ta2vvt ta ;
        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
   };
 
diff --git a/src/persian/VerbPes.gf b/src/persian/VerbPes.gf
index 4fe555fd9..5e8b8104b 100644
--- a/src/persian/VerbPes.gf
+++ b/src/persian/VerbPes.gf
@@ -15,12 +15,12 @@ concrete VerbPes of Verb = CatPes ** open ResPes,Prelude in {
     ComplVV = insertVV ;
     ComplVS v s  = embComp (conjThat ++ s.s ! Indic) (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 ;
     SlashV2S v s  = predVc v ** embComp (conjThat ++ s.s ! Indic) (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
     SlashV2V v2v vp = predVc v2v ** {