(Ara) Conjunctions, ComplV*, additions in Idiom&Construction, etc.

src/arabic/VerbAra.gf

@@ -1,4 +1,4 @@
-concrete VerbAra of Verb = CatAra ** open Prelude, ResAra in {
+concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in {
 
   flags optimize=all_subs ;
 
@@ -16,13 +16,8 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra in {
 
     ComplSlash vp np = insertObj np vp ;
 
---    Complv3 v np np2 = insertObj np2 (insertObj np (predV v)) ;
-
-{-{s = \\_ => v.c2 ++ np.s ! Acc ++ v.c3 ++ np2.s ! Acc ;
-                 a = {pgn = Per3 Masc Sg ; isPron = False} } --FIXME
-      (predV v) ;-}
-
-    ComplVV vv vp =  let vvVP = predV vv in --- IL
+    -- : VV  -> VP -> VP ;  -- want to run
+    ComplVV vv vp = let vvVP = predV vv in -- IL
       vp ** {
         s = \\pgn,vpf => vvVP.s ! pgn ! vpf
                       ++ vv.c2.s  -- أَنْ
@@ -30,14 +25,26 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra in {
         isPred = False
       } ;
 
---    ComplVS v s  = insertObj (\\_ => conjThat ++ s.s) (predV v) ;
---    ComplVQ v q  = insertObj (\\_ => q.s ! QIndir) (predV v) ;
---
---    ComplVA  v    ap = insertObj (ap.s) (predV v) ;
+    -- : VS -> S -> VP ;  -- say that she runs
+    ComplVS vs s = predV vs ** { -- IL
+      obj = emptyObj ** s } ;
+
+    -- : VQ -> QS -> VP ;  -- wonder who runs
+    ComplVQ vq qs = predV vq ** { -- IL
+      obj = emptyObj ** {s = qs.s ! QIndir}
+      } ;
+
+    -- : VA -> AP -> VP ;  -- they become red
+    ComplVA v ap = predV v ** {comp = CompAP ap} ;
+
 --    ComplV2A v np ap =
 --      insertObj (\\_ => v.c2 ++ np.s ! Acc ++ ap.s ! np.a) (predV v) ;
 --
-    UseComp xabar = kaan xabar ;
+    UseComp xabar =
+      case xabar.isNP of {
+        False => kaan xabar ;
+        True  => predV copula ** {obj = xabar.obj ; isPred=True} 
+      } ;
 
     UseCopula = predV copula ;
 
@@ -51,10 +58,14 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra in {
 --
 --    UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; isRefl = vv.isRefl} ; -- no
 
-    CompCN cn = {s = \\agr,c => cn.s ! agr.n ! Indef ! c ++ cn.np ! c ++ cn.adj ! agr.n ! Indef ! c} ; ----IL
-    CompAP ap = {s = \\agr,c => ap.s ! Hum ! agr.g ! agr.n ! Indef ! c} ; --FIXME
-    CompNP np = {s = \\_,c => np.s ! c};
-    CompAdv a = {s = \\_,_ => a.s} ;
+    CompAP ap = {s   = \\agr,c => ap.s ! Hum ! agr.g ! agr.n ! Indef ! c ; --FIXME
+                 obj = emptyObj ; isNP = False} ;
+    CompAdv a = {s   = \\_,_ => a.s ;
+                 obj = emptyObj ; isNP = False} ;
+
+    CompCN cn = {s = \\agr,c => cn.s ! agr.n ! Indef ! Nom ++ cn.np ! Nom ++ cn.adj ! agr.n ! Indef ! Nom ;
+                 obj = emptyObj ; isNP = False} ;
+    CompNP np = {s = \\_,_ => [] ; obj = np ** {s = np.s ! Nom} ; isNP = True} ;
 --
 --
 }