From 1ceb12d8b838ed2a2e2abf3e10e634217a796318 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Tue, 10 Sep 2019 15:04:50 +0200 Subject: [PATCH] (Som) Change word order in VP complements, update test accordingly --- src/somali/ResSom.gf | 4 ++-- src/somali/unittest/vp.gftest | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/somali/ResSom.gf b/src/somali/ResSom.gf index 20a3e4227..5a557182d 100644 --- a/src/somali/ResSom.gf +++ b/src/somali/ResSom.gf @@ -794,14 +794,14 @@ oper -- We keep both old and new string (=noun, if there was one) in obj2.s. P3_Prep => vp ** {obj2 = nplite ** { - s = vp.obj2.s ++ nplite.s} + s = nplite.s ++ vp.obj2.s} } ; -- no secObj, because there's ≤1 non-3rd-person pronoun. -- If old object was non-3rd person, we keep its agreement. -- The new object is put in the secondObject field. _ => vp ** {obj2 = vp.obj2 ** { - s = vp.obj2.s ++ nplite.s + s = nplite.s ++ vp.obj2.s } ; secObj = vp.secObj ++ secondObject ! nplite.a} } ; diff --git a/src/somali/unittest/vp.gftest b/src/somali/unittest/vp.gftest index 4a29b6725..58cd6f9bf 100644 --- a/src/somali/unittest/vp.gftest +++ b/src/somali/unittest/vp.gftest @@ -56,11 +56,11 @@ LangSom: rooti waa uu is siiyey Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPast ASimul) PPos (PredVP (UsePron he_Pron) (ReflVP (Slash2V3 give_V3 (MassNP (UseN bread_N))))))) NoVoc -- LangEng: one adds salt to the meat -LangSom: hilib BIND ka cusbo waa lagu daraa +LangSom: cusbo hilib BIND ka waa lagu daraa Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (GenericCl (ComplSlash (Slash3V3 add_V3 (DetCN (DetQuant DefArt NumSg) (UseN meat_N))) (MassNP (UseN salt_N)))))) NoVoc -- LangEng: one can add salt to meat -LangSom: hilib cusbo waa lagu dari karaa +LangSom: cusbo hilib waa lagu dari karaa Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (GenericCl (ComplVV can_VV (ComplSlash (Slash3V3 add_V3 (MassNP (UseN meat_N))) (MassNP (UseN salt_N))))))) NoVoc -------------------------------------------------------------------------------- @@ -116,4 +116,3 @@ Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron i_P -- LangEng: my mother lives under the sea LangSom: hooya BIND day waa ku nool tahay bad BIND da hoos BIND teed BIND a Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (DetCN (DetQuant (PossPron i_Pron) NumSg) (UseN2 mother_N2)) (AdvVP (UseV live_V) (PrepNP under_Prep (DetCN (DetQuant DefArt NumSg) (UseN sea_N))))))) NoVoc -