diff --git a/lib/src/chunk/ChunkEng.gf b/lib/src/chunk/ChunkEng.gf index d11bb9205..e7cc6ae13 100644 --- a/lib/src/chunk/ChunkEng.gf +++ b/lib/src/chunk/ChunkEng.gf @@ -30,7 +30,7 @@ lin refl_PlP2_Chunk = ss "yourselves" ; refl_PlP3_Chunk = ss "themselves" ; neg_Chunk = ss "not" | ss "doesn't" | ss "don't" ; - copula_Chunk = ss "is" | ss "are" | ss "am" ; + copula_Chunk = ss "is" | ss "are" | ss "am" ; ---- | ss (Predef.BIND ++ "'s") | ss (Predef.BIND ++ "'re") ; copula_neg_Chunk = ss "isn't" | ss "aren't" ; past_copula_Chunk = ss "was" | ss "were" ; past_copula_neg_Chunk = ss "wasn't" | ss "weren't" ; diff --git a/lib/src/translator/TranslateEng.gf b/lib/src/translator/TranslateEng.gf index ea82e9248..23878bd37 100644 --- a/lib/src/translator/TranslateEng.gf +++ b/lib/src/translator/TranslateEng.gf @@ -29,6 +29,7 @@ concrete TranslateEng of Translate = ], QuestionEng - [ QuestVP -- replaced by QuestVP | contracted QuestVP + ,QuestIComp ], RelativeEng - [IdRP], IdiomEng, @@ -63,11 +64,18 @@ lin in {s = \\t,a,b,_ => cl.s ! t ! a ! b ! ODir True} ; + QuestIComp icomp np = + G.QuestIComp icomp np + | + let cl = mkClause (icomp.s) np.a (insertObj (\\_ => np.s ! NCase Nom) (predAux auxBe)) + in {s = \\t,a,b,_ => cl.s ! t ! a ! b ! ODir True} + ; + ComplVS vs s = G.ComplVS vs s | E.ComplBareVS vs s ; SlashV2S vs s = G.SlashV2S vs s | E.SlashBareV2S vs s ; ComplSlash vps np = G.ComplSlash vps np | E.ComplSlashPartLast vps np ; ----- UseV v = G.UseV v | G.ProgrVP (UseV v) ; ---- error in variant compilation +---- UseV v = G.UseV v | G.ProgrVP (G.UseV v) ; ---- error in variant compilation AdvVP vp adv = G.AdvVP vp adv | insertObjPre (\\_ => adv.s) vp ; -- I bought a car today | I bought today a car