mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-20 08:32:50 -06:00
relatives (but expensive)
This commit is contained in:
@@ -157,78 +157,91 @@ incomplete concrete ClauseRomance of Clause = CategoriesRomance **
|
||||
-----------
|
||||
|
||||
RPredV np v =
|
||||
sats2rel (mkSats (relNounPhrase np) v) ;
|
||||
sats2rel
|
||||
(\g,n,p -> mkSats (relNounPhrase np g n p) v) ;
|
||||
RPredPassV subj v =
|
||||
sats2rel (mkSatsCopula (relNounPhrase subj) (v.s ! VPart
|
||||
(pgen2gen subj.g) Sg)) ; ---- subj.n
|
||||
sats2rel
|
||||
(\g,n,p -> mkSatsCopula (relNounPhrase subj g n p)
|
||||
(v.s ! VPart g n)) ;
|
||||
RPredV2 np v y =
|
||||
sats2rel (mkSatsObject (relNounPhrase np) v y) ;
|
||||
sats2rel
|
||||
(\g,n,p -> mkSatsObject (relNounPhrase np g n p) v y) ;
|
||||
|
||||
RPredV3 subj verb obj1 obj2 =
|
||||
sats2rel (
|
||||
insertObject (mkSatsObject (relNounPhrase subj) verb obj1) verb.c3 verb.s3 obj2
|
||||
sats2rel
|
||||
(\g,n,p ->
|
||||
insertObject (mkSatsObject (relNounPhrase subj g n p) verb
|
||||
obj1) verb.c3 verb.s3 obj2
|
||||
) ;
|
||||
RPredReflV2 subj verb =
|
||||
sats2rel (
|
||||
mkSatsObject (relNounPhrase subj)
|
||||
sats2rel (\g,n,p ->
|
||||
mkSatsObject (relNounPhrase subj g n p)
|
||||
{s = verb.s ; s2 = [] ; c = accusative ; aux = AEsse}
|
||||
(reflPronNounPhrase (pgen2gen subj.g) Sg P3)) ;
|
||||
(reflPronNounPhrase g n p)) ;
|
||||
RPredVS subj verb sent =
|
||||
sats2rel (
|
||||
insertExtrapos (mkSats (relNounPhrase subj) verb)
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos (mkSats (relNounPhrase subj g n p) verb)
|
||||
(\\b => embedConj ++ sent.s ! subordMode verb b)) ; ---- mn
|
||||
RPredVQ subj verb quest =
|
||||
sats2rel (
|
||||
insertExtrapos (mkSats (relNounPhrase subj) verb) (\\_ => quest.s ! IndirQ)) ;
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos (mkSats (relNounPhrase subj g n p) verb) (\\_ => quest.s ! IndirQ)) ;
|
||||
RPredV2S subj verb obj sent =
|
||||
sats2rel (
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos
|
||||
(mkSatsObject (relNounPhrase subj) verb obj)
|
||||
(mkSatsObject (relNounPhrase subj g n p) verb obj)
|
||||
(\\b => embedConj ++ sent.s ! subordMode verb b)
|
||||
) ; ---- mn ;
|
||||
RPredV2Q subj verb obj quest =
|
||||
sats2rel (
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos
|
||||
(mkSatsObject (relNounPhrase subj) verb obj)
|
||||
(mkSatsObject (relNounPhrase subj g n p) verb obj)
|
||||
(\\_ => quest.s ! IndirQ)) ;
|
||||
RPredVA subj verb adj =
|
||||
sats2rel (
|
||||
insertExtrapos (mkSats (relNounPhrase subj) verb)
|
||||
(\\_ => adj.s ! AF (pgen2gen subj.g) Sg)) ; ---- subj.n, etc
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos (mkSats (relNounPhrase subj g n p) verb)
|
||||
(\\_ => adj.s ! AF g n)) ;
|
||||
RPredV2A subj verb obj adj =
|
||||
sats2rel (
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos
|
||||
(mkSatsObject (relNounPhrase subj) verb obj)
|
||||
(mkSatsObject (relNounPhrase subj g n p) verb obj)
|
||||
(\\_ => adj.s ! AF (pgen2gen obj.g) obj.n)) ;
|
||||
RPredVV subj verb vp =
|
||||
sats2rel (
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos
|
||||
(mkSats (relNounPhrase subj) verb)
|
||||
(mkSats (relNounPhrase subj g n p) verb)
|
||||
(\\_ => prepCase verb.c ++
|
||||
vp.s ! VIInfinit ! (pgen2gen subj.g) ! (relNounPhrase subj).n ! P3)
|
||||
vp.s ! VIInfinit ! g ! n ! p)
|
||||
) ;
|
||||
RPredObjV2V subj verb obj vp =
|
||||
sats2rel (
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos
|
||||
(mkSatsObject (relNounPhrase subj) verb obj)
|
||||
(mkSatsObject (relNounPhrase subj g n p) verb obj)
|
||||
(\\_ => prepCase verb.c ++ vp.s ! VIInfinit ! pgen2gen obj.g ! obj.n ! obj.p)
|
||||
) ;
|
||||
{- ----
|
||||
RPredSubjV2V subj verb obj vp =
|
||||
sats2rel (
|
||||
sats2rel (\g,n,p ->
|
||||
insertExtrapos
|
||||
(mkSatsObject (relNounPhrase subj) verb obj)
|
||||
(\\_ => prepCase verb.c ++ vp.s ! VIInfinit ! (pgen2gen subj.g) ! Sg ! P3)
|
||||
(mkSatsObject (relNounPhrase subj g n p) verb obj)
|
||||
(\\_ => prepCase verb.c ++ vp.s ! VIInfinit ! g ! n ! p)
|
||||
) ;
|
||||
|
||||
-}
|
||||
RPredAP subj adj =
|
||||
sats2rel (mkSatsCopula (relNounPhrase subj) (adj.s ! AF (pgen2gen subj.g) Sg)) ;
|
||||
sats2rel
|
||||
(\g,n,p -> mkSatsCopula (relNounPhrase subj g n p) (adj.s ! AF g n)) ;
|
||||
RPredCN subj cn =
|
||||
sats2rel (mkSatsCopula (relNounPhrase subj) (indefNoun Sg cn)) ;
|
||||
sats2rel
|
||||
(\g,n,p -> mkSatsCopula (relNounPhrase subj g n p) (indefNoun n cn)) ;
|
||||
RPredNP subj np =
|
||||
sats2rel (mkSatsCopula (relNounPhrase subj) (np.s ! stressed nominative)) ;
|
||||
sats2rel
|
||||
(\g,n,p -> mkSatsCopula (relNounPhrase subj g n p) (np.s ! stressed nominative)) ;
|
||||
RPredAdv subj adv =
|
||||
sats2rel (mkSatsCopula (relNounPhrase subj) adv.s) ;
|
||||
sats2rel
|
||||
(\g,n,p -> mkSatsCopula (relNounPhrase subj g n p) adv.s) ;
|
||||
|
||||
RPredProgVP np vp = sats2rel (progressiveSats (relNounPhrase np) vp) ;
|
||||
RPredProgVP np vp =
|
||||
sats2rel
|
||||
(\g,n,p -> progressiveSats (relNounPhrase np g n p) vp) ;
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1313,24 +1313,17 @@ oper
|
||||
in
|
||||
{s = \\b,f,_ => cl.s ! b ! f} ;
|
||||
|
||||
sats2rel : (Gender -> Number -> Person -> Sats) -> RelClause = \sats ->
|
||||
{s = \\b,f,g,n,p =>
|
||||
(sats2clause (sats g n p)).s ! b ! f
|
||||
} ;
|
||||
|
||||
{- ---- this does not yet get agrement right; have to integrate these two
|
||||
RP = {s : RelForm => Str ; g : RelGen} ;
|
||||
NP = {s : NPFormA => Str ; g : PronGen ;
|
||||
n : Number ; p : Person ; c : ClitType} ;
|
||||
RCl = {s : Bool => ClForm => Gender => Number => Person => Str} ;
|
||||
RelGen = RNoGen | RG Gender ;
|
||||
|
||||
-}
|
||||
sats2rel : Sats -> RelClause = \x ->
|
||||
let cl = sats2clause x
|
||||
in
|
||||
{s = \\b,f,_,_,_ => cl.s ! b ! f} ;
|
||||
relNounPhrase : RelPron -> NounPhrase = \r -> {
|
||||
relNounPhrase : RelPron -> Gender -> Number -> Person -> NounPhrase =
|
||||
\r,g,n,p -> {
|
||||
s = \\np => r.s ! npRelForm np ;
|
||||
g = r.g ;
|
||||
n = Sg ; ----
|
||||
p = P3 ; ----
|
||||
g = PGen g ; --- r.g
|
||||
n = n ;
|
||||
p = p ;
|
||||
c = Clit0 ;
|
||||
} ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user