(Swa) Rename Kiswahili to Swahili

src/kiswahili/CatKis.gf

@@ -1,2 +0,0 @@
-concrete CatKis of Cat = CommonX - [Pol] 
-  ** CatBantu with (ResBantu = ResKis);  

src/kiswahili/ConjunctionKis.gf

@@ -1,2 +0,0 @@
-concrete ConjunctionKis of Conjunction = CatKis ** ConjunctionBantu with
- (ResBantu = ResKis);  

src/kiswahili/GrammarKis.gf

@@ -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 };
-} ;

src/kiswahili/LangKis.gf

@@ -1,8 +0,0 @@
---# -path=.:../abstract:../common:../api
-
-concrete LangKis of Lang = 
-  GrammarKis,
-  LexiconKis
---  ,ConstructionSwa
-    ** {
-} ;

src/kiswahili/NounKis.gf

@@ -1,2 +0,0 @@
-concrete NounKis of Noun = 
-  CatKis ** NounBantu with (Structural = StructuralKis), (ResBantu = ResKis);  

src/kiswahili/PhraseKis.gf

@@ -1,3 +0,0 @@
-concrete PhraseKis of Phrase = CatKis ** PhraseBantu with
- (ResBantu = ResKis);  
-  

src/kiswahili/QuestionKis.gf

@@ -1,2 +0,0 @@
-concrete QuestionKis of Question = CatKis ** QuestionBantu with
- (ResBantu = ResKis);  

src/kiswahili/RelativeKis.gf

@@ -1,2 +0,0 @@
-concrete RelativeKis of Relative = CatKis ** RelativeBantu with
- (ResBantu = ResKis);  

src/kiswahili/SentenceKis.gf

@@ -1,3 +0,0 @@
-concrete SentenceKis of Sentence = CatKis ** SentenceBantu with
- (ResBantu = ResKis);  
-

src/kiswahili/VerbKis.gf

@@ -1,2 +0,0 @@
-concrete VerbKis of Verb = CatKis ** VerbBantu with
- (ResBantu = ResKis);  

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
       } ;
-    }
+    }

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
       } ;
-    }
+    }

src/swahili/CatSwa.gf

@@ -0,0 +1,2 @@
+concrete CatSwa of Cat = CommonX
+  ** CatBantu with (ResBantu = ResSwa);

src/swahili/ConjunctionSwa.gf

@@ -0,0 +1,2 @@
+concrete ConjunctionSwa of Conjunction = CatSwa ** ConjunctionBantu with
+ (ResBantu = ResSwa);  

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" ;

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 ;
+} ;

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 ;
 {-

src/swahili/LangSwa.gf

@@ -0,0 +1,8 @@
+--# -path=.:../abstract:../bantu:../common:../api
+
+concrete LangSwa of Lang =
+  GrammarSwa,
+  LexiconSwa
+--  ,ConstructionSwa
+    ** {
+} ;

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 ;

src/swahili/MorphoSwa.gf

@@ -5,7 +5,7 @@
 -- Benson Kituku 2017-2018
 
 
-resource MorphoKis = CommonBantu ,ResKis 
+resource MorphoSwa = CommonBantu ,ResSwa 
 ** open Prelude, Predef 
 in {
 

src/swahili/NounSwa.gf

@@ -0,0 +1,2 @@
+concrete NounSwa of Noun = 
+  CatSwa ** NounBantu with (Structural = StructuralSwa), (ResBantu = ResSwa);  

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} ;

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) ;

src/swahili/PhraseSwa.gf

@@ -0,0 +1,3 @@
+concrete PhraseSwa of Phrase = CatSwa ** PhraseBantu with
+ (ResBantu = ResSwa);  
+  

src/swahili/QuestionSwa.gf

@@ -0,0 +1,2 @@
+concrete QuestionSwa of Question = CatSwa ** QuestionBantu with
+ (ResBantu = ResSwa);  

src/swahili/RelativeSwa.gf

@@ -0,0 +1,2 @@
+concrete RelativeSwa of Relative = CatSwa ** RelativeBantu with
+ (ResBantu = ResSwa);  

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 {
 
 } ;
  

src/swahili/SentenceSwa.gf

@@ -0,0 +1,2 @@
+concrete SentenceSwa of Sentence = CatSwa ** SentenceBantu with
+ (ResBantu = ResSwa);

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 <g> of {    <G3> => "la" ; 
                                  <G4> => "cha" ; 
                                  <G5> => "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 <g> of {
                     <G1> => "huyo" ;
                     <G2 > => "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 <g> of {
                     <G1> => "huyu" ;
                     <G11> => "hapa" ;

src/swahili/VerbSwa.gf

@@ -0,0 +1,2 @@
+concrete VerbSwa of Verb = CatSwa ** VerbBantu with
+ (ResBantu = ResSwa);