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

some changes to the np conjunctions

Browse Source
This commit is contained in:
Herbert Lange
2019-06-03 13:34:51 +02:00
parent 2a3de7687f
commit 8dde0246c4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/latin/ConjunctionLat.gf
View File

@@ -41,7 +41,7 @@ concrete ConjunctionLat of Conjunction =
adv = nps.adv ; adv = nps.adv ;
preap = nps.preap ; preap = nps.preap ;
postap = nps.postap ; postap = nps.postap ;
det = { s = \\_,_ => "" ; sp = \\_,_ => "" ; n = nps.n }; det = nps.det
} ; } ;
-- ConjAP : Conj -> ListAP -> AP ; -- ConjAP : Conj -> ListAP -> AP ;
@@ -107,7 +107,7 @@ concrete ConjunctionLat of Conjunction =
preap = lin AP { s = \\a => x.preap.s ! a ++ y.preap.s ! a } ; preap = lin AP { s = \\a => x.preap.s ! a ++ y.preap.s ! a } ;
postap = lin AP { s = \\a => x.postap.s ! a ++ y.postap.s ! a } ; postap = lin AP { s = \\a => x.postap.s ! a ++ y.postap.s ! a } ;
isBase = True ; isBase = True ;
det = { s = \\g,c => x.det.s ! g ! c ++ y.det.s ! g ! c ; sp = \\g,c => x.det.sp ! g ! c ++ y.det.sp ! g ! c ; n = matchNumber x.get.n y.get.n } ; det = lin Det { s = \\g,c => x.det.s ! g ! c ++ y.det.s ! g ! c ; sp = \\g,c => x.det.sp ! g ! c ++ y.det.sp ! g ! c ; n = matchNumber x.det.n y.det.n } ;
} ; } ;
-- -- ConsNP : NP -> ListNP -> ListNP ; -- John, Mary, Bill -- -- ConsNP : NP -> ListNP -> ListNP ; -- John, Mary, Bill
@@ -120,8 +120,8 @@ concrete ConjunctionLat of Conjunction =
adv = x.adv ++ xs.adv ; adv = x.adv ++ xs.adv ;
preap = lin AP { s = \\a => x.preap.s ! a ++ xs.preap.s ! a } ; preap = lin AP { s = \\a => x.preap.s ! a ++ xs.preap.s ! a } ;
postap = lin AP { s = \\a => x.postap.s ! a ++ xs.postap.s ! a } ; postap = lin AP { s = \\a => x.postap.s ! a ++ xs.postap.s ! a } ;
isBase = False isBase = False ;
-- TODO det det = lin Det { s = \\g,c => x.det.s ! g ! c ++ xs.det.s ! g ! c ; sp = \\g,c => x.det.sp ! g ! c ++ xs.det.sp ! g ! c ; n = matchNumber x.det.n xs.det.n } ; -- try to combine the determiners, probably not what we want
} ; } ;
-- -- BaseAP : AP -> AP -> ListAP -- -- BaseAP : AP -> AP -> ListAP
@@ -134,7 +134,7 @@ concrete ConjunctionLat of Conjunction =
lincat lincat
[S] = { s : Coordinator => {init,last : SAdvPos => AdvPos => ComplPos => Order => Str} ; p : Pol ; t : Tense } ; -- TO FIX [S] = { s : Coordinator => {init,last : SAdvPos => AdvPos => ComplPos => Order => Str} ; p : Pol ; t : Tense } ; -- TO FIX
[Adv] = { s: Coordinator => {init,last : Str}} ; [Adv] = { s: Coordinator => {init,last : Str}} ;
[NP] = { s : Coordinator => {init,last : Case => Str} ; g : Gender ; n : Number ; p : Person ; adv : Str ; preap : AP ; postap : AP ; isBase : Bool } ; [NP] = { s : Coordinator => {init,last : Case => Str} ; g : Gender ; n : Number ; p : Person ; adv : Str ; preap : AP ; postap : AP ; isBase : Bool ; det : Det } ;
[AP] = {s : Coordinator => {init,last : Agr => Str } } ; [AP] = {s : Coordinator => {init,last : Agr => Str } } ;
oper oper