From a51a31ca7f06fbf08ec7009ed27de0df1433e9a5 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Fri, 1 Mar 2019 15:18:55 +0100
Subject: [PATCH] (Pes) Rename N2's c to c2 for consistency

---
 src/persian/CatPes.gf       | 2 +-
 src/persian/NounPes.gf      | 6 +++---
 src/persian/ParadigmsPes.gf | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/persian/CatPes.gf b/src/persian/CatPes.gf
index e79528dfd..d97c2a769 100644
--- a/src/persian/CatPes.gf
+++ b/src/persian/CatPes.gf
@@ -89,7 +89,7 @@ concrete CatPes of Cat = CommonX - [Adv] ** open ResPes, Prelude in {
 
     N = ResPes.Noun ;
 
-    N2 = ResPes.Noun ** {c : Str ; compl : Str}; -- when N3 is made to N2, need to retain compl
+    N2 = ResPes.Noun ** {c2 : Str ; compl : Str}; -- when N3 is made to N2, need to retain compl
     N3 = ResPes.Noun ** {c2 : Str ; c3 : Str} ;
     PN = {s : Str ; animacy : Animacy} ;
 
diff --git a/src/persian/NounPes.gf b/src/persian/NounPes.gf
index 47b08fe1a..5b4abc0fa 100644
--- a/src/persian/NounPes.gf
+++ b/src/persian/NounPes.gf
@@ -86,18 +86,18 @@ concrete NounPes of Noun = CatPes ** open ResPes, Prelude in {
     UseN2 = useN ;
 
     Use2N3 n3 = useN n3 ** {
-      c = n3.c2 ;
+      c2 = n3.c2 ;
       compl = []
       } ;
 
     Use3N3 n3 = useN n3 ** {
-      c = n3.c3 ;
+      c2 = n3.c3 ;
       compl = []
       } ;
 
     ComplN2 n2 np = n2 ** {
       s = \\n,m => n2.s ! n ! Ezafe ;
-      compl = \\_ => n2.compl ++ n2.c ++ np.s ! Bare ;
+      compl = \\_ => n2.compl ++ n2.c2 ++ np.s ! Bare ;
       hasAdj = False
      };
 
diff --git a/src/persian/ParadigmsPes.gf b/src/persian/ParadigmsPes.gf
index 667b5917c..3405887c6 100644
--- a/src/persian/ParadigmsPes.gf
+++ b/src/persian/ParadigmsPes.gf
@@ -289,10 +289,14 @@ oper
     } ;
 
   mkN2 = overload {
+    mkN2 : Str -> N2 -- Predictable N2 without complement
+      = \s -> lin N2 (mkN01 s inanimate ** {c2,compl = []}) ;
+    mkN2 : N -> N2 -- N2 from without complement
+      = \n -> lin N2 (n ** {c2,compl = []}) ;
     mkN2 : N -> Str -> N2
-      = \n,c -> lin N2 (n ** {c = c ; compl=[]}) ;
+      = \n,c -> lin N2 (n ** {c2 = c ; compl = []}) ;
     mkN2 : N -> Prep -> Str -> N2 -- hidden from puclic API
-      = \n,p,c -> lin N2 (n ** {c = p.s ; c2 = c; compl=[]}) -- there is no c2
+      = \n,p,c -> lin N2 (n ** {c2 = p.s; compl = []})
   } ;
 
   mkN3 = overload {