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/GreetingsSwe.gf | 49 +++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

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

diff --git a/examples/phrasebook/GreetingsSwe.gf b/examples/phrasebook/GreetingsSwe.gf
index 7f6764f09..15dd59a0c 100644
--- a/examples/phrasebook/GreetingsSwe.gf
+++ b/examples/phrasebook/GreetingsSwe.gf
@@ -1,30 +1,27 @@
-concrete GreetingsSwe of Greetings = open Prelude in {
-
-lincat 
-  Greeting = SS ;
+concrete GreetingsSwe of Greetings = SentencesSwe [Greeting,mkGreeting] ** open Prelude in {
 
 lin 
-  GBye = ss "hej då" ;
-  GCheers = ss "skål" ;
-  GDamn = ss "fan" ;
-  GExcuse, GExcusePol = ss "ursäkta" ;
-  GGoodDay = ss "god dag" ;
-  GGoodEvening = ss "god afton" ;
-  GGoodMorning = ss "god morgon" ;
-  GGoodNight = ss "god natt" ;
-  GGoodbye = ss "hej då" ;
-  GHello = ss "hej" ;
-  GHelp = ss "hjälp" ;
-  GHowAreYou = ss "hur står det till" ;
-  GLookOut = ss "se upp" ;
-  GNiceToMeetYou, GNiceToMeetYouPol = ss "trevligt att träffas" ;
-  GPleaseGive, GPleaseGivePol = ss "var så god" ;
-  GSeeYouSoon = ss "vi ses snart" ;
-  GSorry, GSorryPol = ss "förlåt" ;
-  GThanks = ss "tack" ;
-  GTheCheck = ss "notan" ;
-  GCongratulations = ss "grattis";
-  GHappyBirthday = ss "grattis på födelsedagen" ;
-  GGoodLuck = ss "lycka till" ; 
+  GBye = mkGreeting "hej då" ;
+  GCheers = mkGreeting "skål" ;
+  GDamn = mkGreeting "fan" ;
+  GExcuse, GExcusePol = mkGreeting "ursäkta" ;
+  GGoodDay = mkGreeting "god dag" ;
+  GGoodEvening = mkGreeting "god afton" ;
+  GGoodMorning = mkGreeting "god morgon" ;
+  GGoodNight = mkGreeting "god natt" ;
+  GGoodbye = mkGreeting "hej då" ;
+  GHello = mkGreeting "hej" ;
+  GHelp = mkGreeting "hjälp" ;
+  GHowAreYou = mkGreeting "hur står det till" ;
+  GLookOut = mkGreeting "se upp" ;
+  GNiceToMeetYou, GNiceToMeetYouPol = mkGreeting "trevligt att träffas" ;
+  GPleaseGive, GPleaseGivePol = mkGreeting "var så god" ;
+  GSeeYouSoon = mkGreeting "vi ses snart" ;
+  GSorry, GSorryPol = mkGreeting "förlåt" ;
+  GThanks = mkGreeting "tack" ;
+  GTheCheck = mkGreeting "notan" ;
+  GCongratulations = mkGreeting "grattis";
+  GHappyBirthday = mkGreeting "grattis på födelsedagen" ;
+  GGoodLuck = mkGreeting "lycka till" ; 
 
 }
-- 
cgit v1.2.3