From 5cb147fa19fdd348a24bc9d90fc8b5a6041530d8 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 30 Mar 2010 18:48:59 +0000 Subject: simplified the treatment of politeness in Phrasebook --- examples/phrasebook/WordsEng.gf | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'examples/phrasebook/WordsEng.gf') diff --git a/examples/phrasebook/WordsEng.gf b/examples/phrasebook/WordsEng.gf index d1ce58811..2e94eb4ff 100644 --- a/examples/phrasebook/WordsEng.gf +++ b/examples/phrasebook/WordsEng.gf @@ -1,7 +1,7 @@ -- (c) 2009 Aarne Ranta under LGPL concrete WordsEng of Words = SentencesEng ** - open SyntaxEng, ParadigmsEng, IrregEng, (R = Roles) in { + open SyntaxEng, ParadigmsEng, IrregEng in { lin Wine = mkCN (mkN "wine") ; Beer = mkCN (mkN "beer") ; @@ -33,13 +33,11 @@ concrete WordsEng of Words = SentencesEng ** Romanian = mkNP (mkPN "Romanian") ; Swedish = mkNP (mkPN "Swedish") ; - AWant p obj = neutralA (mkCl (np p) (mkV2 (mkV "want")) obj) ; - ALike p item = neutralA (mkCl (np p) (mkV2 (mkV "like")) item) ; - AHave p kind = neutralA (mkCl (np p) have_V2 (mkNP kind)) ; - ASpeak p lang = neutralA (mkCl (np p) (mkV2 IrregEng.speak_V) lang) ; - ALove p q = neutralA (mkCl (np p) (mkV2 (mkV "love")) (np q)) ; + AWant p obj = mkCl p (mkV2 (mkV "want")) obj ; + ALike p item = mkCl p (mkV2 (mkV "like")) item ; + AHave p kind = mkCl p have_V2 (mkNP kind) ; + ASpeak p lang = mkCl p (mkV2 IrregEng.speak_V) lang ; + ALove p q = mkCl p (mkV2 (mkV "love")) q ; + - oper - neutralA : Cl -> {s : R.Politeness => Cl} = \pol -> {s = \\_ => pol} ; - np : {s : R.Politeness => NP} -> NP = \p -> p.s ! R.PPolite ; } -- cgit v1.2.3