From e94c8af553710bcbee5aa307e033a8d2a4efd971 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 16 Feb 2014 16:07:05 +0000 Subject: [PATCH] passive in PredFin --- lib/src/experimental/PredFin.gf | 18 ++++++++++++++++-- lib/src/experimental/PredInstanceFin.gf | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/src/experimental/PredFin.gf b/lib/src/experimental/PredFin.gf index bd1b7df86..0fb5c705f 100644 --- a/lib/src/experimental/PredFin.gf +++ b/lib/src/experimental/PredFin.gf @@ -30,7 +30,6 @@ with lin UseV x a t p verb = initPrVerbPhraseV a t p verb ; - UseAP x a t p ap = useCopula a t p ** { c1 = ap.c1 ; c2 = ap.c2 ; @@ -130,9 +129,24 @@ lin ,PresPartAP ,PastPartAP,AgentPastPartAP - ,PassUseV, AgentPassUseV + ,AgentPassUseV = variants {} ; + PassUseV x a t p verb = initPrVerbPhraseV a t p verb ** { + v : Agr => {fin,inf : Str} = case verb.sc of { + SCNom => \\agr => finV (a.s ++ t.s ++ p.s) t.t a.a p.p Pass agr (lin PrV verb) ; + _ => \\_ => finV (a.s ++ t.s ++ p.s) t.t a.a p.p Pass defaultAgr (lin PrV verb) + } ; + inf : VVType => Str = \\vtt => tenseInfV (a.s ++ p.s) a.a p.p Pass (lin PrV verb) vtt ; + imp : ImpType => Str = \\it => imperativeV p.s p.p it (lin PrV verb) ; + isPass : Bool = True ; + c1 : Compl = noComplCase ; + c2 : Compl = verb.c2 ; + vvtype = verb.vvtype ; + sc = npform2subjcase verb.c1.c ; + h = case a.a of {Anter => Back ; _ => verb.h} ; + } ; + ---- this will be fun! ByVP, -- tekemällä diff --git a/lib/src/experimental/PredInstanceFin.gf b/lib/src/experimental/PredInstanceFin.gf index 5540a7cd5..886719165 100644 --- a/lib/src/experimental/PredInstanceFin.gf +++ b/lib/src/experimental/PredInstanceFin.gf @@ -82,7 +82,7 @@ oper adv : Str = [] ; adV : Str = [] ; ext : Str = [] ; - isNeg : Bool = True ; + isNeg : Bool = False ; isPass : Bool = False ; c1 : Compl = verb.c1 ; c2 : Compl = verb.c2 ;