From d7cc8dbe5972827363e5539953ecb3b204ebe0f7 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 6 Mar 2014 16:13:18 +0000 Subject: [PATCH] subject control bug in PredSwe and Eng fixed --- lib/src/experimental/LiftEng.gf | 4 ++-- lib/src/experimental/PredInstanceSwe.gf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/experimental/LiftEng.gf b/lib/src/experimental/LiftEng.gf index 1be5de9b7..95442c95a 100644 --- a/lib/src/experimental/LiftEng.gf +++ b/lib/src/experimental/LiftEng.gf @@ -7,7 +7,7 @@ concrete LiftEng of Lift = --flags literal=Symb ; oper - liftV : ResEng.Verb -> Pr.PrV = \v -> lin PrV {s = v.s ; p = v.p ; c1,c2 = [] ; isSubjectControl = False ; vtype = VTAct ; vvtype = VVInf} ; + liftV : ResEng.Verb -> Pr.PrV = \v -> lin PrV {s = v.s ; p = v.p ; c1,c2 = [] ; isSubjectControl = True ; vtype = VTAct ; vvtype = VVInf} ; lin LiftV v = liftV v ; @@ -16,7 +16,7 @@ lin LiftVQ v = liftV v ; LiftVA v = liftV v ; ---- c1? LiftVN v = liftV v ; ---- c1? - LiftVV v = {s = \\f => v.s ! VVF f ; p = v.p ; c1,c2 = [] ; isSubjectControl = False ; + LiftVV v = {s = \\f => v.s ! VVF f ; p = v.p ; c1,c2 = [] ; isSubjectControl = True ; vtype = case v.typ of {VAux => VTAux ; _ => VTAct} ; vvtype = v.typ} ; ---- c1? ---- VVF LiftV3 v = liftV v ** {c1 = v.c2 ; c2 = v.c3} ; diff --git a/lib/src/experimental/PredInstanceSwe.gf b/lib/src/experimental/PredInstanceSwe.gf index dfe90f9c4..a48ba8807 100644 --- a/lib/src/experimental/PredInstanceSwe.gf +++ b/lib/src/experimental/PredInstanceSwe.gf @@ -183,7 +183,7 @@ oper inte_Str = "inte" | "icke" | "ej" ; liftV : Verb -> PrVerb = \v -> - {s = v.s ; p = v.part ; c1,c2 = [] ; isSubjectControl = False ; vtype = v.vtype ; vvtype = vvInfinitive} ; ---- vvtype + {s = v.s ; p = v.part ; c1,c2 = [] ; isSubjectControl = True ; vtype = v.vtype ; vvtype = vvInfinitive} ; ---- vvtype --- junk