From b9fcba00cf1936887e86a98e4992c0f5565e47d2 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 6 Apr 2010 20:35:12 +0000 Subject: improved the performance of Romance while retaining correct agreement ; removed Diff modules from Phrasebook --- examples/phrasebook/WordsFin.gf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'examples/phrasebook/WordsFin.gf') diff --git a/examples/phrasebook/WordsFin.gf b/examples/phrasebook/WordsFin.gf index 1bd93d940..f37b9b45b 100644 --- a/examples/phrasebook/WordsFin.gf +++ b/examples/phrasebook/WordsFin.gf @@ -3,7 +3,7 @@ concrete WordsFin of Words = SentencesFin ** open SyntaxFin, ParadigmsFin, (L = LangFin), - DiffPhrasebookFin, Prelude, (E = ExtraFin) in { + Prelude, (E = ExtraFin) in { lin Wine = mkCN (mkN "viini") ; Beer = mkCN (mkN "olut" "oluita") ; @@ -61,7 +61,7 @@ concrete WordsFin of Words = SentencesFin ** Saturday = let d = "lauantai" in mkDay (mkPN d) (d + "sin") ; Sunday = let d = "sunnuntai" in mkDay (mkPN d) (d + "sin") ; - AWant p obj = mkCl p.name want_V2 obj ; + AWant p obj = mkCl p.name (mkV2 "haluta") obj ; ALike p item = mkCl p.name L.like_V2 item ; ASpeak p lang = mkCl p.name (mkV2 (mkV "puhua") partitive) lang ; ALove p q = mkCl p.name (mkV2 (mkV "rakastaa") partitive) q.name ; @@ -86,6 +86,9 @@ concrete WordsFin of Words = SentencesFin ** PropOpenDay p d = mkCl p.name (mkVP (mkVP open_Adv) d.habitual) ; PropClosedDay p d = mkCl p.name (mkVP (mkVP closed_Adv) d.habitual) ; + HowMuchCost item = mkQS (mkQCl how8much_IAdv (mkCl item (mkV "maksaa"))) ; + ItCost item price = mkCl item (mkV2 (mkV "maksaa")) price ; + oper mkNat : PN -> PN -> A -> {lang : NP ; prop : A ; country : NP} = \nat,co,pro -> -- cgit v1.2.3