From a7962f3591583573cb5eca3d9272480404ea1a9a Mon Sep 17 00:00:00 2001
From: Leroy Ruegemer <lruegeme@techfak.uni-bielefeld.de>
Date: Tue, 1 Apr 2014 18:29:38 +0200
Subject: [PATCH] gprs

---
 ps-grammar/gprs/gprs.jsgf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ps-grammar/gprs/gprs.jsgf b/ps-grammar/gprs/gprs.jsgf
index 24aed0a9..d5980a58 100644
--- a/ps-grammar/gprs/gprs.jsgf
+++ b/ps-grammar/gprs/gprs.jsgf
@@ -26,10 +26,10 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <personal_pronoun> = him | her | me;
 <person_name> = james|john|robert|michael|william|david|richard|charles|linda|thomas|mary|patricia|joseph|dorothy|barbara|susan|jennifer|maria|elizabeth|margaret;
 
-<grab_object> = <cleaningstuff_class> | <drink_class> | <snack_class> | <food_class> | cleaningstuff | drink | snack | object | food | something | stuff | item;
+<grab_object> = <cleaningstuff_class> | <drink_class> | <snack_class> | <food_class> | cleaningstuff | drink | snack | object | food | something | stuff | item | beverage;
 <cleaningstuff_class> = deodorant | toothpaste | cleaner | fresh_discs | sponge;
-<drink_class> = beer_bottle | fanta | beer_can | coke | seven_up | chocolate_milk | energy_drink | orange_juice | apple_juice | milk;
-<snack_class> = chocolate | cookies | drops | cracker;
+<drink_class> = fanta | milk;
+<snack_class> = cookies;
 <food_class> = tomato_sauce | peanut_butter | chicken_noodles | marmalade | veggie_noodles | garlic_sauce; 
 
 <location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment | furniture;
@@ -37,7 +37,7 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <second_location> = <appliance_class> | <shelf_class> | <seat_class> | <table_class> | <room_class> | <utensil_class> | <door_class> | door | seating | utensil | location | room | appliance | shelf | seat | table | somewhere | apartment;
 
 <appliance_class> = stove | sink | fridge | tv_counter;
-<shelf_class> = bar | kitchen_counter | cupboard | dresser | side_board | book_shelf | pantry | cabinet;
+<shelf_class> = sideboard;
 <seat_class> = <seating_class>;
 <seating_class> = bench | bed | sofa | armchair;
 <table_class> = hallway_table | side_table | kitchen_table | dinner_table | couch_table | bedsidetable;
-- 
GitLab