add ListS, insertObj

src/malay/ConjunctionMay.gf

@@ -31,11 +31,12 @@ concrete ConjunctionMay of Conjunction =
 -- Adverb and other simple {s : Str} types.
 lincat
   [Adv],[AdV],[IAdv] = {s1,s2 : Str} ;
+  [S] = {s1,s2 : Str} ;
 
 lin
-  BaseAdv, BaseAdV, BaseIAdv = twoSS ;
-  ConsAdv, ConsAdV, ConsIAdv = consrSS comma ;
-  ConjAdv, ConjAdV, ConjIAdv = conjunctDistrSS ;
+  BaseAdv, BaseAdV, BaseIAdv, BaseS = twoSS ;
+  ConsAdv, ConsAdV, ConsIAdv, ConsS = consrSS comma ;
+  ConjAdv, ConjAdV, ConjIAdv, ConjS = conjunctDistrSS ;
 
 
 {-

src/malay/StructuralMay.gf

@@ -178,6 +178,8 @@ lin have_V2 = let have' : V2 = mkV2 "ada" in have' ** {
 -- lin can8know_VV = can_VV ; -- can (capacity)
 lin can_VV = mkVV "boleh" ;   -- can (possibility)
 lin must_VV = mkVV "perlu" ;
+lin may_VV = mkVV "mungkin" ;
+lin shall_VV = mkVV "hendaklah" ;
 lin want_VV = mkVV "mahu" ;
 
 ------

src/malay/VerbMay.gf

@@ -62,7 +62,8 @@ lin
     } ;
 
   -- insertObjc : (Agr => Str) -> SlashVP -> SlashVP = \obj,vp ->
-  --   insertObj obj vp ** {c2 = vp.c2 ; gapInMiddle = vp.gapInMiddle ; missingAdv = vp.missingAdv } ;
+  insertObj obj vp ** {c2 = vp.c2 ; gapInMiddle = vp.gapInMiddle ; missingAdv = vp.missingAdv } ;
+
 
   SlashV2A v2 adj = useV {
     s = \\vf => v2.s ! vf;
@@ -71,12 +72,15 @@ lin
     adjCompl = adj.s
   } ;
 
+  -- : V2V -> VP -> VPSlash ;  -- beg (her) to go
+  SlashV2V v2v vp = ;
+
+
  {-
   -- : V2S -> S  -> VPSlash ;  -- answer (to him) that it is good
   SlashV2S v2s s =
 
-  -- : V2V -> VP -> VPSlash ;  -- beg (her) to go
-  SlashV2V v2v vp = ;
+
 
   -- : V2Q -> QS -> VPSlash ;  -- ask (him) who came
   SlashV2Q v2q qs = ;

src/malay/unittest/tenses.gftest

@@ -13,6 +13,9 @@ Lang: UseCl (TTAnt TFut ASimul) PPos (PredVP (DetCN (DetQuant DefArt NumSg) (Use
 LangEng: the cat will walk
 LangMay: kucing akan berjalan
 
+Lang: PredVP (UsePron i_Pron) (ComplSlash (SlashV2V beg_V2V (UseV go_V)) (UsePron she_Pron))
+LangEng: I begged her to go
+
 -------------
 -- Conditions