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

(Som) Bugfix in ComplVV + new test + small cleanup

Browse Source
This commit is contained in:
Inari Listenmaa
2019-08-29 22:34:50 +02:00
parent 4f8f4a6c86
commit 7a2d4d2cfa
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/somali/VerbSom.gf
View File

@@ -22,17 +22,15 @@ lin
miscAdv = vp.miscAdv ++ vp.obj2.s -- dump the object to miscAdv miscAdv = vp.miscAdv ++ vp.obj2.s -- dump the object to miscAdv
} ; } ;
Subjunctive => vp ** { Subjunctive => useV vv ** {
s = vv.s ; -- check Saeed p. 169
stm = Waxa ; stm = Waxa ;
vComp = vc ** { vComp = vc ** { -- The whole previous VP becomes the subordinate clause
subcl = \\agr => subcl = \\agr =>
let subj = pronTable ! agr ; let subj = pronTable ! agr ;
cls = predVPSlash subj vp ; cls = predVPSlash subj vp ;
rcl = mergeRCl (cls.s ! True) ; rcl = mergeRCl (cls.s ! True) ;
in "in" ++ rcl.s ! Pres ! Simul ! Pos in "in" ++ rcl.s ! Pres ! Simul ! Pos
} ; -- TODO check }
obj2 = vp.obj2 ** {s = []} ; -- dump the object to vComp.subcl
} ; } ;
Infinitive => vp ** { Infinitive => vp ** {
@@ -41,7 +39,6 @@ lin
inf = vc.inf ++ vp.s ! VInf inf = vc.inf ++ vp.s ! VInf
} ; } ;
stm = Waa NoPred ; stm = Waa NoPred ;
-- pred = NoPred ;
} }
} ; } ;
@@ -144,28 +141,24 @@ lin
CompAP ap = { CompAP ap = {
comp = \\a => <[], ap.s ! AF (getNum a) Abs> ; comp = \\a => <[], ap.s ! AF (getNum a) Abs> ;
stm = Waa Copula ; stm = Waa Copula ;
-- pred = Copula ;
} ; } ;
-- : CN -> Comp ; -- : CN -> Comp ;
CompCN cn = { CompCN cn = {
comp = \\a => <[], cn2str Sg Abs cn> ; comp = \\a => <[], cn2str Sg Abs cn> ;
stm = Waa NoCopula ; stm = Waa NoCopula ;
-- pred = NoCopula ;
} ; } ;
-- NP -> Comp ; -- NP -> Comp ;
CompNP np = { CompNP np = {
comp = \\a => <[], np.s ! Abs> ; comp = \\a => <[], np.s ! Abs> ;
stm = Waa NoCopula ; stm = Waa NoCopula ;
-- pred = NoCopula ;
} ; } ;
-- : Adv -> Comp ; -- : Adv -> Comp ;
CompAdv adv = { CompAdv adv = {
comp = \\a => <[], linAdv adv> ; comp = \\a => <[], linAdv adv> ;
stm = Waa Copula ; stm = Waa Copula ;
-- pred = Copula ;
} ; } ;
-- : VP -- Copula alone; -- : VP -- Copula alone;

3
src/somali/unittest/vp.gftest
View File

@@ -86,6 +86,9 @@ Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron i_P
LangSom: ma rabo in aan buug BIND ga akhriyo LangSom: ma rabo in aan buug BIND ga akhriyo
Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PNeg (PredVP (UsePron i_Pron) (ComplVV want_VV (ComplSlash (SlashV2a read_V2) (DetCN (DetQuant DefArt NumSg) (UseN book_N))))))) NoVoc Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PNeg (PredVP (UsePron i_Pron) (ComplVV want_VV (ComplSlash (SlashV2a read_V2) (DetCN (DetQuant DefArt NumSg) (UseN book_N))))))) NoVoc
-- LangEng: you want to see us under the chair
LangSom: waxa aad rabtaa in aad inagu aragto kursi BIND ga hoos BIND tiis BIND a
Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron youSg_Pron) (ComplVV want_VV (AdvVP (ComplSlash (SlashV2a see_V2) (UsePron we_Pron)) (PrepNP under_Prep (DetCN (DetQuant DefArt NumSg) (UseN chair_N)))))))) NoVoc
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-- Adverbials -- Adverbials