From 460ec475bdf1c50c58c59f48e35a1af2aa570e01 Mon Sep 17 00:00:00 2001
From: 1Regina <46968488+1Regina@users.noreply.github.com>
Date: Wed, 9 Feb 2022 16:56:59 +0800
Subject: [PATCH] =?UTF-8?q?make=20all=20the=20questions=20by=20extending?=
 =?UTF-8?q?=20a=20"=E5=90=97"=20at=20end?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/chinese/QuestionChi.gf         | 17 +----------------
 src/chinese/unittest/future.gftest |  8 ++++----
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/chinese/QuestionChi.gf b/src/chinese/QuestionChi.gf
index 8037d4d46..d190869d9 100644
--- a/src/chinese/QuestionChi.gf
+++ b/src/chinese/QuestionChi.gf
@@ -7,22 +7,7 @@ concrete QuestionChi of Question = CatChi **
   lin
 
     QuestCl cl = {
-      s = table {
-        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 ;
-          verb = case a of {
-            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 ;
-            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
-        }
+      s = \\b,p,a => cl.s ! p ! a ++ question_s ; -- redup question as variant in ExtraChi
      } ;
 
     QuestVP ip vp = {
diff --git a/src/chinese/unittest/future.gftest b/src/chinese/unittest/future.gftest
index e94f6a1d1..6a7110fad 100644
--- a/src/chinese/unittest/future.gftest
+++ b/src/chinese/unittest/future.gftest
@@ -1,5 +1,5 @@
 Lang: UseCl (TTAnt TFut ASimul) PPos (PredVP (UsePron i_Pron) (UseV die_V))
-LangChi: 我 就 会 死
+LangChi: 我 会 死
 LangEng: I will die
 
 Lang: ExtAdvS (SubjS if_Subj (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron i_Pron) (UseV sleep_V)))) (UseCl (TTAnt TFut ASimul) PPos (PredVP (UsePron she_Pron) (UseV walk_V)))
@@ -11,7 +11,7 @@ LangChi: 我 在 死
 LangEng: I am dying
 
 Lang: UseCl (TTAnt TFut ASimul) PNeg (PredVP (UsePron i_Pron) (UseV die_V))
-LangChi: 我 就 不 会 死
+LangChi: 我 不 会 死
 LangEng: I won't die
 
 Lang: UseQCl (TTAnt TFut ASimul) PPos (QuestCl (PredVP (UsePron i_Pron) (UseV die_V)))
@@ -24,9 +24,9 @@ LangChi: 我 不 会 死 吗
 LangEng: won't I die
 
 Lang: UseCl (TTAnt TPres ASimul) PNeg (PredVP (UsePron i_Pron) (ComplVQ know_VQ (UseQCl (TTAnt TFut ASimul) PPos (QuestCl (PredVP (UsePron i_Pron) (UseV die_V))))))
-LangChi: 我 不 知 道 我 会 不 会 死
+LangChi: 我 不 知 道 我 会 死 吗
 LangEng: I don't know if I will die
 
 Lang: UseCl (TTAnt TPres ASimul) PNeg (PredVP (UsePron i_Pron) (ComplVQ know_VQ (UseQCl (TTAnt TFut ASimul) PNeg (QuestCl (PredVP (UsePron i_Pron) (UseV die_V))))))
-LangChi:  我 不 知 道 我 不 会 死
+LangChi:  我 不 知 道 我 不 会 死 吗
 LangEng: I don't know if I won't die
\ No newline at end of file