diff --git a/src/zulu/AllZul.gf b/src/zulu/AllZul.gf index 96de62457..c80d00a60 100644 --- a/src/zulu/AllZul.gf +++ b/src/zulu/AllZul.gf @@ -1,5 +1,5 @@ ---# -path=.:../abstract:../common:../api +--# -path=.:../abstract:../common:../zulu/abstract_ext concrete AllZul of AllZulAbs = - CatZul ** { + LangZul ** { } diff --git a/src/zulu/AllZulAbs.gf b/src/zulu/AllZulAbs.gf index 1996d79a0..a120b25b6 100644 --- a/src/zulu/AllZulAbs.gf +++ b/src/zulu/AllZulAbs.gf @@ -1,5 +1,5 @@ --# -path=.:../abstract:../common:../api abstract AllZulAbs = - Cat ** { + Lang ** { } diff --git a/src/zulu/GrammarZul.gf b/src/zulu/GrammarZul.gf index 4acef21b1..0a8a8bc3d 100755 --- a/src/zulu/GrammarZul.gf +++ b/src/zulu/GrammarZul.gf @@ -9,7 +9,7 @@ concrete GrammarZul of Grammar = SentenceZul, QuestionZul, RelativeZul, - ConjunctionZul, +-- ConjunctionZul, PhraseZul, TextX - [Temp,Adv,IAdv], StructuralZul, diff --git a/src/zulu/ParadigmsZul.gf b/src/zulu/ParadigmsZul.gf index b53b7e2f3..09ef28d19 100755 --- a/src/zulu/ParadigmsZul.gf +++ b/src/zulu/ParadigmsZul.gf @@ -133,12 +133,12 @@ oper 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) ; - } ; +-- 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) ; @@ -148,10 +148,10 @@ oper mkVV : (f : Str) -> VV = \f -> lin VV (regVerb f) } ; - 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 } ) ; - } ; + -- 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 { -- yourPl_Det : Det = lin Det { s = "jou" ; n = Pl ; p = TPos } ;