(Ara) Add state parameter to regNP + small cleanup/move around code

src/arabic/IdiomAra.gf

@@ -16,7 +16,7 @@ concrete IdiomAra of Idiom = CatAra ** open
      in predVP it vp ;
 
   --  : VP -> Cl ;        -- one sleeps
-  GenericCl = predVP (regNP "المَرْء" Sg) ;
+  GenericCl = predVP (regNP "المَرْء" Sg Def) ;
 
   -- : NP  -> RS -> Cl ; -- it is I who did it
   --CleftNP np rs =

src/arabic/ParadigmsAra.gf

@@ -571,15 +571,6 @@ resource ParadigmsAra = open
 
   proDrop : NP -> NP = \np -> lin NP (ResAra.proDrop np) ;
 
-  -- e.g. al-jamii3, 2a7ad
-  regNP : Str -> Number -> NP = \word,n -> lin NP (emptyNP ** {
-    s = \\c => fixShd word (dec1sg ! Def ! c)
-    });
-
-  -- e.g. hadha, dhaalika
-  indeclNP : Str -> Number -> NP = \word,n -> lin NP (emptyNP ** {
-    s = \\c => word
-    });
 
   mkQuant7 : (_,_,_,_,_,_,_ : Str) -> State -> Quant =
     \hava,havihi,havAn,havayn,hAtAn,hAtayn,hA'ulA,det -> lin Quant (baseQuant **

src/arabic/ResAra.gf

@@ -1386,6 +1386,17 @@ patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
 
     agrNP : Agr -> NP = \agr -> emptyNP ** {a = agr} ;
 
+    -- e.g. al-jamii3, 2a7ad
+    regNP : Str -> Number -> State -> NP = \word,n,s -> 
+      agrNP {pgn = Per3 Masc n ; isPron = False} ** {
+        s = \\c => fixShd word (dec1sg ! s ! c) ;
+        } ;
+
+    -- e.g. hadha, dhaalika
+    indeclNP : Str -> Number -> NP = \word,n -> emptyNP ** {
+      s = \\c => word
+      } ;
+
     i_Pron  : NP = mkPron "أَنَا" "نِي" "ي" (Per1 Sing) ;
     we_Pron : NP = mkPron "نَحنُ" "نا" "نا" (Per1 Plur) ;
 

src/arabic/StructuralAra.gf

@@ -28,9 +28,9 @@ concrete StructuralAra of Structural = CatAra **
 --    } ;
   during_Prep = mkPrep "خِلَالَ" ;
 --  either7or_DConj = sd2 "ِتهر" "ْر" ** {n = Sg} ;
-  everybody_NP = regNP "الجَمِيع" Pl ;
+  everybody_NP = regNP "الجَمِيع" Pl Def ;
   every_Det = mkDet "كُلّ" Sg Const ;
-  everything_NP = regNP "كُلّ" Sg ;
+  everything_NP = regNP "كُلّ" Sg Def ;
 --  everywhere_Adv = ss "ثريوهري" ;
   few_Det = mkDet "بَعض" Pl Const ;
 --  first_Ord = ss "فِرست" ;
@@ -72,10 +72,10 @@ concrete StructuralAra of Structural = CatAra **
 --  quite_Adv = ss "قُِتي" ;
   she_Pron = ResAra.she_Pron ;
 --  so_AdA = ss "سْ" ;
-  somebody_NP = regNP "أَحَد" Sg ;
+  somebody_NP = regNP "أَحَد" Sg Indef ;
   someSg_Det = mkDet "أَحَد" Sg Const ;
   somePl_Det = mkDet "بَعض" Pl Const ;
-  something_NP = regNP "شَيْء" Sg ;
+  something_NP = regNP "شَيْء" Sg Indef ;
 --  somewhere_Adv = ss "سْموهري" ;
   that_Quant = mkQuant3 "ذَلِكَ" "تِلكَ" "أُلٱِكَ" Def;
   that_Subj = mkSubj "أنَّ" ;
@@ -85,13 +85,13 @@ concrete StructuralAra of Structural = CatAra **
 --  there7from_Adv = ss ["فرْم تهري"] ;
 --  therefore_PConj = ss "تهرفْري" ;
 ----b  these_NP = indeclNP "هَؤُلَاء" Pl ;
- they_Pron = theyMasc_Pron ;
+  they_Pron = theyMasc_Pron ;
   this_Quant = mkQuant7 "هَذا" "هَذِهِ" "هَذَان" "هَذَيْن" "هَاتَان" "هَاتَيْن" "هَؤُلَاء" Def;
 ----b  this_NP = indeclNP "هَذا" Sg ;
 ----b  those_NP = indeclNP "هَؤُلَاءكَ" Pl ;
   through_Prep = mkPrep "عَبْرَ" ;
 --  too_AdA = ss "تّْ" ;
-  to_Prep = mkPrep "إِلى" ;
+  to_Prep = mkPrep "إِلَى" ;
   under_Prep = mkPrep "تَحْتَ" ;
 --  very_AdA = ss "ثري" ;
   want_VV = mkVV (mkV "رود" FormIV) ;