diff --git a/lib/src/experimental/Predication.gf b/lib/src/experimental/Predication.gf index cf93c7665..c6038254e 100644 --- a/lib/src/experimental/Predication.gf +++ b/lib/src/experimental/Predication.gf @@ -26,12 +26,12 @@ fun UseV : Temp -> Pol -> (a : Arg) -> V a -> VP a ; - SlashVNP : (a : Arg) -> VP (aNP a) -> NP -> VP a ; -- consuming first NP - SlashVNP2 : (a : Arg) -> VP (aNP (aNP a)) -> NP -> VP (aNP a) ; -- consuming second NP - ComplVS : VP aS -> S -> VP aNone ; - ComplVV : VP aV -> VP aNone -> VP aNone ; - SlashV2S : VP (aNP aS) -> S -> VP (aNP aNone) ; - SlashV2V : VP (aNP aV) -> VP aNone -> VP (aNP aNone) ; + SlashVNP : (a : Arg) -> VP (aNP a) -> NP -> VP a ; -- consuming first NP + SlashVNP2 : (a : Arg) -> VP (aNP (aNP a)) -> NP -> VP (aNP a) ; -- consuming second NP + ComplVS : (a : Arg) -> VP aS -> Cl a -> VP a ; + ComplVV : (a : Arg) -> VP aV -> VP a -> VP a ; + SlashV2S : (a : Arg) -> VP (aNP aS) -> Cl a -> VP (aNP a) ; -- a:Arg gives slash propagation, SlashVS + SlashV2V : (a : Arg) -> VP (aNP aV) -> VP a -> VP (aNP a) ; UseAP : Temp -> Pol -> (a : Arg) -> AP a -> VP a ; diff --git a/lib/src/experimental/PredicationEng.gf b/lib/src/experimental/PredicationEng.gf index a4cfcae4d..965006db1 100644 --- a/lib/src/experimental/PredicationEng.gf +++ b/lib/src/experimental/PredicationEng.gf @@ -77,7 +77,7 @@ lin ext = vp.ext ; } ; - ComplVS vp s = { + ComplVS x vp cl = { v = vp.v ; inf = vp.inf ; c1 = vp.c1 ; @@ -86,10 +86,10 @@ lin obj1 = vp.obj1 ; obj2 = vp.obj2 ; adv = vp.adv ; - ext = s.s ; + ext = (DeclCl (lin Cl cl)).s ; } ; - ComplVV vp vpo = { + ComplVV x vp vpo = { v = vp.v ; inf = vp.inf ; c1 = vp.c1 ; @@ -101,7 +101,7 @@ lin ext = vp.ext ; } ; - SlashV2S vp s = { + SlashV2S x vp cl = { v = vp.v ; inf = vp.inf ; c1 = vp.c1 ; @@ -110,10 +110,10 @@ lin obj1 = vp.obj1 ; obj2 = vp.obj2 ; adv = vp.adv ; - ext = s.s ; + ext = (DeclCl (lin Cl cl)).s ; } ; - SlashV2V vp vpo = { + SlashV2V x vp vpo = { v = vp.v ; inf = vp.inf ; c1 = vp.c1 ;