everywhere und somewhere

pocketsphinxAdapter/grammar/gprs/gprs.jsgf

@@ -11,7 +11,7 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <pointat_command> = <pointatVerb> [<article>] <location>;
 <learn_command> = <learnVerb> [<article>] (<person> | <location>);
 <cleanup_command> = <cleanupVerb> <article> <room_class>;
-<show_command> = <showVerb> [<person>] [<article>] <grab_object> | <showVerb> [<person>] [the (path|way) to] [<article>] <location>; 
+<show_command> = <showVerb> [<person>] (([<article>] <grab_object>) | ([the (path|way) to] [<article>] <location>)); 
 
 <bringVerb> = bring | carry | retrieve | fetch | get | give | put | attend | deliver | convey | gather | (pick up) | take;
 <findVerb> = find | search [for] | check [for] | acquire | attain | obtain;
@@ -32,9 +32,9 @@ public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 <snack_class> = chocolate | cookies | drops | cracker;
 <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;
+<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 | everywhere | apartment;
 
-<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;
+<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 | everywhere | apartment;
 
 <appliance_class> = stove | sink | fridge | tv_counter;
 <shelf_class> = bar | kitchen_counter | cupboard | dresser | side_board | book_shelf | pantry | cabinet;