GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-27 11:48:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

contraction in TranslateEng.QuestIComp as variant: where's the beef

Browse Source
This commit is contained in:
aarne
2014-12-11 19:37:25 +00:00
parent 5056e91cc2
commit 04840f1a63
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/chunk/ChunkEng.gf
View File

@@ -30,7 +30,7 @@ lin
refl_PlP2_Chunk = ss "yourselves" ; refl_PlP2_Chunk = ss "yourselves" ;
refl_PlP3_Chunk = ss "themselves" ; refl_PlP3_Chunk = ss "themselves" ;
neg_Chunk = ss "not" | ss "doesn't" | ss "don't" ; 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" ; copula_neg_Chunk = ss "isn't" | ss "aren't" ;
past_copula_Chunk = ss "was" | ss "were" ; past_copula_Chunk = ss "was" | ss "were" ;
past_copula_neg_Chunk = ss "wasn't" | ss "weren't" ; past_copula_neg_Chunk = ss "wasn't" | ss "weren't" ;

10
lib/src/translator/TranslateEng.gf
View File

@@ -29,6 +29,7 @@ concrete TranslateEng of Translate =
], ],
QuestionEng - [ QuestionEng - [
QuestVP -- replaced by QuestVP | contracted QuestVP QuestVP -- replaced by QuestVP | contracted QuestVP
,QuestIComp
], ],
RelativeEng - [IdRP], RelativeEng - [IdRP],
IdiomEng, IdiomEng,
@@ -63,11 +64,18 @@ lin
in {s = \\t,a,b,_ => cl.s ! t ! a ! b ! ODir True} 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 ; ComplVS vs s = G.ComplVS vs s | E.ComplBareVS vs s ;
SlashV2S vs s = G.SlashV2S vs s | E.SlashBareV2S vs s ; SlashV2S vs s = G.SlashV2S vs s | E.SlashBareV2S vs s ;
ComplSlash vps np = G.ComplSlash vps np | E.ComplSlashPartLast vps np ; 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 AdvVP vp adv = G.AdvVP vp adv | insertObjPre (\\_ => adv.s) vp ; -- I bought a car today | I bought today a car