From e36cc73b0fd6f0be4c1c8809db73f997d1484e9d Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Mon, 18 Oct 2010 12:28:39 +0000
Subject: in tutorial/smart remove the hack that forced the proof object to be
 resolved

---
 examples/tutorial/smart/SmartEng.gf | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

(limited to 'examples/tutorial/smart/SmartEng.gf')

diff --git a/examples/tutorial/smart/SmartEng.gf b/examples/tutorial/smart/SmartEng.gf
index c5d9ac090..6c00fc7ff 100644
--- a/examples/tutorial/smart/SmartEng.gf
+++ b/examples/tutorial/smart/SmartEng.gf
@@ -18,16 +18,16 @@ lincat
   Action = {s : VForm => Str ; part : Str} ;
   Device = {s : Str ; n : Number} ;
   Location = SS ;
-  Switchable = SS ;
-  Dimmable = SS ;
-  Statelike = SS ;
+  Switchable = {} ;
+  Dimmable = {} ;
+  Statelike = {} ;
 
 lin
   UCommand  c = c ;
   UQuestion q = q ;
 
   CAction _ act dev = ss (act.s ! VImp ++ bothWays act.part dev.s) ;
-  QAction _ act st dev = ss (be dev.n ++ dev.s ++ act.s ! VPart ++ act.part ++ st.s) ;
+  QAction _ act _ dev = ss (be dev.n ++ dev.s ++ act.s ! VPart ++ act.part) ;
 
   DKindOne  k = {
     s = "the" ++ k.s ! Sg ; 
@@ -45,10 +45,10 @@ lin
   light = mkNoun "light" ;
   fan = mkNoun "fan" ;
 
-  switchOn _ proof = mkVerb proof.s "switch" "switched" "on" ;
-  switchOff _ proof = mkVerb proof.s "switch" "switched" "off" ;
+  switchOn _ _ = mkVerb "switch" "switched" "on" ;
+  switchOff _ _ = mkVerb "switch" "switched" "off" ;
 
-  dim _ proof = mkVerb proof.s "dim" "dimmed" [] ;
+  dim _ _ = mkVerb "dim" "dimmed" [] ;
 
   kitchen = ss "kitchen" ;
   livingRoom = ss ["living room"] ;
@@ -61,10 +61,10 @@ oper
       }
     } ;
   
-  mkVerb : (_,_,_,_ : Str) -> {s : VForm => Str ; part : Str} = \proof,go,gone,away -> {
+  mkVerb : (_,_,_ : Str) -> {s : VForm => Str ; part : Str} = \go,gone,away -> {
     s = table {
-      VImp => proof++go ;
-      VPart => proof++gone
+      VImp => go ;
+      VPart => gone
       } ;
     part = away
     } ;
@@ -74,14 +74,5 @@ oper
     Pl => "are"
     } ;
 
-  hidden : SS = ss [] ;
-lin
-  switchable_light = hidden ;
-  switchable_fan = hidden ;
-  dimmable_light = hidden ;
-
-  statelike_switchOn _ _ = hidden ;
-  statelike_switchOff _ _ = hidden ;
-
 }
 
-- 
cgit v1.2.3