summaryrefslogtreecommitdiff
path: root/examples/regulus/toy1/Toy1Eng.gf
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2007-06-11 14:53:08 +0000
committeraarne <aarne@cs.chalmers.se>2007-06-11 14:53:08 +0000
commit75a9ea71a27cba432286f0b14fe0be31edff5752 (patch)
tree55c82418df60463ce388322902b34b20440b0f87 /examples/regulus/toy1/Toy1Eng.gf
parent2b438a6284564feec800e5bdca5fe006bf8aed11 (diff)
toy1 with classes and using resource API
Diffstat (limited to 'examples/regulus/toy1/Toy1Eng.gf')
-rw-r--r--examples/regulus/toy1/Toy1Eng.gf16
1 files changed, 12 insertions, 4 deletions
diff --git a/examples/regulus/toy1/Toy1Eng.gf b/examples/regulus/toy1/Toy1Eng.gf
index 1d71eabf1..30e861f44 100644
--- a/examples/regulus/toy1/Toy1Eng.gf
+++ b/examples/regulus/toy1/Toy1Eng.gf
@@ -24,7 +24,7 @@ lin
UQuestion q = q ;
CAction _ act dev = ss (act.s ! VImp ++ bothWays act.part dev.s) ;
- QAction _ act dev = ss (be dev.n ++ dev.s ++ act.s ! VPart ++ act.part) ;
+ QAction _ act st dev = ss (be dev.n ++ dev.s ++ act.s ! VPart ++ act.part ++ st.s) ;
DKindOne k = {
s = "the" ++ k.s ! Sg ;
@@ -42,10 +42,10 @@ lin
light = mkNoun "light" ;
fan = mkNoun "fan" ;
- switchOn _ = mkVerb "switch" "swithced" "on" ;
- switchOff _ = mkVerb "switch" "swithced" "off" ;
+ switchOn _ _ = mkVerb "switch" "swithced" "on" ;
+ switchOff _ _ = mkVerb "switch" "swithced" "off" ;
- dim = mkVerb "dim" "dimmed" [] ;
+ dim _ _ = mkVerb "dim" "dimmed" [] ;
kitchen = ss "kitchen" ;
livingRoom = ss ["living room"] ;
@@ -71,6 +71,14 @@ oper
Pl => "are"
} ;
+lin
+ switchable_light = ss [] ;
+ switchable_fan = ss [] ;
+ dimmable_fan = ss [] ;
+
+ statelike_switchOn _ _ = ss [] ;
+ statelike_switchOff _ _ = ss [] ;
+
}