mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-06-28 12:26:30 -06:00
replace future with "就会" instead of old "在"
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
concrete QuestionChi of Question = CatChi **
|
||||
concrete QuestionChi of Question = CatChi **
|
||||
open ResChi, Prelude in {
|
||||
|
||||
flags optimize=all_subs ;
|
||||
@@ -11,13 +11,14 @@ concrete QuestionChi of Question = CatChi **
|
||||
True => \\p,a => cl.s ! p ! a ++ question_s ; -- redup question as variant in ExtraChi
|
||||
False => \\p,a => --- code copied from ExtraChi
|
||||
let
|
||||
v = cl.vp.verb ;
|
||||
v = cl.vp.verb ;
|
||||
verb = case a of {
|
||||
APlain => v.s ++ v.neg ++ v.sn ;
|
||||
APlain => v.s ++ v.neg ++ v.sn ;
|
||||
APerf => v.s ++ neg_s ++ v.sn ++ v.pp ;
|
||||
ADurStat => v.s ++ neg_s ++ v.sn ;
|
||||
ADurProg => v.s ++ v.neg ++ v.dp ++ v.sn ; -- mei or bu
|
||||
AExper => v.s ++ v.neg ++ v.sn ++ v.ep
|
||||
AExper => v.s ++ v.neg ++ v.sn ++ v.ep ;
|
||||
AFut => jiu_s ++ hui_s ++ v.s ++ v.neg ++ v.sn ++ v.ep -- TODO check placement of jiang
|
||||
}
|
||||
in
|
||||
cl.np ++ cl.vp.prePart ++ verb ++ cl.vp.compl
|
||||
@@ -27,9 +28,9 @@ concrete QuestionChi of Question = CatChi **
|
||||
QuestVP ip vp = {
|
||||
s = \\_,p,a => ip.s ++ vp.prePart ++ useVerb vp.verb ! p ! a ++ vp.compl
|
||||
} ;
|
||||
|
||||
QuestSlash ip cls = {s = \\_ => (mkClauseCompl cls.np (insertObj (ss (appPrep cls.c2 ip.s)) cls.vp) []).s} ;
|
||||
|
||||
|
||||
QuestSlash ip cls = {s = \\_ => (mkClauseCompl cls.np (insertObj (ss (appPrep cls.c2 ip.s)) cls.vp) []).s} ;
|
||||
|
||||
QuestIAdv iadv cl = {s = \\_ => (mkClauseCompl cl.np (insertAdv iadv cl.vp) []).s} ;
|
||||
|
||||
QuestIComp icomp np = {s = \\_,p,a => np.s ++ icomp.s} ; ---- order
|
||||
@@ -49,13 +50,13 @@ concrete QuestionChi of Question = CatChi **
|
||||
IdetIP idet = idet ;
|
||||
|
||||
IdetQuant iquant num = {
|
||||
s = iquant.s ++ num.s ;
|
||||
s = iquant.s ++ num.s ;
|
||||
detType = case num.numType of {
|
||||
NTFull => DTNum ; -- which five
|
||||
NTVoid n => DTFull n ---- TODO: whose
|
||||
}
|
||||
} ;
|
||||
|
||||
|
||||
|
||||
AdvIAdv i a = ss (a.s ++ i.s) ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user