From 267ef1b178880d37c7eae93322a080c4cfbc9b7d Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 29 Jan 2019 14:11:05 +0100
Subject: [PATCH] (Ara) Move mkQuant functions from Paradigms to Res

---
 src/arabic/ParadigmsAra.gf | 28 ++++------------------------
 src/arabic/ResAra.gf       | 28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/src/arabic/ParadigmsAra.gf b/src/arabic/ParadigmsAra.gf
index 93c44e2ea..c8e6b5256 100644
--- a/src/arabic/ParadigmsAra.gf
+++ b/src/arabic/ParadigmsAra.gf
@@ -657,32 +657,12 @@ resource ParadigmsAra = open
 
 
   mkQuant7 : (_,_,_,_,_,_,_ : Str) -> State -> Quant =
-    \hava,havihi,havAn,havayn,hAtAn,hAtayn,hA'ulA,det -> lin Quant (baseQuant **
-    { s = \\n,s,g,c =>
-        case <s,g,c,n> of {
-          <_,Masc,_,Sg>  => hava;
-          <_,Fem,_,Sg>   => havihi;
-          <_,Masc,Nom,Dl>=> havAn;
-          <_,Masc,_,Dl>  => havayn;
-          <_,Fem,Nom,Dl> => hAtAn;
-          <_,Fem,_,Dl>   => hAtayn;
-          <Hum,_,_,Pl>   => hA'ulA;
-          _              => havihi
-        };
-      d = det
-    });
+    \hava,havihi,havAn,havayn,hAtAn,hAtayn,hA'ulA,det ->
+    lin Quant (ResAra.mkQuant7 hava havihi havAn havayn hAtAn hAtayn hA'ulA det) ;
 
   mkQuant3 : (_,_,_ : Str) -> State -> Quant =
-    \dalika,tilka,ula'ika,det -> lin Quant (baseQuant **
-    { s = \\n,s,g,c =>
-        case <s,g,c,n> of {
-          <_,Masc,_,Sg>  => dalika;
-          <_,Fem,_,Sg>   => tilka;
-          <Hum,_,_,_>   => ula'ika;
-          _              => tilka
-        };
-      d = det
-    });
+    \dalika,tilka,ula'ika,det ->
+    lin Quant (ResAra.mkQuant3 dalika tilka ula'ika det) ;
 
   brkA : (root,sg,pl : Str) -> Adj -- also broken feminine
     = brkABool False ;
diff --git a/src/arabic/ResAra.gf b/src/arabic/ResAra.gf
index 648469408..91445056b 100644
--- a/src/arabic/ResAra.gf
+++ b/src/arabic/ResAra.gf
@@ -61,6 +61,34 @@ oper
   is1sg : Agr -> Bool = \a ->
     case a.pgn of {Per1 Sing => True; _ => False} ;
 
+  mkQuant7 : (_,_,_,_,_,_,_ : Str) -> State -> Quant =
+    \hava,havihi,havAn,havayn,hAtAn,hAtayn,hA'ulA,det -> lin Quant (baseQuant **
+    { s = \\n,s,g,c =>
+        case <s,g,c,n> of {
+          <_,Masc,_,Sg>  => hava;
+          <_,Fem,_,Sg>   => havihi;
+          <_,Masc,Nom,Dl>=> havAn;
+          <_,Masc,_,Dl>  => havayn;
+          <_,Fem,Nom,Dl> => hAtAn;
+          <_,Fem,_,Dl>   => hAtayn;
+          <Hum,_,_,Pl>   => hA'ulA;
+          _              => havihi
+        };
+      d = det
+    });
+
+  mkQuant3 : (_,_,_ : Str) -> State -> Quant =
+    \dalika,tilka,ula'ika,det -> lin Quant (baseQuant **
+    { s = \\n,s,g,c =>
+        case <s,g,c,n> of {
+          <_,Masc,_,Sg>  => dalika;
+          <_,Fem,_,Sg>   => tilka;
+          <Hum,_,_,_>   => ula'ika;
+          _              => tilka
+        };
+      d = det
+    });
+
   mkDet = overload {
     mkDet : Str -> Number -> State -> Det
       = mkDetDecl True ;