From 67fefa20a5ab06ffabf10da896962379f0103cd6 Mon Sep 17 00:00:00 2001 From: aarne Date: Sun, 24 Aug 2014 14:28:48 +0000 Subject: [PATCH] made the "how old" construction in Chinese more efficient by moving variants to the top level; the resulting rule is the same. This kind of inefficiencies are best found if you compile with the -v option and check for constructors creating unexpectedly many PGF rules. --- examples/phrasebook/WordsChi.gf | 2 +- lib/src/chinese/ConstructionChi.gf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/phrasebook/WordsChi.gf b/examples/phrasebook/WordsChi.gf index 188985818..5b9baeb73 100644 --- a/examples/phrasebook/WordsChi.gf +++ b/examples/phrasebook/WordsChi.gf @@ -158,7 +158,7 @@ AWantGo p place = mkCl p.name want_VV (mkVP L.go_V place.name) ; -- miscellaneous QWhatName p = lin QS {s = \\_ => p.name.s ++ R.word "贵姓"} ; --- - QWhatAge p = lin QS {s = \\_ => p.name.s ++ (R.word "几岁" | R.word "多大")} ; --- + QWhatAge p = lin QS {s = \\_ => p.name.s ++ R.word "几岁"} | lin QS {s = \\_ => p.name.s ++ R.word "多大"} ; --- HowMuchCost item = lin QS {s = \\_ => item.s ++ R.word "是多少钱"} ; ItCost item price = mkCl item (mkV2 "是") price ; diff --git a/lib/src/chinese/ConstructionChi.gf b/lib/src/chinese/ConstructionChi.gf index 07bda5a39..4c2c5e7ba 100644 --- a/lib/src/chinese/ConstructionChi.gf +++ b/lib/src/chinese/ConstructionChi.gf @@ -14,7 +14,7 @@ lin married_Cl x y = mkCl (lin NP x) L.married_A2 (lin NP y) ; what_name_QCl x = mkQCl whatSg_IP (mkClSlash (lin NP x) (mkV2 (mkV "叫"))) ; - how_old_QCl x = {s = \\_,p,a => x.s ++ (R.word "几岁" | R.word "多大")} ; ---- + how_old_QCl x = {s = \\_,p,a => x.s ++ R.word "几岁"} | {s = \\_,p,a => x.s ++ R.word "多大"} ; ---- ---- how_far_QCl x = mkQCl (E.IAdvAdv (ss "far")) (lin NP x) ; -- some more things