msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

replace future with "就会" instead of old "在"

Browse Source
This commit is contained in:
1Regina
2022-02-09 13:56:11 +08:00
committed by Inari Listenmaa
parent 734d000b4d
commit 0dbb5e4ee8
4 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/chinese/ExtraChi.gf
View File

@@ -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

19
src/chinese/QuestionChi.gf
View File

@@ -1,4 +1,4 @@
concrete QuestionChi of Question = CatChi ** concrete QuestionChi of Question = CatChi **
open ResChi, Prelude in { open ResChi, Prelude in {
flags optimize=all_subs ; 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 True => \\p,a => cl.s ! p ! a ++ question_s ; -- redup question as variant in ExtraChi
False => \\p,a => --- code copied from ExtraChi False => \\p,a => --- code copied from ExtraChi
let let
v = cl.vp.verb ; v = cl.vp.verb ;
verb = case a of { 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 ; 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
@@ -27,9 +28,9 @@ concrete QuestionChi of Question = CatChi **
QuestVP ip vp = { QuestVP ip vp = {
s = \\_,p,a => ip.s ++ vp.prePart ++ useVerb vp.verb ! p ! a ++ vp.compl 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} ; QuestIAdv iadv cl = {s = \\_ => (mkClauseCompl cl.np (insertAdv iadv cl.vp) []).s} ;
QuestIComp icomp np = {s = \\_,p,a => np.s ++ icomp.s} ; ---- order QuestIComp icomp np = {s = \\_,p,a => np.s ++ icomp.s} ; ---- order
@@ -49,13 +50,13 @@ concrete QuestionChi of Question = CatChi **
IdetIP idet = idet ; IdetIP idet = idet ;
IdetQuant iquant num = { IdetQuant iquant num = {
s = iquant.s ++ num.s ; s = iquant.s ++ num.s ;
detType = case num.numType of { detType = case num.numType of {
NTFull => DTNum ; -- which five NTFull => DTNum ; -- which five
NTVoid n => DTFull n ---- TODO: whose NTVoid n => DTFull n ---- TODO: whose
} }
} ; } ;
AdvIAdv i a = ss (a.s ++ i.s) ; AdvIAdv i a = ss (a.s ++ i.s) ;

10
src/chinese/ResChi.gf
View File

@@ -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
} }
} ; } ;

8
src/chinese/TenseChi.gf
View File

@@ -1,4 +1,4 @@
concrete TenseChi of Tense = concrete TenseChi of Tense =
CatChi [Tense,Temp,Ant], TenseX [Pol,PNeg,PPos] ** open ResChi in { CatChi [Tense,Temp,Ant], TenseX [Pol,PNeg,PPos] ** open ResChi in {
lin lin
@@ -6,11 +6,11 @@ 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} ;
AAnter = {s = [] ; t = APerf} ; AAnter = {s = [] ; t = APerf} ;
} }