mirror of
https://github.com/GrammaticalFramework/gf-rgl.git
synced 2026-05-27 08:58:55 -06:00
replace future with "就会" instead of old "在"
This commit is contained in:
@@ -49,7 +49,8 @@ concrete ExtraChi of ExtraChiAbs = CatChi **
|
|||||||
APerf => v.s ++ "不" ++ v.sn ++ v.pp ;
|
APerf => v.s ++ "不" ++ v.sn ++ v.pp ;
|
||||||
ADurStat => v.s ++ "不" ++ v.sn ;
|
ADurStat => v.s ++ "不" ++ v.sn ;
|
||||||
ADurProg => v.s ++ v.neg ++ v.dp ++ v.sn ; -- mei or bu
|
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 ++ v.s ++ v.neg ++ v.sn ++ v.ep -- TODO check placement of jiang
|
||||||
}
|
}
|
||||||
in
|
in
|
||||||
cl.np ++ cl.vp.prePart ++ verb ++ cl.vp.compl
|
cl.np ++ cl.vp.prePart ++ verb ++ cl.vp.compl
|
||||||
|
|||||||
@@ -17,7 +17,8 @@ concrete QuestionChi of Question = CatChi **
|
|||||||
APerf => v.s ++ neg_s ++ v.sn ++ v.pp ;
|
APerf => v.s ++ neg_s ++ v.sn ++ v.pp ;
|
||||||
ADurStat => v.s ++ neg_s ++ v.sn ;
|
ADurStat => v.s ++ neg_s ++ v.sn ;
|
||||||
ADurProg => v.s ++ v.neg ++ v.dp ++ v.sn ; -- mei or bu
|
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
|
in
|
||||||
cl.np ++ cl.vp.prePart ++ verb ++ cl.vp.compl
|
cl.np ++ cl.vp.prePart ++ verb ++ cl.vp.compl
|
||||||
|
|||||||
@@ -42,6 +42,8 @@ resource ResChi = ParamX ** open Prelude in {
|
|||||||
geng_s = "更" ; -- more, in comparison
|
geng_s = "更" ; -- more, in comparison
|
||||||
hen_s = "很" ; -- very, or predicating a monosyllabic adjective
|
hen_s = "很" ; -- very, or predicating a monosyllabic adjective
|
||||||
taN_s = "它" ;
|
taN_s = "它" ;
|
||||||
|
jiu_s = "就" ;
|
||||||
|
hui_s = "会" ;
|
||||||
|
|
||||||
zai_V = mkVerb "在" [] [] [] [] "不" ;
|
zai_V = mkVerb "在" [] [] [] [] "不" ;
|
||||||
fullstop_s = "。" ;
|
fullstop_s = "。" ;
|
||||||
@@ -89,7 +91,7 @@ resource ResChi = ParamX ** open Prelude in {
|
|||||||
-- parameters
|
-- parameters
|
||||||
|
|
||||||
param
|
param
|
||||||
Aspect = APlain | APerf | ADurStat | ADurProg | AExper ; ---- APlain added by AR
|
Aspect = APlain | APerf | ADurStat | ADurProg | AExper | AFut ; ---- APlain added by AR
|
||||||
ConjForm = CPhr CPosType | CSent;
|
ConjForm = CPhr CPosType | CSent;
|
||||||
CPosType = CAPhrase | CNPhrase | CVPhrase ;
|
CPosType = CAPhrase | CNPhrase | CVPhrase ;
|
||||||
DeForm = DeNoun | NdNoun ; -- parameter created for noun with/out partical "de"
|
DeForm = DeNoun | NdNoun ; -- parameter created for noun with/out partical "de"
|
||||||
@@ -166,14 +168,16 @@ oper
|
|||||||
APerf => v.s ++ v.pp ;
|
APerf => v.s ++ v.pp ;
|
||||||
ADurStat => v.s ++ v.ds ;
|
ADurStat => v.s ++ v.ds ;
|
||||||
ADurProg => v.dp ++ v.s ;
|
ADurProg => v.dp ++ v.s ;
|
||||||
AExper => v.s ++ v.ep
|
AExper => v.s ++ v.ep ;
|
||||||
|
AFut => jiu_s ++ hui_s ++ v.s
|
||||||
} ;
|
} ;
|
||||||
Neg => table {
|
Neg => table {
|
||||||
APlain => v.neg ++ v.sn ; --- neg?
|
APlain => v.neg ++ v.sn ; --- neg?
|
||||||
APerf => "不" ++ v.sn ++ v.pp ;
|
APerf => "不" ++ v.sn ++ v.pp ;
|
||||||
ADurStat => "不" ++ v.sn ;
|
ADurStat => "不" ++ v.sn ;
|
||||||
ADurProg => v.neg ++ v.dp ++ v.sn ; -- mei or bu
|
ADurProg => v.neg ++ v.dp ++ v.sn ; -- mei or bu
|
||||||
AExper => v.neg ++ v.sn ++ v.ep
|
AExper => v.neg ++ v.sn ++ v.ep ;
|
||||||
|
AFut => jiu_s ++ "不" ++ hui_s ++ v.s
|
||||||
}
|
}
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ concrete TenseChi of Tense =
|
|||||||
---- ??
|
---- ??
|
||||||
TPres = {s = [] ; t = APlain} ;
|
TPres = {s = [] ; t = APlain} ;
|
||||||
TPast = {s = [] ; t = APerf} ;
|
TPast = {s = [] ; t = APerf} ;
|
||||||
TFut = {s = [] ; t = ADurProg} ;
|
TFut = {s = [] ; t = AFut} ;
|
||||||
TCond = {s = [] ; t = ADurStat} ;
|
TCond = {s = [] ; t = ADurStat} ;
|
||||||
|
|
||||||
ASimul = {s = [] ; t = APlain} ;
|
ASimul = {s = [] ; t = APlain} ;
|
||||||
|
|||||||
Reference in New Issue
Block a user