From 0e24f1c58a9103d325e14ced3740af9e78dfac8e Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Fri, 29 Mar 2019 15:44:36 +0100
Subject: [PATCH] (Pes) add defVV + cleanup

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

diff --git a/src/persian/ParadigmsPes.gf b/src/persian/ParadigmsPes.gf
index c9681d7c1..e2d927a3b 100644
--- a/src/persian/ParadigmsPes.gf
+++ b/src/persian/ParadigmsPes.gf
@@ -31,7 +31,7 @@ oper
   Mod : Type ; -- Argument to mkDet and mkPrep
   ezafe : Mod ; -- e.g. mkPrep "برای" ezafe
   -- poss : Mod ; -- TODO is this needed?
-  --clitic : Mod ; -- TODO is this needed?
+  -- clitic : Mod ; -- TODO is this needed?
 --2 Nouns
 
   mkN : overload {
@@ -164,6 +164,8 @@ oper
      = \isAux,vvf,v -> v ** {isAux = isAux ; compl = vvf ; isDef = False}
   } ;
 
+  defVV : VV -> VV = \vv -> vv ** {isDef=True} ;
+
   mkV2V = overload {
     mkV2V : V -> (cN : Str) -> (isAux : Bool) -> V2V -- Verb, complementiser for the noun, whether it's auxiliary.
       = \v,s,b -> let vv : VV = mkVV b subjunctive v in
diff --git a/src/persian/ResPes.gf b/src/persian/ResPes.gf
index 289247f43..22b3bbc1c 100644
--- a/src/persian/ResPes.gf
+++ b/src/persian/ResPes.gf
@@ -137,12 +137,6 @@ oper
                     Add => v.s ! PerfStem ++ v.prefix ;
                     Replace => v.prefix
              } ;
-    -- s = table {
-    --       ImpPrefix p => becomeVerb.s ! ImpPrefix p ;
-    --       x           => case verb.passive of {
-    --                             Add => verb.s ! PerfStem ;
-    --                             Replace => []}
-    --                      ++ becomeVerb.s ! x }
   } ;
 -- ---------------------
 -- VP complementation