mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-06 09:42:50 -06:00
rename the vp variable to slash in ComplVV and ComplV2VNP
This commit is contained in:
@@ -51,31 +51,31 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
|
|||||||
** {c2 = vv.c2} ; ---- FIXME: agreement with obj.a
|
** {c2 = vv.c2} ; ---- FIXME: agreement with obj.a
|
||||||
|
|
||||||
-- test: I saw a car whom she wanted to buy
|
-- test: I saw a car whom she wanted to buy
|
||||||
SlashVV vv vp = {
|
SlashVV vv slash = {
|
||||||
s = \\t,a,p,agr,q,asp =>
|
s = \\t,a,p,agr,q,asp =>
|
||||||
let
|
let
|
||||||
vv_verb = (predV vv).s ! t ! a ! p ! agr ! q ! asp ;
|
vv_verb = (predV vv).s ! t ! a ! p ! agr ! q ! asp ;
|
||||||
vp_verb = vp.s ! Pres ! Simul ! Pos ! agr ! False ! Perf ;
|
slash_verb = slash.s ! Pres ! Simul ! Pos ! agr ! False ! Perf ;
|
||||||
in vv_verb ++ vp.ad ! False ++ "äà" ++ vp_verb ;
|
in vv_verb ++ slash.ad ! False ++ "äà" ++ slash_verb ;
|
||||||
imp = vp.imp ;
|
imp = slash.imp ;
|
||||||
ad = \\_ => [] ;
|
ad = \\_ => [] ;
|
||||||
s2 = vp.s2 ;
|
s2 = slash.s2 ;
|
||||||
subjRole = vp.subjRole
|
subjRole = slash.subjRole
|
||||||
} ** {c2 = vp.c2} ;
|
} ** {c2 = slash.c2} ;
|
||||||
|
|
||||||
-- test: I saw a car whom she begged me to buy
|
-- test: I saw a car whom she begged me to buy
|
||||||
SlashV2VNP vv np vp =
|
SlashV2VNP vv np slash =
|
||||||
insertObj (\\_ => vv.c2.s ++ np.s ! RObj vv.c2.c) {
|
insertObj (\\_ => vv.c2.s ++ np.s ! RObj vv.c2.c) {
|
||||||
s = \\t,a,p,agr,q,asp =>
|
s = \\t,a,p,agr,q,asp =>
|
||||||
let
|
let
|
||||||
vv_verb = (predV vv).s ! t ! a ! p ! agr ! q ! asp ;
|
vv_verb = (predV vv).s ! t ! a ! p ! agr ! q ! asp ;
|
||||||
vp_verb = vp.s ! Pres ! Simul ! Pos ! agr ! False ! Perf ;
|
slash_verb = slash.s ! Pres ! Simul ! Pos ! agr ! False ! Perf ;
|
||||||
in vv_verb ++ vp.ad ! False ++ "äà" ++ vp_verb ;
|
in vv_verb ++ slash.ad ! False ++ "äà" ++ slash_verb ;
|
||||||
imp = vp.imp ;
|
imp = slash.imp ;
|
||||||
ad = \\_ => [] ;
|
ad = \\_ => [] ;
|
||||||
s2 = vp.s2 ;
|
s2 = slash.s2 ;
|
||||||
subjRole = vp.subjRole
|
subjRole = slash.subjRole
|
||||||
} ** {c2 = vp.c2} ;
|
} ** {c2 = slash.c2} ;
|
||||||
|
|
||||||
---- END guesses by AR
|
---- END guesses by AR
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user