From 389d54836b370222d43ce9976b3f771e083f9566 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 9 Jun 2016 15:14:06 +0000 Subject: [PATCH] oops, forgot to rename the 2-place Conj functions in ResourceDemo. Now added to uddeps as well. --- lib/src/demo/ResourceDemo.gf | 6 +++--- lib/src/demo/ResourceDemoEng.gf | 6 +++--- lib/src/uddeps.labels | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/src/demo/ResourceDemo.gf b/lib/src/demo/ResourceDemo.gf index c831e64fd..c8b5d4aec 100644 --- a/lib/src/demo/ResourceDemo.gf +++ b/lib/src/demo/ResourceDemo.gf @@ -153,9 +153,9 @@ fun CompCN : CN -> VP ; CompNP : NP -> VP ; CompAdv : Adv -> VP ; - ConjS : Conj -> S -> S -> S ; - ConjAP : Conj -> AP -> AP -> AP ; - ConjNP : Conj -> NP -> NP -> NP ; + RConjS : Conj -> S -> S -> S ; + RConjAP : Conj -> AP -> AP -> AP ; + RConjNP : Conj -> NP -> NP -> NP ; a_Det, the_Det, aPl_Det, thePl_Det : Det ; this_Det, these_Det : Det ; that_Det, those_Det : Det ; diff --git a/lib/src/demo/ResourceDemoEng.gf b/lib/src/demo/ResourceDemoEng.gf index c79e85474..320ba9590 100644 --- a/lib/src/demo/ResourceDemoEng.gf +++ b/lib/src/demo/ResourceDemoEng.gf @@ -157,9 +157,9 @@ lin CompCN ap = mkVP <(lin CN ap) : CN> ; CompNP ap = mkVP <(lin NP ap) : NP> ; CompAdv ap = mkVP <(lin Adv ap) : Adv> ; - ConjS co x y = mkS (lin Conj co) (lin S x) (lin S y) ; - ConjAP co x y = mkAP co x y ; - ConjNP co x y = mkNP co x y ; + RConjS co x y = mkS (lin Conj co) (lin S x) (lin S y) ; + RConjAP co x y = mkAP co x y ; + RConjNP co x y = mkNP co x y ; a_Det = mkDet a_Quant ; the_Det = mkDet the_Quant ; aPl_Det = mkDet a_Quant plNum ; diff --git a/lib/src/uddeps.labels b/lib/src/uddeps.labels index ab47f3096..1c3d47901 100644 --- a/lib/src/uddeps.labels +++ b/lib/src/uddeps.labels @@ -166,6 +166,9 @@ RSubjS mark advcl head SlashV2 nsubj head RAdvCN head case nmod SubjCl head mark advcl +RConjS cc head conj +RConjAP cc head conj +RConjNP cc head conj A ADJ A2 ADJ