From 9ed72885f70a073104d09783be62ca735a0cd573 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Thu, 29 Apr 2010 06:05:45 +0000
Subject: [PATCH] used AdvIAdv to complete PhrasebookSwe

---
 examples/phrasebook/WordsSwe.gf | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/examples/phrasebook/WordsSwe.gf b/examples/phrasebook/WordsSwe.gf
index 002befb08..9d765fae0 100644
--- a/examples/phrasebook/WordsSwe.gf
+++ b/examples/phrasebook/WordsSwe.gf
@@ -186,13 +186,14 @@ concrete WordsSwe of Words = SentencesSwe **
 
 -- transports
 
-    HowFar place = mkQS (mkQCl (ExtraSwe.IAdvAdv L.far_Adv) place.name) ;
-{-
-    HowFarFrom : Place -> Place -> Question ;     -- how far is the center from the hotel ?
-    HowFarFromBy : Place -> Place -> ByTransport -> Question ; 
-                                            -- how far is the airport from the hotel by taxi ? 
-    HowFarBy : Place -> Transport -> Question ;   -- how far is the museum by bus ?
--}                          
+    HowFar place = mkQS (mkQCl far_IAdv place.name) ;
+    HowFarFrom x y = mkQS (mkQCl (mkIAdv far_IAdv (SyntaxSwe.mkAdv from_Prep x.name)) y.name) ;
+    HowFarFromBy x y t = 
+      mkQS (mkQCl (mkIAdv (mkIAdv far_IAdv (SyntaxSwe.mkAdv from_Prep x.name)) t) y.name) ;
+    HowFarBy y t = mkQS (mkQCl (mkIAdv far_IAdv t.by) y.name) ; 
+
+oper far_IAdv = ExtraSwe.IAdvAdv L.far_Adv ;
+lin
     WhichTranspPlace trans place = 
       mkQS (mkQCl (mkIP which_IDet trans.name) (mkVP (mkVP L.go_V) place.to)) ;