From 0d5cd13aeaa9318d70bd6b916edf55ae8c82b413 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Thu, 25 Apr 2019 11:19:25 +0200
Subject: [PATCH] (Pes) Small cleanup and typofix

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

diff --git a/src/persian/CatPes.gf b/src/persian/CatPes.gf
index cd39cb741..5d2a6bcfb 100644
--- a/src/persian/CatPes.gf
+++ b/src/persian/CatPes.gf
@@ -72,7 +72,7 @@ concrete CatPes of Cat = CommonX ** open ResPes, Prelude in {
 -----b    Conj = {s : Str ; n : Number} ;
 -----b    DConj = {s1,s2 : Str ; n : Number} ;
     Subj = {s : Str ; compl : VVForm} ; -- subjunctive or indicative
-    VS = ResPes.Verb ** {compl : VVForm} ; -- subjunctive or indicative 
+    VS = ResPes.Verb ** {compl : VVForm} ; -- subjunctive or indicative
     Prep = Compl ;
 ---- Open lexical classes, e.g. Lexicon
     V, VQ = ResPes.Verb ;
diff --git a/src/persian/MorphoPes.gf b/src/persian/MorphoPes.gf
index 2c294f37b..908abf194 100644
--- a/src/persian/MorphoPes.gf
+++ b/src/persian/MorphoPes.gf
@@ -316,7 +316,7 @@ oper
 
   haveVerb : Verb = haveRegV ** {s = table {
     ImpPrefix _ => [] ;
-    VAor Neg agr  => imperfectSuffix agr (addN "دار") ;
+    VAor Neg agr  => imperfectSuffixD agr (addN "دار") ;
     VSubj pol agr => haveRegV.s ! VPerf pol agr ;
     vf          => haveRegV.s ! vf }
   } where { haveRegV = mkVerb "داشتن" "دار" } ;
diff --git a/src/persian/ParadigmsPes.gf b/src/persian/ParadigmsPes.gf
index dd86f8e06..dbf135996 100644
--- a/src/persian/ParadigmsPes.gf
+++ b/src/persian/ParadigmsPes.gf
@@ -124,7 +124,7 @@ oper
 
   mkV3 = overload {
     mkV3 : Str -> V3 -- Predictable V3, را for direct object, no prepositions.
-     = \s -> lin V3 (regV s ** {c2 = prepOrRa "را" ; c3 = prepOrRa []}) ;
+     = \s -> lin V3 (regV s ** {c2 = prepOrRa "را" ; c3 = noPrep}) ;
     mkV3 : V -> (dir,indir : Str) -> V3 -- Takes a verb and two prepositions or را as strings (can be empty).
      = \v,p,q -> lin V3 (v ** {c2 = prepOrRa p ; c3 = prepOrRa q}) ;
     mkV3 : V -> (dir,indir : Prep) -> V3 -- Takes a verb and two prepositions
@@ -140,9 +140,9 @@ oper
 
   mkVA = overload {
     mkVA : Str -> VA -- predictable verb with adjective complement
-      = \s -> lin VA (regV s ** {c2 = prepOrRa []}) ;
+      = \s -> lin VA (regV s ** {c2 = noPrep}) ;
     mkVA : V -> VA -- VA out of a verb
-      = \v -> lin VA (v ** {c2 = prepOrRa []}) ;
+      = \v -> lin VA (v ** {c2 = noPrep}) ;
     mkVA : V -> Prep -> VA -- VA out of a verb and preposition
       = \v,p -> lin VA (v ** {c2 = p}) ;
     } ;
@@ -360,6 +360,7 @@ oper
     "را" => {s = [] ; ra = "را" ; mod=Bare} ;
     prep  => {s = prep ; ra = []; mod=Bare}
     } ;
+  noPrep = prepOrRa [] ;
 
   mkPost : Str -> Prep = \s -> lin Prep {s=[] ; ra=s ; mod=Bare} ;