From 9e7bdb6703aac852283345b7e376173368148ba9 Mon Sep 17 00:00:00 2001 From: Aarne Ranta Date: Sun, 29 Oct 2017 10:46:24 +0100 Subject: [PATCH] overloading Eng mkV2V --- src/english/ParadigmsEng.gf | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/english/ParadigmsEng.gf b/src/english/ParadigmsEng.gf index 8b56736e0..9bbee53b3 100644 --- a/src/english/ParadigmsEng.gf +++ b/src/english/ParadigmsEng.gf @@ -313,7 +313,11 @@ oper mkVV : V -> VV ; -- e.g. want (to VP) infVV : V -> VV ; -- e.g. want (to VP) ingVV : V -> VV ; -- e.g. start (VPing) - mkV2V : V -> Prep -> Prep -> V2V ; -- e.g. want (noPrep NP) (to VP) + mkV2V : overload { + mkV2V : Str -> V2V ; + mkV2V : V -> V2V ; + mkV2V : V -> Prep -> Prep -> V2V ; -- e.g. want (noPrep NP) (to VP) + } ; ingV2V : V -> Prep -> Prep -> V2V ; -- e.g. prevent (noPrep NP) (from VP-ing) mkVA : V -> VA ; -- e.g. become (AP) mkV2A : V -> Prep -> V2A ; -- e.g. paint (NP) (AP) @@ -582,7 +586,12 @@ mkInterj : Str -> Interj mkV0 v = v ; mkV2S v p = lin V2S (prepV2 v p) ; - mkV2V v p t = lin V2V (prepV2 v p ** {c3 = t.s ; typ = VVAux}) ; + mkV2V = overload { + mkV2V : Str -> V2V = \s -> lin V2V (dirV2 (regV s) ** {c3 = [] ; typ = VVAux}) ; + mkV2V : V -> V2V = \v -> lin V2V (dirV2 v ** {c3 = [] ; typ = VVAux}) ; + mkV2V : V -> Prep -> Prep -> V2V = \v,p,t -> lin V2V (prepV2 v p ** {c3 = t.s ; typ = VVAux}) ; + } ; + ingV2V v p t = lin V2V (prepV2 v p ** {c3 = t.s ; typ = VVPresPart}) ; mkVA v = lin VA v ; mkV2A v p = lin V2A (prepV2 v p) ;