From 979683e5bd3271519f45c4de89861b2d0df18d5a Mon Sep 17 00:00:00 2001
From: skoester <skoester@techfak.uni-bielefeld.de>
Date: Sat, 25 Apr 2015 08:08:57 +0200
Subject: [PATCH] updated grammar for wake me up

---
 ps-grammar/wakeMeUp/wakeMeUp.jsgf | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ps-grammar/wakeMeUp/wakeMeUp.jsgf b/ps-grammar/wakeMeUp/wakeMeUp.jsgf
index 56d4171b..4ba31a96 100644
--- a/ps-grammar/wakeMeUp/wakeMeUp.jsgf
+++ b/ps-grammar/wakeMeUp/wakeMeUp.jsgf
@@ -1,14 +1,16 @@
 #JSGF V1.0;
 grammar ToBI_WakeMeUp;
 
-public <task> = <snack> | <cereal> | <milk>; 
+public <task> = [<temp>] (<snack> | <cereal> | <milk>) [please] [tobi | robot]; 
 
-<snack> = <snack_items> with ((<cereal_items> and <milk_items>) | ([<milk_items> and] <cereal_items>));
+<snack> = <snack_items> (with | and) ((<cereal_items> and <milk_items>) | ([<milk_items> and] <cereal_items>));
 
-<cereal> = <cereal_items> with ((<snack_items> and <milk_items>) | ( [<milk_items> and] <snack_items>));
+<cereal> = <cereal_items> (with | and) ((<snack_items> and <milk_items>) | ( [<milk_items> and] <snack_items>));
 
-<milk> = <milk_items> with ((<cereal_items> and <snack_items>) | (<snack_items> and <cereal_items>));
+<milk> = <milk_items> (with | and) ((<cereal_items> and <snack_items>) | (<snack_items> and <cereal_items>));
 
 <milk_items> = fresh_milk | meadow_milk | whole_milk;
 <cereal_items> = (cranberry cereals) | (muesli cereals) | (chocolate cereals);
 <snack_items> = noodles | pringles | (bubble mint) | red_bull | (ice tea) | fanta | oblates | chocosticks | coke | (bubble gum) | coffee | peanut;
+
+<temp> = ([tobi | robot] [please] (bring me));
-- 
GitLab