(Pes) Add premodifier APs

src/persian/AdjectivePes.gf

@@ -3,46 +3,51 @@ concrete AdjectivePes of Adjective = CatPes ** open ResPes, Prelude in {
   flags coding = utf8;
   lin
 
-    PositA a = a ;
- 	UseComparA a = a;
+  PositA a = a ;
+ 	UseComparA a = a ;
 
-    ComparA a np = {
-        s =\\ez => a.s ! ez ++ "تر" ++ "از" ++ np.s !  Bare  ;
-	adv = a.adv
-       } ;
+  ComparA a np = a ** {
+    s = \\m => a.s ! m ++ "تر" ++ "از" ++ np.s ! Bare ;
+    adv = a.adv ++ "تر" ++ "از" ++ np.s ! Bare  ;
+    } ;
 
 ---- $SuperlA$ belongs to determiner syntax in $Noun$.
 
-    ComplA2 a np = {
-      s =\\ez => np.s !  Bare ++ a.c2 ++ a.s  ! ez ;
-      adv = a.adv
-     } ;
+  ComplA2 a np = a ** {
+    s = \\m => np.s ! Bare ++ a.c2 ++ a.s ! m ;
+    adv = np.s ! Bare ++ a.c2 ++ a.adv
+    } ;
 
-    ReflA2 a = {
-      s =\\ez =>  a.s ! ez ++ "" ; -- need to be fixed
-      adv = a.adv
-      } ;
+  ReflA2 a = a ** {
+    s = \\m => a.s ! m ++ reflPron ! defaultAgr ; ---- need to be fixed
+    adv = a.adv ++ reflPron ! defaultAgr
+    } ;
 
-    SentAP ap sc = {
-      s =\\ez =>  ap.s! ez ++ sc.s ;
-      adv = ap.adv
-      } ;
+  SentAP ap sc = ap ** {
+    s = \\m => ap.s ! m ++ sc.s ;
+    adv = ap.adv ++ sc.s
+    } ;
 
-    AdAP ada ap = {
-      s =\\ez => ada.s ++ ap.s ! ez ;
-      adv = ap.adv
-      } ;
+  AdAP ada ap = ap ** {
+    s = \\m => ada.s ++ ap.s ! m ;
+    adv = ada.s ++ ap.adv ;
+    } ;
 
-    UseA2 a = a ;
+  UseA2 a = a ;
 
-	CAdvAP  cadv ap np = {
-	 s =\\ez =>  cadv.s ++  np.s !  Bare ++ ap.s ! ez ;
-	 adv = ap.adv
-	 };
+  CAdvAP cadv ap np = ap ** {
+    s = \\m => cadv.s ++ np.s ! Bare ++ ap.s ! m ;
+    adv = cadv.s ++ ap.adv
+    } ;
 
-    AdjOrd ord =  { s =\\_ => ord.s ; adv = ""};
+  AdjOrd ord = {
+    s = \\_ => ord.s ;
+    adv = ord.s ;
+    isPre = ord.isPre
+    } ;
 
-
-
-     AdvAP ap adv = {s =\\ez => ap.s ! ez ++ adv.s ; adv = ap.adv};
+  AdvAP ap adv = ap ** {
+    s = \\m => ap.s ! m ++ adv.s ;
+    adv = ap.adv ++ adv.s
+    } ;
 }