From cf73a45fc686f8d9d4a9cdd2b9eb7208dd9854f9 Mon Sep 17 00:00:00 2001 From: Laurette Marais Date: Mon, 21 Aug 2023 14:59:07 +0200 Subject: [PATCH] (zul) temp paradigms fix --- src/zulu/ParadigmsZul.gf | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/zulu/ParadigmsZul.gf b/src/zulu/ParadigmsZul.gf index 9dec01fd4..b53b7e2f3 100755 --- a/src/zulu/ParadigmsZul.gf +++ b/src/zulu/ParadigmsZul.gf @@ -127,23 +127,30 @@ oper } ; mkV3 = overload { - mkV3 : (phuz : Str) -> V3 = \phuz -> lin V3 (regVerb phuz) ; - -- mkV2 : (phathw : Str) -> Voice -> V2 = \phathw,voice -> lin V2 (passiveVerb phathw voice) ; + mkV3 : (hamb : Str) -> V3 = \hamb -> lin V3 (regVerb hamb) ; + mkV3 : (th,thi : Str) -> V3 = \th,thi -> lin V3 (th_Verb th thi) ; + mkV3 : (guqubal,guqubala,guqubele : Str) -> V3 = \guqubal,guqubala,guqubele -> lin V3 (three_Verb guqubal guqubala guqubele) ; + mkV3 : (guqubal,guqubala,guqubele,guqubele_2 : Str) -> V3 = \guqubal,guqubala,guqubele,guqubele_2 -> lin V3 (four_Verb guqubal guqubala guqubele guqubele_2) ; + } ; + + mkV2V = overload { + mkV2V : (hamb : Str) -> V2V = \hamb -> lin V2V (regVerb hamb) ; + mkV2V : (th,thi : Str) -> V2V = \th,thi -> lin V2V (th_Verb th thi) ; + mkV2V : (guqubal,guqubala,guqubele : Str) -> V2V = \guqubal,guqubala,guqubele -> lin V2V (three_Verb guqubal guqubala guqubele) ; + mkV2V : (guqubal,guqubala,guqubele,guqubele_2 : Str) -> V2V = \guqubal,guqubala,guqubele,guqubele_2 -> lin V2V (four_Verb guqubal guqubala guqubele guqubele_2) ; } ; mkVA = overload { mkVA : (b : Str) -> VA = \b -> lin VA (regVerb b) ; } ; - mkVS = overload { - mkVS : (cel : Str) -> VS = \cel -> lin VS (regVerb cel) ; + mkVV = overload { + mkVV : (f : Str) -> VV = \f -> lin VV (regVerb f) } ; - mkVAux = overload { - mkVAux : (hlale : Str) -> VAux = \hlale -> lin VAux { - s = hlale ; - at = PartAux - } + mkVS = overload { + mkVS : (cel : Str) -> SType -> VS = \cel,st -> lin VS ((regVerb cel) ** { s_type = st } ) ; + mkVS : (az,azi : Str) -> SType -> VS = \az,azi,st -> lin VS ((th_Verb az azi) ** { s_type = st } ) ; } ; -- yourPl_Det = overload {