(Ara) variable names + whitespace

src/arabic/ResAra.gf

@@ -247,7 +247,7 @@ oper
 
   --macro for defective verbs:
   verbDef : DefForms -> Vowel -> Verb =
-    \vforms,vImpf ->
+    \vforms,vowImpf ->
     let {
        rama  = vforms ! 0 ; -- VPerf Act (Per3 Masc Sg)
        ramay = vforms ! 1 ; -- VPerf Act (Per3 Fem  Pl)
@@ -375,13 +375,13 @@ oper
 --now is used for the sound, assimilated (weak C1), and when C1 = hamza:
 
 v1sound : Root3 -> Vowel -> Vowel -> Verb =
-  \fcl,vPerf,vImpf ->
+  \fcl,vowPerf,vowImpf ->
   let {
     qf = {f = fcl.c ; c = fcl.l} ;
-    qif = mkBilit (fvc ! vImpf) qf;
-    katab = mkStrong (patV1Perf ! vPerf) fcl ;
-    kutib = mkStrong fucil fcl ;		--FIXME no passive if vPerf == u
-    ktub  = mkStrong (patV1Impf ! vImpf) fcl ;
+    qif = mkBilit (fvc ! vowImpf) qf;
+    katab = mkStrong (patV1Perf ! vowPerf) fcl ;
+    kutib = mkStrong fucil fcl ; --FIXME no passive if vowPerf == u
+    ktub  = mkStrong (patV1Impf ! vowImpf) fcl ;
     aktub = "َ" +
       case fcl.f of {
         "و"|"ي" => qif ;
@@ -436,21 +436,21 @@ fvc : Vowel => Pattern =
 
 
 v1geminate : Str -> Vowel -> Vowel -> Verb =
-  \rootStr,vPerf,vImpf ->
+  \rootStr,vowPerf,vowImpf ->
   let {
     mdd = mkRoot3 rootStr ; --fcc
     md  = mkRoot2 rootStr ; --fc
     madd = mkBilit facc md ;
-	madad = mkStrong (patGem1 ! vPerf) mdd ;
+    madad = mkStrong (patGem1 ! vowPerf) mdd ;
     mudd = mkBilit fucc md ;
     mudid = mkStrong fucil mdd ;
-	mudd' = mkBilit (patGem2 ! vImpf) md ;
+    mudd' = mkBilit (patGem2 ! vowImpf) md ;
     amudd = "َ" + mudd' ;
-	mdud = mkStrong (patGem3 ! vImpf) mdd ;
+    mdud = mkStrong (patGem3 ! vowImpf) mdd ;
     amdud = "َ" + mdud ;
     umadd = "ُ" + madd ;
     umdad = "ُ" + mkStrong fcal mdd ;
-	Umdud = (prefixImp ! vImpf) + mdud;
+    Umdud = (prefixImp ! vowImpf) + mdud;
     mamdUd = mkStrong mafcUl mdd
   }  in verbGeminate madd madad mudd mudid amudd amdud umadd umdad Umdud mudd' mamdUd;
 
@@ -477,57 +477,41 @@ patGem3 : Vowel => Pattern =
 
 DefForms : Type = Predef.Ints 10 => Str ;
 toDefForms : (x1,_,_,_,_,_,_,_,_,_,x11 : Str) -> DefForms =
-  \rama,ramay,rumi,rumu,rumiy,armi,armu,urma,eirmi,eirmu,marmiy ->
+  \a,b,c,d,e,f,g,h,i,j,k ->
   table {
-      0 => rama ;
-      1 => ramay ;
-      2 => rumi ;
-      3 => rumu ;
-      4 => rumiy ;
-      5 => armi ;
-      6 => armu ;
-      7 => urma ;
-      8 => eirmi ;
-      9 => eirmu ;
-      10 => marmiy
+    0 => a ; 1 => b ; 2 => c ; 3 => d ; 4 => e ; 5 => f ; 6 => g ;
+    7 => h ; 8 => i ; 9 => j ; 10 => k
   } ;
 
-
-def1Forms_vPerfA : Root3 -> Vowel -> DefForms = \rmy,vImpf ->
+def1Forms_perfA : Root3 -> Vowel -> DefForms = \rmy,vowImpf ->
  let {
+   _rmi = mkDefective (patDef1 ! vowImpf) rmy ;
+   _rmu = mkDefective (patDef2 ! vowImpf) rmy ;
    rama = mkDefective faca rmy ;
    ramay = mkStrong facalo rmy ;
    rumi = mkDefective fuci rmy ;
    rumu = mkDefective fucu rmy ;
    rumiy = mkStrong fucilo rmy ;
-   rmi = mkDefective (patDef1 ! vImpf)  rmy ;
-   armi = "َ" + rmi ;
-   rmu = mkDefective (patDef2 ! vImpf) rmy ;
-   armu = "َ" + rmu ;
+   armi = "َ" + _rmi ;
+   armu = "َ" + _rmu ;
    urma = mkDefective ufca rmy ;
-   eirmi = prefixImp ! vImpf + rmi;
-   eirmu = prefixImp ! vImpf + rmu;
+   eirmi = prefixImp ! vowImpf + _rmi;
+   eirmu = prefixImp ! vowImpf + _rmu;
    marmiy = mkStrong mafcil rmy
  } in toDefForms rama ramay rumi rumu rumiy armi armu urma eirmi eirmu marmiy ;
 
-v1defective : Root3 -> Vowel -> Vowel -> Verb = \rmy,vPerf,vImpf ->
-  case vPerf of {
-    i => v1defective_i rmy vImpf ;
-    _ => v1defective_a rmy vImpf
-  } ;
+v1defective_a : Root3 -> Vowel -> Verb = \rmy,vowImpf ->
+  let vforms = def1Forms_perfA rmy vowImpf
+   in verbDef vforms vowImpf ;
 
-v1defective_a : Root3 -> Vowel -> Verb = \rmy,vImpf ->
-  let vforms = def1Forms_vPerfA rmy vImpf
-   in verbDef vforms vImpf ;
-
-v1defective_i : Root3 -> Vowel -> Verb = \bqy,vImpf -> -- IL (conjugation 1d4)
-  let vforms_a = def1Forms_vPerfA bqy vImpf ;
+v1defective_i : Root3 -> Vowel -> Verb = \bqy,vowImpf -> -- IL (conjugation 1d4)
+  let vforms_a = def1Forms_perfA bqy vowImpf ;
       baqI  = mkDefective facIl bqy ;
       baqiy = mkDefective facil bqy ;
       vforms_i = table { 0 => baqI ;
                          1 => baqiy ;
                          x => vforms_a ! x } ;
-   in verbDef vforms_i vImpf ;
+   in verbDef vforms_i vowImpf ;
 
 patDef1 : Vowel => Pattern =
   table {
@@ -684,7 +668,7 @@ prefixImp : Vowel => Str =
     _ => "إِ"
   } ;
 
-patHollowPerf : (_,_,_,_ :Str) -> Voice => PerGenNum => Str = \xAf,xif,xyf,xuf ->
+patHollowPerf : (_,_,_,_ :Str) -> Voice => PerGenNum => Str = \xAf,xif,xIf,xuf ->
   table {
     Act =>
       table {
@@ -695,7 +679,7 @@ patHollowPerf : (_,_,_,_ :Str) -> Voice => PerGenNum => Str = \xAf,xif,xyf,xuf -
     Pas =>
       table {
         Per3 Fem Pl => xuf ;
-	    Per3 _	_  => xyf ;
+        Per3 _   _  => xIf ;
         _           => xuf
       }
    } ;
@@ -721,7 +705,7 @@ patHollowJus : (_,_,_,_ : Str) -> Voice => PerGenNum => Str =\axaf,axAf,uxaf,uxA
   table {
     Act =>
       table {
-        Per3 g Sg    => axaf ;
+        Per3 _   Sg  => axaf ;
         Per3 Fem Pl  => axaf ;
         Per2 Fem Pl  => axaf ;
         Per2 Masc Sg => axaf ;
@@ -730,7 +714,7 @@ patHollowJus : (_,_,_,_ : Str) -> Voice => PerGenNum => Str =\axaf,axAf,uxaf,uxA
     } ;
     Pas =>
       table {
-        Per3 g Sg    => uxaf ;
+        Per3 _   Sg  => uxaf ;
         Per3 Fem Pl  => uxaf ;
         Per2 Fem Pl  => uxaf ;
         Per2 Masc Sg => uxaf ;
@@ -739,8 +723,6 @@ patHollowJus : (_,_,_,_ : Str) -> Voice => PerGenNum => Str =\axaf,axAf,uxaf,uxA
     }
   } ;
 
-
-
 patHollowImp : (_,_ :Str) -> Gender => Number => Str =\xaf,xAf ->
   table {
     Masc => table { Sg => xaf ; _ => xAf} ;