1
0
forked from GitHub/gf-core

oops, forgot to rename the 2-place Conj functions in ResourceDemo. Now added to uddeps as well.

This commit is contained in:
aarne
2016-06-09 15:14:06 +00:00
parent 172f2d12da
commit 389d54836b
3 changed files with 9 additions and 6 deletions

View File

@@ -153,9 +153,9 @@ fun
CompCN : CN -> VP ; CompCN : CN -> VP ;
CompNP : NP -> VP ; CompNP : NP -> VP ;
CompAdv : Adv -> VP ; CompAdv : Adv -> VP ;
ConjS : Conj -> S -> S -> S ; RConjS : Conj -> S -> S -> S ;
ConjAP : Conj -> AP -> AP -> AP ; RConjAP : Conj -> AP -> AP -> AP ;
ConjNP : Conj -> NP -> NP -> NP ; RConjNP : Conj -> NP -> NP -> NP ;
a_Det, the_Det, aPl_Det, thePl_Det : Det ; a_Det, the_Det, aPl_Det, thePl_Det : Det ;
this_Det, these_Det : Det ; this_Det, these_Det : Det ;
that_Det, those_Det : Det ; that_Det, those_Det : Det ;

View File

@@ -157,9 +157,9 @@ lin
CompCN ap = mkVP <(lin CN ap) : CN> ; CompCN ap = mkVP <(lin CN ap) : CN> ;
CompNP ap = mkVP <(lin NP ap) : NP> ; CompNP ap = mkVP <(lin NP ap) : NP> ;
CompAdv ap = mkVP <(lin Adv ap) : Adv> ; CompAdv ap = mkVP <(lin Adv ap) : Adv> ;
ConjS co x y = mkS (lin Conj co) (lin S x) (lin S y) ; RConjS co x y = mkS (lin Conj co) (lin S x) (lin S y) ;
ConjAP co x y = mkAP co x y ; RConjAP co x y = mkAP co x y ;
ConjNP co x y = mkNP co x y ; RConjNP co x y = mkNP co x y ;
a_Det = mkDet a_Quant ; a_Det = mkDet a_Quant ;
the_Det = mkDet the_Quant ; the_Det = mkDet the_Quant ;
aPl_Det = mkDet a_Quant plNum ; aPl_Det = mkDet a_Quant plNum ;

View File

@@ -166,6 +166,9 @@ RSubjS mark advcl head
SlashV2 nsubj head SlashV2 nsubj head
RAdvCN head case nmod RAdvCN head case nmod
SubjCl head mark advcl SubjCl head mark advcl
RConjS cc head conj
RConjAP cc head conj
RConjNP cc head conj
A ADJ A ADJ
A2 ADJ A2 ADJ