From e8adb69e3de69dba87beb59279365ecadee22085 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Tue, 7 Dec 2010 12:32:57 +0000
Subject: slight refactoring of Phrasebook, with less start words

---
 examples/phrasebook/GreetingsFre.gf | 53 +++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

(limited to 'examples/phrasebook/GreetingsFre.gf')

diff --git a/examples/phrasebook/GreetingsFre.gf b/examples/phrasebook/GreetingsFre.gf
index f6efdbeb3..1e2743ec2 100644
--- a/examples/phrasebook/GreetingsFre.gf
+++ b/examples/phrasebook/GreetingsFre.gf
@@ -1,32 +1,29 @@
-concrete GreetingsFre of Greetings = open Prelude in {
-
-lincat 
-  Greeting = SS ;
+concrete GreetingsFre of Greetings = SentencesFre [Greeting,mkGreeting] ** open Prelude in {
 
 lin 
-  GBye = ss "au revoir" ;
-  GCheers = ss "santé" ;
-  GDamn = ss "maudit" ;
-  GExcuse = ss "excuse-moi" ;
-  GExcusePol = ss "excusez-moi" ;
-  GGoodDay = ss "bonjour" ;
-  GGoodEvening = ss "bon soir" ;
-  GGoodMorning = ss "bonjour" ;
-  GGoodNight = ss "bonne nuit" ;
-  GGoodbye = ss "au revoir" ;
-  GHello = ss "salut" ;
-  GHelp = ss "au secours" ;
-  GHowAreYou = ss "comment ça va" ;
-  GLookOut = ss "attention" ;
-  GNiceToMeetYou = ss "enchanté" ;
-  GPleaseGive = ss "s'il te plaît" ;
-  GPleaseGivePol = ss "s'il vous plaît" ;
-  GSeeYouSoon = ss "à bientôt" ;
-  GSorry, GSorryPol = ss "pardon" ;
-  GThanks = ss "merci" ;
-  GTheCheck = ss "l'addition" ;
-  GCongratulations = ss "félicitations";
-  GHappyBirthday = ss "joyeux anniversaire" ;
-  GGoodLuck = ss "bonne chance" ; 
+  GBye = mkGreeting "au revoir" ;
+  GCheers = mkGreeting "santé" ;
+  GDamn = mkGreeting "maudit" ;
+  GExcuse = mkGreeting "excuse-moi" ;
+  GExcusePol = mkGreeting "excusez-moi" ;
+  GGoodDay = mkGreeting "bonjour" ;
+  GGoodEvening = mkGreeting "bon soir" ;
+  GGoodMorning = mkGreeting "bonjour" ;
+  GGoodNight = mkGreeting "bonne nuit" ;
+  GGoodbye = mkGreeting "au revoir" ;
+  GHello = mkGreeting "salut" ;
+  GHelp = mkGreeting "au secours" ;
+  GHowAreYou = mkGreeting "comment ça va" ;
+  GLookOut = mkGreeting "attention" ;
+  GNiceToMeetYou = mkGreeting "enchanté" ;
+  GPleaseGive = mkGreeting "s'il te plaît" ;
+  GPleaseGivePol = mkGreeting "s'il vous plaît" ;
+  GSeeYouSoon = mkGreeting "à bientôt" ;
+  GSorry, GSorryPol = mkGreeting "pardon" ;
+  GThanks = mkGreeting "merci" ;
+  GTheCheck = mkGreeting "l'addition" ;
+  GCongratulations = mkGreeting "félicitations";
+  GHappyBirthday = mkGreeting "joyeux anniversaire" ;
+  GGoodLuck = mkGreeting "bonne chance" ; 
 
 }
-- 
cgit v1.2.3