mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-06 01:32:50 -06:00
refactored Scandinavian NP agreement features
This commit is contained in:
@@ -6,7 +6,8 @@ incomplete concrete RelativeScand of Relative =
|
||||
lin
|
||||
|
||||
RelCl cl = {
|
||||
s = \\t,a,p,ag => pronSuch ! ag.gn ++ conjThat ++ cl.s ! t ! a ! p ! Sub ;
|
||||
s = \\t,a,p,ag =>
|
||||
pronSuch ! gennumAgr ag ++ conjThat ++ cl.s ! t ! a ! p ! Sub ;
|
||||
c = NPAcc
|
||||
} ;
|
||||
|
||||
@@ -15,9 +16,9 @@ incomplete concrete RelativeScand of Relative =
|
||||
let
|
||||
agr = case rp.a of {
|
||||
RNoAg => ag ;
|
||||
RAg a => a
|
||||
RAg g n p => {g = g ; n = n ; p = p}
|
||||
} ;
|
||||
cl = mkClause (rp.s ! ag.gn ! RNom) agr vp
|
||||
cl = mkClause (rp.s ! ag.g ! ag.n ! RNom) agr vp
|
||||
in
|
||||
cl.s ! t ! ant ! b ! Sub ;
|
||||
c = NPNom
|
||||
@@ -32,10 +33,10 @@ incomplete concrete RelativeScand of Relative =
|
||||
let
|
||||
agr = case rp.a of {
|
||||
RNoAg => ag ;
|
||||
RAg agg => agg
|
||||
RAg g n pr => {g = g ; n = n ; p = pr}
|
||||
}
|
||||
in
|
||||
slash.c2.s ++ rp.s ! ag.gn ! RPrep slash.c2.hasPrep ++
|
||||
slash.c2.s ++ rp.s ! ag.g ! ag.n ! RPrep slash.c2.hasPrep ++
|
||||
slash.s ! t ! a ! p ! Sub ++ slash.n3 ! agr ;
|
||||
c = NPAcc
|
||||
} ;
|
||||
@@ -43,8 +44,8 @@ incomplete concrete RelativeScand of Relative =
|
||||
--- The case here could be genitive.
|
||||
|
||||
FunRP p np rp = {
|
||||
s = \\gn,c => np.s ! nominative ++ p.s ++ rp.s ! gn ! RPrep True ;
|
||||
a = RAg np.a
|
||||
s = \\g,n,c => np.s ! nominative ++ p.s ++ rp.s ! g ! n ! RPrep True ;
|
||||
a = RAg np.a.g np.a.n np.a.p
|
||||
} ;
|
||||
|
||||
IdRP = {s = relPron ; a = RNoAg} ;
|
||||
|
||||
Reference in New Issue
Block a user