From d077965a6b8fc17f6edba20457509fc92d0b2a80 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Tue, 27 Aug 2019 16:00:14 +0200 Subject: [PATCH] (Som) Fix Preps formed from nouns with possessives --- src/somali/AdverbSom.gf | 19 +++++++------------ src/somali/CatSom.gf | 7 ++++--- src/somali/LexiconSom.gf | 6 +++--- src/somali/ParadigmsSom.gf | 16 ++++++++-------- src/somali/ResSom.gf | 23 +++++++++++++---------- src/somali/StructuralSom.gf | 4 +++- src/somali/unittest/vp.gftest | 11 ++++++++++- 7 files changed, 48 insertions(+), 38 deletions(-) diff --git a/src/somali/AdverbSom.gf b/src/somali/AdverbSom.gf index 53d18f6dc..6dc9f5954 100644 --- a/src/somali/AdverbSom.gf +++ b/src/somali/AdverbSom.gf @@ -12,21 +12,16 @@ lin -- : Prep -> NP -> Adv ; PrepNP prep np = prep ** { - s = [] ; - np = case prep.c2 of { -- isPoss of { - NoPrep => nplite emptyNP ; -- TODO check - _ => nplite np } ; +-- s = [] ; - dhex = case prep.c2 of { - NoPrep => [] ; - _ => prep.dhex ! Sg3 Masc } ; + np = case prep.isPoss of { + True => nplite emptyNP ; + False => nplite np } ; - miscAdv = case prep.c2 of { - NoPrep => np.s ! Abs ++ prep.dhex ! np.a ; - _ => [] } + miscAdv = case prep.isPoss of { + True => np.s ! Abs ++ prep.miscAdv ! np.a ; + False => prep.miscAdv ! Sg3 Masc } } ; - --ResSom.Prep ** {c2 : Preposition ; berri, sii, dhex : Str} ; - -- Adverbs can be modified by 'adadjectives', just like adjectives. diff --git a/src/somali/CatSom.gf b/src/somali/CatSom.gf index 2e6d6550f..a9d30a23e 100644 --- a/src/somali/CatSom.gf +++ b/src/somali/CatSom.gf @@ -85,9 +85,10 @@ concrete CatSom of Cat = CommonX - [Adv] ** open ResSom, Prelude in { Conj = {s2 : State => Str ; s1 : Str ; n : Number } ; Subj = SS ; Prep = ResSom.Prep ** { + isPoss : Bool ; c2 : Preposition ; - berri, sii, miscAdv : Str ; - dhex : Agreement => Str } ; + berri, sii, dhex : Str ; + miscAdv : Agreement => Str } ; @@ -124,6 +125,6 @@ linref -- Cl = linCl ; VP = linVP VInf ; CN = linCN ; - Prep = \prep -> prep.s ! P3_Prep ++ prep.sii ++ prep.dhex ! Sg3 Masc ; + Prep = \prep -> prep.s ! P3_Prep ++ prep.sii ++ prep.dhex ++ prep.miscAdv ! Sg3 Masc ; S = \s -> linBaseCl (s.s ! False) ; } diff --git a/src/somali/LexiconSom.gf b/src/somali/LexiconSom.gf index 197b4ab47..0681a24cb 100644 --- a/src/somali/LexiconSom.gf +++ b/src/somali/LexiconSom.gf @@ -63,7 +63,7 @@ lin car_N = mkN "baabuur" masc ; -- lin carpet_N = mkN "" ; lin cat_N = mkN "bisad" ; -- lin ceiling_N = mkN "" ; --- lin chair_N = mkN "" ; +lin chair_N = mkN "kursi" ; -- lin cheese_N = mkN "" ; -- lin child_N = mkN "" ; -- lin church_N = mkN "" ; @@ -211,7 +211,7 @@ lin language_N = mkN "af" ; -- lin lie_V = mkV "" ; -- lin like_V2 = mkV2 "" ; -- lin listen_V2 = mkV2 "" ; --- lin live_V = mkV "" ; +lin live_V = copula ** {sii = "nool"} ; -- lin liver_N = mkN "" ; -- lin long_A = mkA "" ; -- lin lose_V2 = mkV2 "" ; @@ -304,7 +304,7 @@ lin salt_N = mkN "cusbo" ; -- lin school_N = mkN "" ; -- lin science_N = mkN "" ; -- lin scratch_V2 = mkV2 "" ; --- lin sea_N = mkN "" ; +lin sea_N = mkN "bad" fem ; lin see_V2 = mkV2 "ark" ; -- lin seed_N = mkN "" ; -- lin seek_V2 = mkV2 "" ; diff --git a/src/somali/ParadigmsSom.gf b/src/somali/ParadigmsSom.gf index 0f6f0f984..bb7891e57 100644 --- a/src/somali/ParadigmsSom.gf +++ b/src/somali/ParadigmsSom.gf @@ -105,14 +105,12 @@ oper mkPrep = overload { mkPrep : Str -> CatSom.Prep = \s -> emptyPrep ** (ResSom.mkPrep s s s s s s) ; -- ** { --- c2=noPrep ; sii,berri=[] ; dhex = \\_=> [] ; isPoss=False}) ; mkPrep : (x1,_,_,_,_,x6 : Str) -> CatSom.Prep = \a,b,c,d,e,f -> emptyPrep ** (ResSom.mkPrep a b c d e f) ; -- --- c2=noPrep ; sii,berri=[] ; dhex = \\_=> [] ; isPoss=False}) ; mkPrep : Preposition -> CatSom.Prep = \p -> - emptyPrep ** (prep p) ; -- ** {sii,berri=[] ; dhex = \\_=> [] ; isPoss=False}) ; + emptyPrep ** (prep p) ; mkPrep : CatSom.Prep -> (x1,x2,x3 : Str) -> CatSom.Prep = \p,s,t,u -> - p ** {berri = s ; sii = t ; dhex = \\_ => u} ; + p ** {berri = s ; sii = t ; dhex = u} ; } ; possPrep : N -> CatSom.Prep ; -- Nouns like dhex that are used with possessive suffix to form adverbials @@ -220,19 +218,21 @@ oper } ; possPrep : N -> CatSom.Prep = \dhex -> emptyPrep ** { - dhex = \\agr => + miscAdv = \\agr => let qnt = PossPron (pronTable ! agr) ; num = getNum agr ; art = gda2da dhex.gda ! Sg ; det = qnt.s ! art ! Abs ; -- this includes BIND - in dhex.s ! Def Sg ++ det + in dhex.s ! Def Sg ++ det ; + isPoss = True } ; emptyPrep : CatSom.Prep = lin Prep { - sii,berri,miscAdv = [] ; - dhex = \\_ => [] ; + sii,berri,dhex = [] ; + miscAdv = \\_ => [] ; s = \\_ => [] ; c2 = noPrep ; + isPoss = False } ; -------------------------------------------------------------------------------- diff --git a/src/somali/ResSom.gf b/src/somali/ResSom.gf index 255b911f7..5c0251469 100644 --- a/src/somali/ResSom.gf +++ b/src/somali/ResSom.gf @@ -247,7 +247,7 @@ oper s = \\_ => [] ; -- the string `la' comes from Passive (: PrepCombination) a = Impers ; isPron = True ; sp = \\_ => "" ; empty = [] ; st = Definite ; - poss = {s, short = quantTable "??" ; sp = gnTable "??" "??" "??"} + poss = {s, short = quantTable "iis" ; sp = gnTable "iis" "iis" "uwiis"} } } ; @@ -467,10 +467,11 @@ oper Verb : Type = BaseVerb ** { sii : Str ; -- closed class of particles: sii, soo, kala, wada (Saeed 171) dhex : Str ; -- closed class of adverbials: hoos, kor, dul, dhex, … + isCopula : Bool ; } ; Verb2 : Type = Verb ** {c2 : Preposition} ; Verb3 : Type = Verb2 ** {c3 : Preposition} ; - + VerbS : Type = Verb ; -- TODO: VPs that have VS use waxa as stm? see Nilsson p. 68 -- Saeed page 79: -- "… the reference form is the imperative singular form @@ -566,6 +567,7 @@ oper } ; sii, dhex = [] ; + isCopula = False ; } ; ------------------------- @@ -637,7 +639,8 @@ oper VImp Pl pol => if_then_Pol pol "ahaada" "ahaanina" ; VPres _ _ _ => nonExist -- use presCopula instead } ; - sii, dhex = [] + sii, dhex = [] ; + isCopula = True } ; have_V : Verb = @@ -697,7 +700,7 @@ oper useV : Verb -> VerbPhrase = \v -> v ** { comp = \\_ => <[],[]> ; - pred = NoPred ; + pred = case v.isCopula of {True => Copula ; _ => NoPred} ; vComp,berri,miscAdv,refl = [] ; c2 = Single NoPrep ; obj2 = {s = [] ; a = P3_Prep} ; @@ -840,10 +843,10 @@ oper _ => stmarkerNoContr ! subj.a ! p }} ; in (wordOrder subjnoun subjpron stm obj pred vp) ; } where { - vp = case isPassive vps of { + vp : VerbPhrase = case isPassive vps of { True => complSlash (insertComp vps np) ; _ => complSlash vps } ; - subj = case isPassive vps of {True => impersNP ; _ => np} + subj : NounPhrase = case isPassive vps of {True => impersNP ; _ => np} } ; wordOrder : (sn,sp : Str) -> (stm,obj : {p1,p2 : Str}) -> {fin,inf : Str} -> VerbPhrase -> BaseCl = @@ -863,7 +866,7 @@ oper ++ vp.miscAdv } ; ---- NB. Only used if there are several adverbs. ---- Primary places for adverbs are obj, sii or dhex. - VFun : Type = Tense -> Anteriority -> Polarity -> Agreement -> Verb + VFun : Type = Tense -> Anteriority -> Polarity -> Agreement -> BaseVerb -> {fin : Str ; inf : Str} ; vf : ClType -> VFun = \clt -> case clt of { @@ -882,13 +885,13 @@ oper } where { agrPol : {agr:Agreement ; pol:Polarity} = {agr=agr; pol=p} ; - pastV : Verb -> Str = \v -> + pastV : BaseVerb -> Str = \v -> case p of { Neg => v.s ! VNegPast Simple ; Pos => v.s ! VPast Simple (agr2vagr agr) } ; - presV : Verb -> Str = \v -> v.s ! VPres Simple (agr2vagr agr) p ; + presV : BaseVerb -> Str = \v -> v.s ! VPres Simple (agr2vagr agr) p ; - condNegV : Verb -> Str = \v -> case agr of { + condNegV : BaseVerb -> Str = \v -> case agr of { Sg2|Sg3 Fem |Pl2 => v.s ! VNegCond SgFem ; Pl1 _ => v.s ! VNegCond PlInv ; diff --git a/src/somali/StructuralSom.gf b/src/somali/StructuralSom.gf index b71aca044..62f295036 100644 --- a/src/somali/StructuralSom.gf +++ b/src/somali/StructuralSom.gf @@ -127,7 +127,9 @@ lin on_Prep = mkPrep ku ; -- lin possess_Prep = mkPrep ; -- lin through_Prep = mkPrep ; -- lin to_Prep = mkPrep ; -lin under_Prep = possPrep (nUl "hoos") ; +lin under_Prep = + let hoos : CatSom.Prep = possPrep (nUl "hoos") + in hoos ** {c2 = Ku} ; lin with_Prep = mkPrep la ; -- lin without_Prep = mkPrep ; diff --git a/src/somali/unittest/vp.gftest b/src/somali/unittest/vp.gftest index fb69b2865..d766f8e3e 100644 --- a/src/somali/unittest/vp.gftest +++ b/src/somali/unittest/vp.gftest @@ -80,4 +80,13 @@ Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron i_P -- LangEng: I am taught in front of my mother LangSom: waa laygu baraa hooya BIND day hor BIND teed BIND a -Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron i_Pron) (AdvVP (PassV2 teach_V2) (PrepNP in8front_Prep (DetCN (DetQuant (PossPron i_Pron) NumSg) (UseN2 mother_N2))))))) NoVoc \ No newline at end of file +Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron i_Pron) (AdvVP (PassV2 teach_V2) (PrepNP in8front_Prep (DetCN (DetQuant (PossPron i_Pron) NumSg) (UseN2 mother_N2))))))) NoVoc + +-- LangEng: I see a cat under the chair +LangSom: bisad waa aan ku arkaa kursi BIND ga hoos BIND tiis BIND a +Lang: PhrUtt NoPConj (UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron i_Pron) (AdvVP (ComplSlash (SlashV2a see_V2) (DetCN (DetQuant IndefArt NumSg) (UseN cat_N))) (PrepNP under_Prep (DetCN (DetQuant DefArt NumSg) (UseN chair_N))))))) NoVoc + +-- 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 +