diff --git a/src/somali/ParadigmsSom.gf b/src/somali/ParadigmsSom.gf index 42cefc869..68ae50476 100644 --- a/src/somali/ParadigmsSom.gf +++ b/src/somali/ParadigmsSom.gf @@ -247,7 +247,7 @@ oper } ; possPrep : N -> CatSom.Prep = \dhex -> emptyPrep ** { - miscAdv = \\agr => + hoostiisa = \\agr => let qnt = PossPron (pronTable ! agr) ; num = getNum agr ; art = gda2da dhex.gda ! Sg ; @@ -258,7 +258,7 @@ oper emptyPrep : CatSom.Prep = lin Prep { sii,berri,dhex = [] ; - miscAdv = \\_ => [] ; + hoostiisa = \\_ => [] ; s = \\_ => [] ; c2 = noPrep ; isPoss = False diff --git a/src/somali/ResSom.gf b/src/somali/ResSom.gf index 5a557182d..bf1c1f515 100644 --- a/src/somali/ResSom.gf +++ b/src/somali/ResSom.gf @@ -351,7 +351,7 @@ oper c2 : Preposition ; isPoss : Bool ; berri, sii, dhex : Str ; - miscAdv : Agreement => Str } ; + hoostiisa : Agreement => Str } ; mkPrep : (x1,_,_,_,_,x6 : Str) -> {s : PrepAgr => Str} = \ku,ii,kuu,noo,idiin,isku -> { s = table { @@ -702,8 +702,8 @@ oper True => nplite emptyNP ; False => nplite np } ; miscAdv = case prep.isPoss of { - True => np.s ! Abs ++ prep.miscAdv ! np.a ; - False => prep.miscAdv ! Sg3 Masc } + True => np.s ! Abs ++ prep.hoostiisa ! np.a ; + False => prep.hoostiisa ! Sg3 Masc } } ; ------------------ diff --git a/src/somali/VerbSom.gf b/src/somali/VerbSom.gf index 6ccc5cbf8..3208febc2 100644 --- a/src/somali/VerbSom.gf +++ b/src/somali/VerbSom.gf @@ -18,14 +18,14 @@ lin ComplVV vv vp = let vc = vp.vComp in case vv.vvtype of { Waa_In => vp ** { vComp = vc ** {subjunc = vv.s ! VInf} ; -- it's always the word "in", and it will be placed before subject pronoun. it's placed in vv.s!VInf so that the VV would contribute with some string. /IL - obj2 = vp.obj2 ** {s = []} ; -- word order hack to avoid more parameters: + obj2 = vp.obj2 ** {s = []} ; -- word order hack to avoid more parameters: miscAdv = vp.miscAdv ++ vp.obj2.s -- dump the object to miscAdv } ; Subjunctive => useV vv ** { stm = Waxa ; vComp = vc ** { -- The whole previous VP becomes the subordinate clause - subcl = \\agr => + subcl = \\agr => let subj = pronTable ! agr ; cls = predVPslash subj vp ; scl = cl2sentence True cls ; @@ -39,11 +39,11 @@ lin inf = vc.inf ++ vp.s ! VInf } ; stm = Waa NoPred ; - } + } } ; -- : VS -> S -> VP ; - ComplVS vs s = + ComplVS vs s = let vps = useV vs ; subord = SubjS {s="in"} s ; in vps ** {obj2 = {s = subord.berri ; a = P3_Prep}} ;