GitHub/gf-rgl
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-rgl.git synced 2026-05-27 17:08:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

(Som) minor cleanup/renaming

Browse Source
This commit is contained in:
Inari Listenmaa
2019-09-10 15:03:59 +02:00
parent 1ceb12d8b8
commit 4f9927d12b
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/somali/ParadigmsSom.gf
View File

@@ -247,7 +247,7 @@ oper
} ; } ;
possPrep : N -> CatSom.Prep = \dhex -> emptyPrep ** { possPrep : N -> CatSom.Prep = \dhex -> emptyPrep ** {
miscAdv = \\agr => hoostiisa = \\agr =>
let qnt = PossPron (pronTable ! agr) ; let qnt = PossPron (pronTable ! agr) ;
num = getNum agr ; num = getNum agr ;
art = gda2da dhex.gda ! Sg ; art = gda2da dhex.gda ! Sg ;
@@ -258,7 +258,7 @@ oper
emptyPrep : CatSom.Prep = lin Prep { emptyPrep : CatSom.Prep = lin Prep {
sii,berri,dhex = [] ; sii,berri,dhex = [] ;
miscAdv = \\_ => [] ; hoostiisa = \\_ => [] ;
s = \\_ => [] ; s = \\_ => [] ;
c2 = noPrep ; c2 = noPrep ;
isPoss = False isPoss = False

6
src/somali/ResSom.gf
View File

@@ -351,7 +351,7 @@ oper
c2 : Preposition ; c2 : Preposition ;
isPoss : Bool ; isPoss : Bool ;
berri, sii, dhex : Str ; berri, sii, dhex : Str ;
miscAdv : Agreement => Str } ; hoostiisa : Agreement => Str } ;
mkPrep : (x1,_,_,_,_,x6 : Str) -> {s : PrepAgr => Str} = \ku,ii,kuu,noo,idiin,isku -> { mkPrep : (x1,_,_,_,_,x6 : Str) -> {s : PrepAgr => Str} = \ku,ii,kuu,noo,idiin,isku -> {
s = table { s = table {
@@ -702,8 +702,8 @@ oper
True => nplite emptyNP ; True => nplite emptyNP ;
False => nplite np } ; False => nplite np } ;
miscAdv = case prep.isPoss of { miscAdv = case prep.isPoss of {
True => np.s ! Abs ++ prep.miscAdv ! np.a ; True => np.s ! Abs ++ prep.hoostiisa ! np.a ;
False => prep.miscAdv ! Sg3 Masc } False => prep.hoostiisa ! Sg3 Masc }
} ; } ;
------------------ ------------------

8
src/somali/VerbSom.gf
View File

@@ -18,14 +18,14 @@ lin
ComplVV vv vp = let vc = vp.vComp in case vv.vvtype of { ComplVV vv vp = let vc = vp.vComp in case vv.vvtype of {
Waa_In => vp ** { 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 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 miscAdv = vp.miscAdv ++ vp.obj2.s -- dump the object to miscAdv
} ; } ;
Subjunctive => useV vv ** { Subjunctive => useV vv ** {
stm = Waxa ; stm = Waxa ;
vComp = vc ** { -- The whole previous VP becomes the subordinate clause 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 ;
scl = cl2sentence True cls ; scl = cl2sentence True cls ;
@@ -39,11 +39,11 @@ lin
inf = vc.inf ++ vp.s ! VInf inf = vc.inf ++ vp.s ! VInf
} ; } ;
stm = Waa NoPred ; stm = Waa NoPred ;
} }
} ; } ;
-- : VS -> S -> VP ; -- : VS -> S -> VP ;
ComplVS vs s = ComplVS vs s =
let vps = useV vs ; let vps = useV vs ;
subord = SubjS {s="in"} s ; subord = SubjS {s="in"} s ;
in vps ** {obj2 = {s = subord.berri ; a = P3_Prep}} ; in vps ** {obj2 = {s = subord.berri ; a = P3_Prep}} ;