msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

(Bantu) Minor fixes to make Swahili compile

Browse Source
This commit is contained in:
Inari Listenmaa
2020-06-05 21:19:14 +02:00
parent ee9b5354e7
commit 0f67332f31
4 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bantu/CatBantu.gf
View File

@@ -1,5 +1,5 @@
incomplete concrete CatBantu of Cat = incomplete concrete CatBantu of Cat =
CommonX - [Pol] CommonX
** open ResBantu, Prelude, ParamX in { ** open ResBantu, Prelude, ParamX in {
flags optimize=all_subs ; flags optimize=all_subs ;
@@ -7,8 +7,6 @@ incomplete concrete CatBantu of Cat =
lincat lincat
Pol = {s : Str ; b : Bool} ;
S = {s : Str} ; S = {s : Str} ;
QS = {s : QForm => Str} ; QS = {s : QForm => Str} ;
RS = {s : Agr => Str ; c : NPCase} ; -- c for it clefts RS = {s : Agr => Str ; c : NPCase} ; -- c for it clefts
@@ -16,7 +14,7 @@ incomplete concrete CatBantu of Cat =
-- Sentence -- Sentence
-- Cl = {s : Tense => Anteriority => Bool => Str} ; Cl = {s : Tense => Anteriority => Bool => Str} ;
-- ClSlash = { -- ClSlash = {
-- s : ResKam.Tense => Anteriority => Bool => Str ; -- s : ResKam.Tense => Anteriority => Bool => Str ;
-- } ; -- } ;

12
src/bantu/ResBantu.gf
View File

@@ -11,6 +11,7 @@ flags
oper oper
npNom : NPCase = NCase Nom ; npNom : NPCase = NCase Nom ;
npLoc : NPCase = NCase Loc ; npLoc : NPCase = NCase Loc ;
NPAcc : NPCase = NCase Nom ; -- Added this so that swahili compiles. /IL2020
npcase2case : NPCase -> Case = \nc -> case nc of {NCase c => c ; _ => Nom} ; npcase2case : NPCase -> Case = \nc -> case nc of {NCase c => c ; _ => Nom} ;
@@ -81,14 +82,3 @@ oper
finalComma : Str = pre {"," | "." => []; "" => SOFT_BIND ++ ","; _ => []} ; finalComma : Str = pre {"," | "." => []; "" => SOFT_BIND ++ ","; _ => []} ;
frontComma : Str = SOFT_BIND ++ "," ; frontComma : Str = SOFT_BIND ++ "," ;
} }
-- insertObject:
-- p -cat=Cl -tr "la femme te l' envoie"
-- PredVP (DetCN (DetSg DefSg NoOrd) (UseN woman_N))
-- (ComplV3 send_V3 (UsePron he_Pron) (UsePron thou_Pron))
-- la femme te l' a envoyé
--
-- p -cat=Cl -tr "la femme te lui envoie"
-- PredVP (DetCN (DetSg DefSg NoOrd) (UseN woman_N))
-- (ComplV3 send_V3 (UsePron thou_Pron) (UsePron he_Pron))
-- la femme te lui a envoyée

17
src/bantu/SentenceBantu.gf
View File

@@ -1,14 +1,10 @@
incomplete concrete SentenceBantu of Sentence = incomplete concrete SentenceBantu of Sentence =
CatBantu ** open Prelude, CommonBantu, ResBantu in { CatBantu ** open Prelude, CommonBantu, ResBantu in {
{-
flags optimize=all_subs ;
coding=utf8 ;
lin lin
PredVP np vp = mkClause (np.s ! npNom) (agrFeatures np.a) vp ;
PredVP np vp = mkClause (np.s ! npNom) np.a vp ; {-
PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ; PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ;
ImpVP vp = { ImpVP vp = {
@@ -43,11 +39,12 @@ incomplete concrete SentenceBantu of Sentence =
EmbedS s = {s = conjThat ++ s.s} ; EmbedS s = {s = conjThat ++ s.s} ;
EmbedQS qs = {s = qs.s ! QIndir} ; EmbedQS qs = {s = qs.s ! QIndir} ;
EmbedVP vp = {s = infVP VVInf vp Simul CPos (agrP3 Sg)} ; --- agr EmbedVP vp = {s = infVP VVInf vp Simul CPos (agrP3 Sg)} ; --- agr
UseCl t p cl = { -}
s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.b } ; UseCl t p cl =
let b : Bool = case p.p of {Pos => True ; _ => False}
in {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! b} ;
-- UseCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! p.b} ; {- UseQCl t p cl = {
UseQCl t p cl = {
s = \\q => t.s ++ p.s ++ cl.s ! t.t ! t.a ! ctr p.p ! q s = \\q => t.s ++ p.s ++ cl.s ! t.t ! t.a ! ctr p.p ! q
} ; } ;
UseRCl t p cl = { UseRCl t p cl = {

4
src/bantu/VerbBantu.gf
View File

@@ -1,11 +1,9 @@
incomplete concrete VerbBantu of Verb = incomplete concrete VerbBantu of Verb =
CatBantu ** open Prelude, CommonBantu, ResBantu in { CatBantu ** open Prelude, CommonBantu, ResBantu in {
{-
flags optimize=all_subs ;
lin lin
UseV = predV ; UseV = predV ;
{-
SlashV2a v = predV v ** {c2 = v.c2 ; gapInMiddle = False} ; SlashV2a v = predV v ** {c2 = v.c2 ; gapInMiddle = False} ;
Slash2V3 v np = Slash2V3 v np =
insertObjc (\\_ => v.c2 ++ np.s ! NPAcc) (predV v ** {c2 = v.c3 ; gapInMiddle = False}) ; insertObjc (\\_ => v.c2 ++ np.s ! NPAcc) (predV v ** {c2 = v.c3 ; gapInMiddle = False}) ;