Merge branch 'v_longform'

src/zulu/BackwardZul.gf

@@ -11,7 +11,7 @@ concrete BackwardZul of Backward = CatZul ** open ResZul,Prelude,ParamX in {
 
     ComplV2 v2 np = {
       s = table {
-        MainCl => \\a,p,t => let
+        MainCl => \\a,p,t,l => let
           vform = (VFIndic MainCl p t) ;
           tp = tensePref vform v2.r v2.syl ; -- [] / zo- / zuku-
           oc = objConc np.agr v2.r v2.syl ; -- [] / m -
@@ -25,7 +25,7 @@ concrete BackwardZul of Backward = CatZul ** open ResZul,Prelude,ParamX in {
           True => tp ++ oc ++ r ++ obj ;
           False => tp ++ r ++ obj
         } ;
-        RelCl => \\a,p,t => let
+        RelCl => \\a,p,t,l => let
           vform = (VFIndic RelCl p t) ;
           rc = relConc vform a v2.r ; -- o- / onga-
           tp = tensePref vform v2.r v2.syl ; -- [] / zo- / zuku-

src/zulu/CatZul.gf

@@ -46,7 +46,7 @@ concrete CatZul of Cat = CommonX - [Temp,Tense,Adv,IAdv] **
 -- Verb
 
     VP = {
-      s : CType => Agr => Polarity => BasicTense => Str ; -- TODO: mood
+      s : CType => Agr => Polarity => BasicTense => Bool => Str ; -- TODO: mood
       -- oc : Str ;
       comp : Str ;
       iadv : Str ;

src/zulu/RelativeZul.gf

@@ -71,7 +71,7 @@ concrete RelativeZul of Relative = CatZul ** open ResZul,Prelude,ParamX in {
             -- ++ (tensePref vform)
             -- ++ vp.oc
             -- ++ vp.s!(rform vform_main reqLF)
-            ++ vp.s!RelCl!a!p!t
+            ++ vp.s!RelCl!a!p!t!reqLF
             -- ++ relsuf
             ++ vp.iadv
             ++ vp.comp
@@ -89,7 +89,7 @@ concrete RelativeZul of Relative = CatZul ** open ResZul,Prelude,ParamX in {
             -- naively removed subject
             rp.s ++
             -- pcp ++
-            vp.s!RelCl!a!p!t ++
+            vp.s!RelCl!a!p!t!False ++
             vp.iadv ++
             vp.advs
       } ;
@@ -109,7 +109,7 @@ concrete RelativeZul of Relative = CatZul ** open ResZul,Prelude,ParamX in {
             -- naively removed subject
             rp.s ++
             -- pcp ++
-            vp.s!RelCl!a!p!t ++
+            vp.s!RelCl!a!p!t!False ++
             vp.iadv ++
             vp.advs
       } ;
@@ -124,7 +124,7 @@ concrete RelativeZul of Relative = CatZul ** open ResZul,Prelude,ParamX in {
             -- naively removed subject
             rp.s ++
             pcp ++
-            vp.s!RelCl!a!p!t ++
+            vp.s!RelCl!a!p!t!False ++
             vp.iadv ++
             vp.advs
       } ;
@@ -140,7 +140,7 @@ concrete RelativeZul of Relative = CatZul ** open ResZul,Prelude,ParamX in {
         in
           rp.s ++
           -- adjpref ++
-          vp.s!RelCl!a!p!t
+          vp.s!RelCl!a!p!t!False
           ++ vp.iadv ++ vp.advs
         } ;
 

src/zulu/ResZul.gf

@@ -642,30 +642,6 @@ resource ResZul = open Prelude,Predef,ParamX in {
       t = RelType
     } ;
 
-    -- enumAdj : Str -> { s : AForm => Str ; empty : Str ; t : AType } = \a ->
-    -- {
-    --   s = \\_ => a ;
-    --   -- b = case a of {
-    --   --   ("kh"|"th"|"sh"|"b"|"f"|"hl")+_ => True ;
-    --   --   ("m"|"n")+_ => True ;
-    --   --   _ => False
-    --   -- } ;
-    --   empty = [] ;
-    --   t = EnumType
-    -- } ;
-
-    -- relSuf : VForm -> Bool -> Str = \longform ->
-    -- case longform of {
-    --   True => pre { #vowel => [] ; #cons => [] ; "y" => [] ; _ => "yo" } ;
-    --   False => []
-    -- } ;
-
-    rel_yo : Str = pre {
-      #vowel => [] ;
-      #cons => [] ;
-      _ => BIND++"yo"
-    } ;
-
     rel_yo_2 : Str = BIND++"yo" ;
 
     relSuf : VForm -> Str = \vform -> case vform of {

src/zulu/SentenceZul.gf

@@ -12,8 +12,14 @@ concrete SentenceZul of Sentence = CatZul ** open Prelude,ResZul,ParamX in {
       CopEq => cl_with_eq_cop_predicate np vp ;
       -- VACompl => cl_with_ap_comp_predicate np vp ;
       AdvComp => cl_with_adv_comp_predicate np vp ;
-      (NoComp | VNPCompl) => {
+      (NoComp | VNPCompl) =>
-        s = \\p,t => np.s!NFull ++ (verb_prefix vp p t np.agr) ++ vp.s!MainCl!np.agr!p!t ++ vp.comp ++ vp.iadv ++ vp.advs ;
+      let
+        longform_suffix = case vp.hasComp of {
+          True => False ;
+          False => True
+        }
+      in {
+        s = \\p,t => np.s!NFull ++ (verb_prefix vp p t np.agr) ++ vp.s!MainCl!np.agr!p!t!longform_suffix ++ vp.comp ++ vp.iadv ++ vp.advs ;
       } ;
       _ => cl_with_verb_predicate np vp
     } ;
@@ -39,8 +45,8 @@ concrete SentenceZul of Sentence = CatZul ** open Prelude,ResZul,ParamX in {
     in case vp.vptype of {
       VNPCompl => {
         s = table {
-          Pos => vp.s!MainCl!np.agr!Pos!impTense ++ vp.comp ++ vp.iadv ++ vp.advs ;
+          Pos => vp.s!MainCl!np.agr!Pos!impTense!False ++ vp.comp ++ vp.iadv ++ vp.advs ;
-          Neg => "unga" ++ vp.s!MainCl!np.agr!Neg!impTense ++ vp.comp ++ vp.iadv ++ vp.advs
+          Neg => "unga" ++ vp.s!MainCl!np.agr!Neg!impTense!False ++ vp.comp ++ vp.iadv ++ vp.advs
         }
       } ;
 
@@ -108,7 +114,7 @@ concrete SentenceZul of Sentence = CatZul ** open Prelude,ResZul,ParamX in {
           subj = np.s!NFull
         in
           subj ++
-          vp.s!MainCl!np.agr!p!t
+          vp.s!MainCl!np.agr!p!t!False
           ++ vp.comp ++ vp.iadv ++ vp.advs
     } ;
 
@@ -119,7 +125,7 @@ concrete SentenceZul of Sentence = CatZul ** open Prelude,ResZul,ParamX in {
           vform_main = VFIndic MainCl p t ;
         in
           impPref p
-          ++ vp.s!MainCl!np.agr!p!t
+          ++ vp.s!MainCl!np.agr!p!t!False
           ++ vp.iadv
           ++ vp.comp
           ++ vp.advs
@@ -156,10 +162,14 @@ concrete SentenceZul of Sentence = CatZul ** open Prelude,ResZul,ParamX in {
         let
           subj = np.s!NFull ;
           vform_main = VFIndic MainCl p t ;
+          longform_suffix = case vp.hasComp of {
+            True => False ;
+            False => True
+          }
         in
           subj
           ++ (verb_prefix vp p t np.agr)
-          ++ vp.s!MainCl!np.agr!p!t
+          ++ vp.s!MainCl!np.agr!p!t!longform_suffix
           ++ vp.iadv
           ++ vp.comp
           ++ vp.advs
@@ -208,7 +218,7 @@ concrete SentenceZul of Sentence = CatZul ** open Prelude,ResZul,ParamX in {
         in
           subj ++
           -- pcp ++
-          vp.s!MainCl!np.agr!p!t
+          vp.s!MainCl!np.agr!p!t!False
           ++ vp.comp ++ vp.iadv ++ vp.advs
     } ;
 
@@ -239,7 +249,7 @@ concrete SentenceZul of Sentence = CatZul ** open Prelude,ResZul,ParamX in {
           -- ++ lfya
           -- -- ++ (tensePref vform_main)
           -- ++ vp.comp
-          vp.s!MainCl!np.agr!p!t
+          vp.s!MainCl!np.agr!p!t!False
           ++ vp.comp ++ vp.iadv ++ vp.advs
     } ;
 

src/zulu/VerbExtZul.gf

@@ -5,14 +5,14 @@ concrete VerbExtZul of VerbExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
     CopAP ap = {
       s = case ap.t of {
         AdjType => table {
-          MainCl => \\a,p,t => let
+          MainCl => \\a,p,t,l => let
             vform = VFIndic MainCl p t ;
             pcp = ap_cop_pref vform a AdjType ; -- u- / uzoba / ube- / waye- / wayenge-
             adjpref =  adjPref a vform ; -- m-
             cop_base = ap.s!(aformN a) -- khulu
           in
             pcp ++ adjpref ++ cop_base ;
-          RelCl => \\a,p,t => let
+          RelCl => \\a,p,t,l => let
             vform = VFIndic RelCl p t ;
             rcp = (relConcCop vform a RC) ; -- o-
             pcp = ap_cop_pref vform a AdjType ; -- [] / -nge- / zoba / -be- / -benge- -waye- / -wayenge-
@@ -22,13 +22,13 @@ concrete VerbExtZul of VerbExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
             rcp ++ pcp ++ adjpref ++ cop_base
         } ;
         RelType => table {
-          MainCl => \\a,p,t => let
+          MainCl => \\a,p,t,l => let
             vform = VFIndic MainCl p t ;
             pcp = ap_cop_pref vform a RelType ; -- u-
             cop_base = ap.s!AF1 -- qotho
           in
             pcp ++ cop_base ;
-          RelCl => \\a,p,t => let
+          RelCl => \\a,p,t,l => let
             vform = VFIndic RelCl p t ;
             rcp = (relConcCop vform a RC) ; -- o-
             pcp = ap_cop_pref vform a RelType ; -- [] / -nge- / zoba / -benge-
@@ -46,14 +46,14 @@ concrete VerbExtZul of VerbExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
 
     CopNP np = {
       s = table {
-        MainCl => \\a,p,t => let
+        MainCl => \\a,p,t,l => let
           vform = VFIndic MainCl p t ;
           pcp = (id_pre_cop_pref vform a) ; -- u- / uzoba / akazukuba
           cp = (id_cop_pref np.agr) ; -- ng-
           cop_base = np.s!NFull -- umfundi
         in
           pcp ++ cp ++ cop_base ;
-        RelCl => \\a,p,t => let
+        RelCl => \\a,p,t,l => let
           vform = VFIndic RelCl p t ;
           rcp = (relConcCop vform a RC) ; -- o-
           pcp = (id_pre_cop_pref vform a) ; -- [] / zoba / zukuba
@@ -71,14 +71,14 @@ concrete VerbExtZul of VerbExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
 
     CopNPAssoc np = {
       s = table {
-        MainCl => \\a,p,t => let
+        MainCl => \\a,p,t,l => let
           vform = VFIndic MainCl p t ;
           pcp = (assoc_pre_cop_pref vform a) ; -- u- / uzoba
           cp = (assoc_cop_pref p np.agr) ; -- ne-
           cop_base = np.s!NReduced -- moto
         in
           pcp ++ cp ++ cop_base ;
-        RelCl => \\a,p,t => let
+        RelCl => \\a,p,t,l => let
           vform = VFIndic RelCl p t ;
           rcp = (relConcCop vform a RC) ; -- o-
           pcp = (assoc_pre_cop_pref vform a) ; -- [] / zoba
@@ -96,7 +96,7 @@ concrete VerbExtZul of VerbExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
 
     ComplV2Nonspec v2 np = {
       s = table {
-        MainCl => \\a,p,t => let
+        MainCl => \\a,p,t,l => let
           vform = VFIndic MainCl p t ;
           tp = tensePref vform v2.r v2.syl ;
           oc = objConc np.agr v2.r v2.syl ;
@@ -113,7 +113,7 @@ concrete VerbExtZul of VerbExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
           True => tp ++ oc ++ r ++ obj ;
           False => tp ++ r ++ obj
         } ;
-        RelCl => \\a,p,t => let
+        RelCl => \\a,p,t,l => let
           vform = (VFIndic RelCl p t) ;
           rc = relConc vform a v2.r ;
           tp = tensePref vform v2.r v2.syl ;
@@ -141,7 +141,7 @@ concrete VerbExtZul of VerbExt = CatZul,CatExtZul ** open ResZul, Prelude, Param
     } ;
 
     CopLoc loc = {
-      s = loc.s ;
+      s = \\c,a,p,t,l => loc.s!c!a!p!t ;
       comp,advs,iadv = [] ;
       hasComp = True ;
       r = RC ;

src/zulu/VerbZul.gf

@@ -5,18 +5,21 @@ concrete VerbZul of Verb = CatZul ** open ResZul, Prelude, ParamX in {
   lin
     UseV v = {
       s = table {
-        MainCl => \\a,p,t => let
+        MainCl => \\a,p,t,l => let
           vform = VFIndic MainCl p t ;
           tp = tensePref vform v.r v.syl ; -- [] / zo- / zuku-
-          r = v.s!(rform (VFIndic MainCl p t) True) -- hamba
+          r = v.s!(rform (VFIndic MainCl p t) l) -- hamba
           -- rest of verb prefix built later (eg no "ya" with certain question words)
         in tp ++ r ;
-        RelCl => \\a,p,t => let
+        RelCl => \\a,p,t,l => let
           vform = VFIndic RelCl p t ;
           rc = relConc vform a v.r ; -- o-
           tp = tensePref vform v.r v.syl ; -- [] / zo- / zuku-
-          r = v.s!(rform vform True) ; -- hamba
+          r = v.s!(rform vform l) ; -- hamba
-          suf = relSuf vform -- [] / -yo
+          suf = case l of {
+            True => relSuf vform ;
+            False => []
+          } ;
         in rc ++ tp ++ r ++ suf
       } ;
       iadv, advs, comp = [] ;
@@ -192,7 +195,7 @@ concrete VerbZul of Verb = CatZul ** open ResZul, Prelude, ParamX in {
     --   }
     -- } ;
 
-    AdvVP vp adv = vp ** { advs = vp.advs ++ adv.s } ;
+    AdvVP vp adv = vp ** { advs = vp.advs ++ adv.s ; hasComp = True } ;
     -- {
     --   s = vp.s ;
     --   oc = vp.oc ;

src/zulu/lexica/DevLex.gf

@@ -78,4 +78,6 @@ abstract DevLex = Cat ** {
    ngaphezu_Adv : Adv ;
    -- kakhulu_AdA : AdA ;
 
+   lapho_Adv : Adv ;
+
 }

src/zulu/lexica/DevLexZul.gf

@@ -76,4 +76,6 @@ concrete DevLexZul of DevLex = CatZul ** open ResZul,ParadigmsZul in {
 
    ngaphezu_Adv = mkAdv "ngaphezu" ;
    -- kakhulu_AdA = { s = "kakhulu" } ;
+
+   lapho_Adv = mkAdv "lapho" ;
 }