From a5f3e9ebd29230a782175a398fd0af0fbef4df2a Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 24 Feb 2023 15:26:03 +0800 Subject: [PATCH 1/2] (Chi) Add ComplVPIVV, GerundNP and GerundAdv --- src/chinese/ExtendChi.gf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/chinese/ExtendChi.gf b/src/chinese/ExtendChi.gf index 36255bff3..dfcabd299 100644 --- a/src/chinese/ExtendChi.gf +++ b/src/chinese/ExtendChi.gf @@ -5,12 +5,13 @@ concrete ExtendChi of Extend = CatChi ** VPS, ListVPS, VPI, ListVPI , MkVPS, BaseVPS, ConsVPS, ConjVPS , PredVPS, SQuestVPS, RelVPS --, QuestVPS -- TODO - , MkVPI, BaseVPI, ConsVPI, ConjVPI --, ComplVPIVV -- TODO + , MkVPI, BaseVPI, ConsVPI, ConjVPI, ComplVPIVV , VPS2, ListVPS2, VPI2, ListVPI2 , MkVPS2, BaseVPS2, ConsVPS2, ConjVPS2, ComplVPS2, ReflVPS2 , MkVPI2, BaseVPI2, ConsVPI2, ConjVPI2, ComplVPI2 , ProDrop, ComplDirectVS, ComplDirectVQ - , PassVPSlash, PassAgentVPSlash ] + , PassVPSlash, PassAgentVPSlash + , GerundAdv, GerundNP ] with (Grammar=GrammarChi) ** open Prelude , Coordination @@ -60,6 +61,12 @@ concrete ExtendChi of Extend = CatChi ** BaseVPI2 v w = twoSS v w ** w ; ConsVPI2 v vs = consrSS duncomma v vs ** vs ; + ComplVPIVV vv vpi = predV vv [] ** { + compl = vpi.s ; + } ; + + GerundAdv vp = mkAdv (infVP vp) ; + GerundNP vp = ResChi.mkNP (infVP vp) ; GenNP np = {s,pl = np.s ++ possessive_s ; detType = DTPoss} ; GenRP nu cn = {s = \\_ => cn.s ++ relative_s} ; From cb397987fcee33542088a2d5573321453d7260bf Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Fri, 24 Feb 2023 15:26:57 +0800 Subject: [PATCH 2/2] (Chi) compile ExtendChi + use linref for VP --- src/chinese/AllChi.gf | 2 +- src/chinese/AllChiAbs.gf | 4 ++-- src/chinese/CatChi.gf | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/chinese/AllChi.gf b/src/chinese/AllChi.gf index 39a548669..4da6f54a5 100644 --- a/src/chinese/AllChi.gf +++ b/src/chinese/AllChi.gf @@ -1,3 +1,3 @@ --# -path=.:../abstract:../common:../api:../prelude -concrete AllChi of AllChiAbs = LangChi, ExtraChi ; +concrete AllChi of AllChiAbs = LangChi, ExtendChi ; diff --git a/src/chinese/AllChiAbs.gf b/src/chinese/AllChiAbs.gf index 6a1a87331..eb721b704 100644 --- a/src/chinese/AllChiAbs.gf +++ b/src/chinese/AllChiAbs.gf @@ -1,5 +1,5 @@ --# -path=.:../abstract:../common:prelude -abstract AllChiAbs = +abstract AllChiAbs = Lang, - ExtraChiAbs ; + Extend ; diff --git a/src/chinese/CatChi.gf b/src/chinese/CatChi.gf index 15398e15f..ff9966430 100644 --- a/src/chinese/CatChi.gf +++ b/src/chinese/CatChi.gf @@ -90,4 +90,5 @@ concrete CatChi of Cat = CommonX - [Tense, Temp, Ant, Adv] ** open ResChi, Prelu linref S = linS ; Prep = linPrep ; + VP = infVP ; }