diff --git a/src/kiswahili/CatKis.gf b/src/kiswahili/CatKis.gf deleted file mode 100644 index 0f93da54..00000000 --- a/src/kiswahili/CatKis.gf +++ /dev/null @@ -1,2 +0,0 @@ -concrete CatKis of Cat = CommonX - [Pol] - ** CatBantu with (ResBantu = ResKis); diff --git a/src/kiswahili/ConjunctionKis.gf b/src/kiswahili/ConjunctionKis.gf deleted file mode 100644 index 4e0b34ef..00000000 --- a/src/kiswahili/ConjunctionKis.gf +++ /dev/null @@ -1,2 +0,0 @@ -concrete ConjunctionKis of Conjunction = CatKis ** ConjunctionBantu with - (ResBantu = ResKis); \ No newline at end of file diff --git a/src/kiswahili/GrammarKis.gf b/src/kiswahili/GrammarKis.gf deleted file mode 100644 index 71e66339..00000000 --- a/src/kiswahili/GrammarKis.gf +++ /dev/null @@ -1,30 +0,0 @@ ---# -path=.:../abstract:../common:prelude - -concrete GrammarKis of Grammar = - NounKis, - VerbKis, - AdjectiveKis, - AdverbKis, - NumeralKis, - SentenceKis, - QuestionKis, - RelativeKis, - ConjunctionKis, - PhraseKis, - TextX - [Pol,PPos,PNeg,Pres], - StructuralKis, - IdiomKis, - TenseX - [Pol,PPos,PNeg,Pres] - ** { - -flags startcat = Phr ; unlexer = text ; lexer = text; - ---lin - --PPos = {s = [] ; p = CPos} ; - -- PNeg = {s = [] ; p = CNeg True} ; -- contracted: don't - --PPos = {s = [] ; b = True} ; - -- PNeg = {s = [] ; b = False} ; - -- TPres = {s = [] ; t = ResKis.Pres} ; - -- TPast = {s = [] ; t = ResKis.Past }; - -- TFut = {s = [] ; t = ResKis.Fut }; -} ; diff --git a/src/kiswahili/LangKis.gf b/src/kiswahili/LangKis.gf deleted file mode 100644 index 115e8f53..00000000 --- a/src/kiswahili/LangKis.gf +++ /dev/null @@ -1,8 +0,0 @@ ---# -path=.:../abstract:../common:../api - -concrete LangKis of Lang = - GrammarKis, - LexiconKis --- ,ConstructionSwa - ** { -} ; diff --git a/src/kiswahili/NounKis.gf b/src/kiswahili/NounKis.gf deleted file mode 100644 index 45f24b93..00000000 --- a/src/kiswahili/NounKis.gf +++ /dev/null @@ -1,2 +0,0 @@ -concrete NounKis of Noun = - CatKis ** NounBantu with (Structural = StructuralKis), (ResBantu = ResKis); diff --git a/src/kiswahili/PhraseKis.gf b/src/kiswahili/PhraseKis.gf deleted file mode 100644 index 26531643..00000000 --- a/src/kiswahili/PhraseKis.gf +++ /dev/null @@ -1,3 +0,0 @@ -concrete PhraseKis of Phrase = CatKis ** PhraseBantu with - (ResBantu = ResKis); - \ No newline at end of file diff --git a/src/kiswahili/QuestionKis.gf b/src/kiswahili/QuestionKis.gf deleted file mode 100644 index b3c2c9cb..00000000 --- a/src/kiswahili/QuestionKis.gf +++ /dev/null @@ -1,2 +0,0 @@ -concrete QuestionKis of Question = CatKis ** QuestionBantu with - (ResBantu = ResKis); \ No newline at end of file diff --git a/src/kiswahili/RelativeKis.gf b/src/kiswahili/RelativeKis.gf deleted file mode 100644 index e10032bb..00000000 --- a/src/kiswahili/RelativeKis.gf +++ /dev/null @@ -1,2 +0,0 @@ -concrete RelativeKis of Relative = CatKis ** RelativeBantu with - (ResBantu = ResKis); \ No newline at end of file diff --git a/src/kiswahili/SentenceKis.gf b/src/kiswahili/SentenceKis.gf deleted file mode 100644 index ef3ddc73..00000000 --- a/src/kiswahili/SentenceKis.gf +++ /dev/null @@ -1,3 +0,0 @@ -concrete SentenceKis of Sentence = CatKis ** SentenceBantu with - (ResBantu = ResKis); - diff --git a/src/kiswahili/VerbKis.gf b/src/kiswahili/VerbKis.gf deleted file mode 100644 index b33f1b82..00000000 --- a/src/kiswahili/VerbKis.gf +++ /dev/null @@ -1,2 +0,0 @@ -concrete VerbKis of Verb = CatKis ** VerbBantu with - (ResBantu = ResKis); diff --git a/src/kiswahili/AdjectiveKis.gf b/src/swahili/AdjectiveSwa.gf similarity index 75% rename from src/kiswahili/AdjectiveKis.gf rename to src/swahili/AdjectiveSwa.gf index 98b3d4d9..3c0a32ff 100644 --- a/src/kiswahili/AdjectiveKis.gf +++ b/src/swahili/AdjectiveSwa.gf @@ -1,5 +1,5 @@ -concrete AdjectiveKis of Adjective = CatKis **AdjectiveBantu-[ComparA,UseComparA,ComplA2] -with (ResBantu = ResKis)** open DiffKis in +concrete AdjectiveSwa of Adjective = CatSwa **AdjectiveBantu-[ComparA,UseComparA,ComplA2] +with (ResBantu = ResSwa)** open DiffSwa in { flags coding=utf8; lin @@ -13,4 +13,4 @@ flags coding=utf8; s = \\g,n => a.s !AAdj g n ++ a.c2 ++ np.s ! NPAcc; isPre = False } ; - } \ No newline at end of file + } diff --git a/src/kiswahili/AdverbKis.gf b/src/swahili/AdverbSwa.gf similarity index 72% rename from src/kiswahili/AdverbKis.gf rename to src/swahili/AdverbSwa.gf index 205fb841..c8eca324 100644 --- a/src/kiswahili/AdverbKis.gf +++ b/src/swahili/AdverbSwa.gf @@ -1,5 +1,5 @@ -concrete AdverbKis of Adverb = CatKis **AdverbBantu -[ComparAdvAdj,ComparAdvAdjS] with - (ResBantu = ResKis)** open DiffKis in +concrete AdverbSwa of Adverb = CatSwa **AdverbBantu -[ComparAdvAdj,ComparAdvAdjS] with + (ResBantu = ResSwa)** open DiffSwa in { flags coding=utf8; lin @@ -10,4 +10,4 @@ flags coding=utf8; ComparAdvAdjS cadv a s = { s = cadv.s ++ a.s !AAdj G1 Sg ++ cadv.p ++ s.s } ; - } \ No newline at end of file + } diff --git a/src/swahili/CatSwa.gf b/src/swahili/CatSwa.gf new file mode 100644 index 00000000..9d7f5c6c --- /dev/null +++ b/src/swahili/CatSwa.gf @@ -0,0 +1,2 @@ +concrete CatSwa of Cat = CommonX + ** CatBantu with (ResBantu = ResSwa); diff --git a/src/swahili/ConjunctionSwa.gf b/src/swahili/ConjunctionSwa.gf new file mode 100644 index 00000000..36a15bc9 --- /dev/null +++ b/src/swahili/ConjunctionSwa.gf @@ -0,0 +1,2 @@ +concrete ConjunctionSwa of Conjunction = CatSwa ** ConjunctionBantu with + (ResBantu = ResSwa); diff --git a/src/kiswahili/DiffKis.gf b/src/swahili/DiffSwa.gf similarity index 97% rename from src/kiswahili/DiffKis.gf rename to src/swahili/DiffSwa.gf index c0bdc842..7a4f05cf 100644 --- a/src/kiswahili/DiffKis.gf +++ b/src/swahili/DiffSwa.gf @@ -1,9 +1,9 @@ -instance DiffKis of DiffBantu = open CommonBantu, Prelude in { +instance DiffSwa of DiffBantu = open CommonBantu, Prelude in { param - GenderKis = G1|G2|G3|G4|G5|G6|G7|G8|G9|G10|G11|G12|G13 ; + GenderSwa = G1|G2|G3|G4|G5|G6|G7|G8|G9|G10|G11|G12|G13 ; oper - Gender = GenderKis ; + Gender = GenderSwa ; firstGender = G1 ; secondGender = G2 ; conjThan = "kuliko" ; conjThat = "kuvita" ; diff --git a/src/swahili/GrammarSwa.gf b/src/swahili/GrammarSwa.gf new file mode 100644 index 00000000..023714da --- /dev/null +++ b/src/swahili/GrammarSwa.gf @@ -0,0 +1,21 @@ +--# -path=.:../abstract:../common:../bantu:prelude + +concrete GrammarSwa of Grammar = + NounSwa, + VerbSwa, + AdjectiveSwa, + AdverbSwa, + NumeralSwa, + SentenceSwa, + QuestionSwa, + RelativeSwa, + ConjunctionSwa, + PhraseSwa, + TextX, + StructuralSwa, + IdiomSwa, + TenseX + ** { + +flags startcat = Phr ; +} ; diff --git a/src/kiswahili/IdiomKis.gf b/src/swahili/IdiomSwa.gf similarity index 95% rename from src/kiswahili/IdiomKis.gf rename to src/swahili/IdiomSwa.gf index 089f74b0..780b71b5 100644 --- a/src/kiswahili/IdiomKis.gf +++ b/src/swahili/IdiomSwa.gf @@ -1,4 +1,4 @@ -concrete IdiomKis of Idiom = CatKis ** open Prelude, ResKis in { +concrete IdiomSwa of Idiom = CatSwa ** open Prelude, ResSwa in { flags optimize=all_subs ; {- diff --git a/src/swahili/LangSwa.gf b/src/swahili/LangSwa.gf new file mode 100644 index 00000000..def8c6d4 --- /dev/null +++ b/src/swahili/LangSwa.gf @@ -0,0 +1,8 @@ +--# -path=.:../abstract:../bantu:../common:../api + +concrete LangSwa of Lang = + GrammarSwa, + LexiconSwa +-- ,ConstructionSwa + ** { +} ; diff --git a/src/kiswahili/LexiconKis.gf b/src/swahili/LexiconSwa.gf similarity index 99% rename from src/kiswahili/LexiconKis.gf rename to src/swahili/LexiconSwa.gf index cec711b5..f0615baf 100644 --- a/src/kiswahili/LexiconKis.gf +++ b/src/swahili/LexiconSwa.gf @@ -1,7 +1,7 @@ --# -path=.:prelude -concrete LexiconKis of Lexicon = CatKis ** - open ParadigmsKis,StructuralKis, Prelude in { +concrete LexiconSwa of Lexicon = CatSwa ** + open ParadigmsSwa,StructuralSwa, Prelude in { flags optimize=values ; diff --git a/src/kiswahili/MorphoKis.gf b/src/swahili/MorphoSwa.gf similarity index 99% rename from src/kiswahili/MorphoKis.gf rename to src/swahili/MorphoSwa.gf index 0b2e0dd0..bd0e777e 100644 --- a/src/kiswahili/MorphoKis.gf +++ b/src/swahili/MorphoSwa.gf @@ -5,7 +5,7 @@ -- Benson Kituku 2017-2018 -resource MorphoKis = CommonBantu ,ResKis +resource MorphoSwa = CommonBantu ,ResSwa ** open Prelude, Predef in { diff --git a/src/swahili/NounSwa.gf b/src/swahili/NounSwa.gf new file mode 100644 index 00000000..c0898de4 --- /dev/null +++ b/src/swahili/NounSwa.gf @@ -0,0 +1,2 @@ +concrete NounSwa of Noun = + CatSwa ** NounBantu with (Structural = StructuralSwa), (ResBantu = ResSwa); diff --git a/src/kiswahili/NumeralKis.gf b/src/swahili/NumeralSwa.gf similarity index 96% rename from src/kiswahili/NumeralKis.gf rename to src/swahili/NumeralSwa.gf index 9cd45e2a..8e097ba0 100644 --- a/src/kiswahili/NumeralKis.gf +++ b/src/swahili/NumeralSwa.gf @@ -1,5 +1,5 @@ -concrete NumeralKis of Numeral = CatKis [Numeral,Digits] ** -open Prelude,DiffKis,MorphoKis in { +concrete NumeralSwa of Numeral = CatSwa [Numeral,Digits] ** +open Prelude,DiffSwa,MorphoSwa in { lincat Digit = {s : DForm => CardOrd => Gender => Str} ; diff --git a/src/kiswahili/ParadigmsKis.gf b/src/swahili/ParadigmsSwa.gf similarity index 96% rename from src/kiswahili/ParadigmsKis.gf rename to src/swahili/ParadigmsSwa.gf index bd1e894f..ce3a4f87 100644 --- a/src/kiswahili/ParadigmsKis.gf +++ b/src/swahili/ParadigmsSwa.gf @@ -1,11 +1,11 @@ --# -path=.:../abstract:../../prelude:../common -resource ParadigmsKis = open +resource ParadigmsSwa = open (Predef=Predef), Prelude, - MorphoKis, - ResKis, - CatKis + MorphoSwa, + ResSwa, + CatSwa in { oper @@ -199,9 +199,9 @@ mkInterj : Str -> Interj -- The definitions should not bother the user of the API. So they are -- hidden from the document. - Gender = MorphoKis.Gender ; - Number = MorphoKis.Number ; - Case = MorphoKis.NPCase ; + Gender = MorphoSwa.Gender ; + Number = MorphoSwa.Number ; + Case = MorphoSwa.NPCase ; a_wa = G1 ;--% u_i = G2 ; li_ya = G3 ; @@ -223,8 +223,8 @@ mkInterj : Str -> Interj npNumber np = (agrFeatures np.a).n ; - regN = MorphoKis.regN ; - iregN = MorphoKis.iregN ; + regN = MorphoSwa.regN ; + iregN = MorphoSwa.iregN ; compoundN s n = lin N {s = \\x,y => s ++ n.s ! x ! y ; g=n.g} ; @@ -370,9 +370,9 @@ mkN2 = overload { regN2 : N -> N2 ; - regA : Str -> A = \s -> lin A (MorphoKis.regA s) ; - cregA : Str -> A = \s -> lin A (MorphoKis.cregA s) ; - iregA : (fat,fatter : Str) -> A =\a,b -> lin A (MorphoKis.iregA a b); + regA : Str -> A = \s -> lin A (MorphoSwa.regA s) ; + cregA : Str -> A = \s -> lin A (MorphoSwa.cregA s) ; + iregA : (fat,fatter : Str) -> A =\a,b -> lin A (MorphoSwa.iregA a b); mkA = overload { mkA : Str -> A = \a -> lin A (regA a |cregA a); mkA : (fat,fatter : Str) -> A =\a,b -> lin A (iregA a b); @@ -388,7 +388,7 @@ mkN2 = overload { } ; - regV=MorphoKis.regV ; + regV=MorphoSwa.regV ; {- mkV = overload { mkV : Str -> V =\v ->lin V(regV v) ; diff --git a/src/swahili/PhraseSwa.gf b/src/swahili/PhraseSwa.gf new file mode 100644 index 00000000..62290c1e --- /dev/null +++ b/src/swahili/PhraseSwa.gf @@ -0,0 +1,3 @@ +concrete PhraseSwa of Phrase = CatSwa ** PhraseBantu with + (ResBantu = ResSwa); + diff --git a/src/swahili/QuestionSwa.gf b/src/swahili/QuestionSwa.gf new file mode 100644 index 00000000..970e6927 --- /dev/null +++ b/src/swahili/QuestionSwa.gf @@ -0,0 +1,2 @@ +concrete QuestionSwa of Question = CatSwa ** QuestionBantu with + (ResBantu = ResSwa); diff --git a/src/swahili/RelativeSwa.gf b/src/swahili/RelativeSwa.gf new file mode 100644 index 00000000..be3f10d7 --- /dev/null +++ b/src/swahili/RelativeSwa.gf @@ -0,0 +1,2 @@ +concrete RelativeSwa of Relative = CatSwa ** RelativeBantu with + (ResBantu = ResSwa); diff --git a/src/kiswahili/ResKis.gf b/src/swahili/ResSwa.gf similarity index 60% rename from src/kiswahili/ResKis.gf rename to src/swahili/ResSwa.gf index 94a50124..ea8a9930 100644 --- a/src/kiswahili/ResKis.gf +++ b/src/swahili/ResSwa.gf @@ -2,7 +2,7 @@ --1 Swalish auxiliary operations. -instance ResKis of ResBantu = DiffKis, CommonBantu ** open Prelude in { +instance ResSwa of ResBantu = DiffSwa, CommonBantu ** open Prelude in { } ; diff --git a/src/swahili/SentenceSwa.gf b/src/swahili/SentenceSwa.gf new file mode 100644 index 00000000..50c37082 --- /dev/null +++ b/src/swahili/SentenceSwa.gf @@ -0,0 +1,2 @@ +concrete SentenceSwa of Sentence = CatSwa ** SentenceBantu with + (ResBantu = ResSwa); diff --git a/src/kiswahili/StructuralKis.gf b/src/swahili/StructuralSwa.gf similarity index 95% rename from src/kiswahili/StructuralKis.gf rename to src/swahili/StructuralSwa.gf index 2967c2fc..bc3b6d67 100644 --- a/src/kiswahili/StructuralKis.gf +++ b/src/swahili/StructuralSwa.gf @@ -1,5 +1,5 @@ -concrete StructuralKis of Structural = CatKis ** - open MorphoKis, ParadigmsKis, +concrete StructuralSwa of Structural = CatSwa ** + open MorphoSwa, ParadigmsSwa, (C = ConstructX), Prelude in { flags optimize=all ; lin @@ -50,7 +50,7 @@ concrete StructuralKis of Structural = CatKis ** n= Pl } ; more_Adv = mkAdv "zaidi" ; - most_Predet = {s = \\g => MorphoKis.Mostpredetprefix g + "ngi"} ; + most_Predet = {s = \\g => MorphoSwa.Mostpredetprefix g + "ngi"} ; -- must_VV = { ---b no_Phr = ss "no" ; no_Utt = ss "hapana" ; @@ -61,7 +61,7 @@ concrete StructuralKis of Structural = CatKis ** otherwise_PConj = ss "ila" ; please_Voc = ss "tafadhari" ; part_Prep, possess_Prep = let - questo : ParadigmsKis.Number => MorphoKis.Gender => Str = table { + questo : ParadigmsSwa.Number => MorphoSwa.Gender => Str = table { Sg => \\g=> case of { => "la" ; => "cha" ; => "ya" ; @@ -94,7 +94,7 @@ concrete StructuralKis of Structural = CatKis ** something_NP = regNP "kitu fulani" ki_vi singular ; somewhere_Adv = mkAdv "seheme fulani" ; that_Quant = let - questo : ParadigmsKis.Number => MorphoKis.Gender => Str = table { + questo : ParadigmsSwa.Number => MorphoSwa.Gender => Str = table { Sg => \\g=> case of { => "huyo" ; => "huo"; @@ -134,7 +134,7 @@ concrete StructuralKis of Structural = CatKis ** therefore_PConj = ss "kwa ajili" ; they_Pron =mkPron "wao" "ao" G1 Pl P3 ; this_Quant = let - questo : ParadigmsKis.Number => MorphoKis.Gender => Str = table { + questo : ParadigmsSwa.Number => MorphoSwa.Gender => Str = table { Sg => \\g=> case of { => "huyu" ; => "hapa" ; diff --git a/src/swahili/VerbSwa.gf b/src/swahili/VerbSwa.gf new file mode 100644 index 00000000..4572be6c --- /dev/null +++ b/src/swahili/VerbSwa.gf @@ -0,0 +1,2 @@ +concrete VerbSwa of Verb = CatSwa ** VerbBantu with + (ResBantu = ResSwa);