diff --git a/examples/tutorial/resource-foods/ExtFoods.gf b/examples/tutorial/resource-foods/ExtFoods.gf index fa417190e..22b65a3c0 100644 --- a/examples/tutorial/resource-foods/ExtFoods.gf +++ b/examples/tutorial/resource-foods/ExtFoods.gf @@ -3,25 +3,26 @@ abstract ExtFoods = Foods ** { flags startcat=Move ; cat - Move ; - Verb ; - Guest ; - GuestKind ; + Move ; -- declarative, question, or imperative + Verb ; -- transitive verb + Guest ; -- guest in restaurant + GuestKind ; -- type of guest fun - MAssert : Phrase -> Move ; - MDeny : Phrase -> Move ; - MAsk : Phrase -> Move ; + MAssert : Phrase -> Move ; -- This pizza is warm. + MDeny : Phrase -> Move ; -- This pizza isn't warm. + MAsk : Phrase -> Move ; -- Is this pizza warm? - PVerb : Guest -> Verb -> Item -> Phrase ; - PVerbWant : Guest -> Verb -> Item -> Phrase ; + PVerb : Guest -> Verb -> Item -> Phrase ; -- we eat this pizza + PVerbWant : Guest -> Verb -> Item -> Phrase ; -- we want to eat this pizza - WhichVerb : Kind -> Guest -> Verb -> Move ; + WhichVerb : Kind -> Guest -> Verb -> Move ; -- Which pizza do you eat? WhichVerbWant : Kind -> Guest -> Verb -> Move ; - WhichIs : Kind -> Quality -> Move ; + -- Which pizza do you want to eat? + WhichIs : Kind -> Quality -> Move ; -- Which wine is Italian? - Do : Verb -> Item -> Move ; - DoPlease : Verb -> Item -> Move ; + Do : Verb -> Item -> Move ; -- Pay this wine! + DoPlease : Verb -> Item -> Move ; -- Pay this wine please! I, You, We : Guest ; diff --git a/examples/tutorial/resource-foods/ExtFoodsI.gf b/examples/tutorial/resource-foods/ExtFoodsI.gf index 57b8c1cf1..def336e28 100644 --- a/examples/tutorial/resource-foods/ExtFoodsI.gf +++ b/examples/tutorial/resource-foods/ExtFoodsI.gf @@ -6,7 +6,7 @@ incomplete concrete ExtFoodsI of ExtFoods = FoodsI ** open Syntax, LexFoods in { Move = Text ; Verb = V2 ; Guest = NP ; - GuestKind = N ; + GuestKind = CN ; lin MAssert p = mkText (mkS p) ; MDeny p = mkText (mkS negativePol p) ; @@ -43,7 +43,7 @@ incomplete concrete ExtFoodsI of ExtFoods = FoodsI ** open Syntax, LexFoods in { Eat = eat_V2 ; Drink = drink_V2 ; Pay = pay_V2 ; - Lady = lady_N ; - Gentleman = gentleman_N ; + Lady = mkCN lady_N ; + Gentleman = mkCN gentleman_N ; }