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/GreetingsFin.gf | 51 +++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 27 deletions(-)

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

diff --git a/examples/phrasebook/GreetingsFin.gf b/examples/phrasebook/GreetingsFin.gf
index 5900ee899..804ee8282 100644
--- a/examples/phrasebook/GreetingsFin.gf
+++ b/examples/phrasebook/GreetingsFin.gf
@@ -1,30 +1,27 @@
-concrete GreetingsFin of Greetings = open Prelude in {
-
-lincat 
-  Greeting, Politeness = SS ;
+concrete GreetingsFin of Greetings = SentencesFin [Greeting,mkGreeting] ** open Prelude in {
 
 lin 
-  GBye = ss "hei hei" ;
-  GCheers = ss "terveydeksi" ;
-  GDamn = ss "hitto" ;
-  GExcuse, GExcusePol = ss "anteeksi" ;
-  GGoodDay = ss "hyvää päivää" ;
-  GGoodEvening = ss "hyvää iltaa" ;
-  GGoodMorning = ss "hyvää huomenta" ;
-  GGoodNight = ss "hyvää yötä" ;
-  GGoodbye = ss "näkemiin" ;
-  GHello = ss "hei" ;
-  GHelp = ss "apua" ;
-  GHowAreYou = ss "mitä kuuluu" ;
-  GLookOut = ss "varo" ;
-  GNiceToMeetYou = ss "hauska tutustua" ;
-  GPleaseGive = ss "ole hyvä" ;
-  GPleaseGivePol = ss "olkaa hyvä" ;
-  GSeeYouSoon = ss "nähdään pian" ;
-  GSorry, GSorryPol = ss "anteeksi" ;
-  GThanks = ss "kiitos" ;
-  GTheCheck = ss "lasku" ;
-  GCongratulations = ss "onnittelut";
-  GHappyBirthday = ss "hyvää syntymäpäivää" ;
-  GGoodLuck = ss "onnea" ; 
+  GBye = mkGreeting "hei hei" ;
+  GCheers = mkGreeting "terveydeksi" ;
+  GDamn = mkGreeting "hitto" ;
+  GExcuse, GExcusePol = mkGreeting "anteeksi" ;
+  GGoodDay = mkGreeting "hyvää päivää" ;
+  GGoodEvening = mkGreeting "hyvää iltaa" ;
+  GGoodMorning = mkGreeting "hyvää huomenta" ;
+  GGoodNight = mkGreeting "hyvää yötä" ;
+  GGoodbye = mkGreeting "näkemiin" ;
+  GHello = mkGreeting "hei" ;
+  GHelp = mkGreeting "apua" ;
+  GHowAreYou = mkGreeting "mitä kuuluu" ;
+  GLookOut = mkGreeting "varo" ;
+  GNiceToMeetYou = mkGreeting "hauska tutustua" ;
+  GPleaseGive = mkGreeting "ole hyvä" ;
+  GPleaseGivePol = mkGreeting "olkaa hyvä" ;
+  GSeeYouSoon = mkGreeting "nähdään pian" ;
+  GSorry, GSorryPol = mkGreeting "anteeksi" ;
+  GThanks = mkGreeting "kiitos" ;
+  GTheCheck = mkGreeting "lasku" ;
+  GCongratulations = mkGreeting "onnittelut";
+  GHappyBirthday = mkGreeting "hyvää syntymäpäivää" ;
+  GGoodLuck = mkGreeting "onnea" ; 
 }
-- 
cgit v1.2.3