grammar update for eindhoven

psGrammar/object/drinks.jsgf

@@ -4,7 +4,9 @@ public <statement> = [<verb>] [<article>] <objects> [please];
 
 <objects> = <object>;
 <object> = <drink_class>;
-<drink_class> = (energy drink) | milk | coffee | coke;
+<drink_class> = water | milk | smoothie | tea;
 
 <verb> = (bring me) | bring | carry | retrieve | fetch | get | (get me) | give | find | search for | put | learn | remember | memorize;
 <article> = the | an | some | a | this;
+
+

psGrammar/object/object.jsgf

@@ -4,13 +4,15 @@ public <statement> = [<verb>] [<article>] <objects> [please];
 
 <objects> = <object>;
 <object> = <grab_object>;
-<grab_object> = <cleaning_class> | <drink_class> | <snack_class> | <food_class> | tool | (bathroom stuff) | (cleaning stuff) | drinks | snacks | object | food | something | stuff | item | beverage | things;
-<cleaning_class> = brush | detergent | shampoo | sponge | toothpaste;
-<drink_class> = (energy drink) | milk | coffee;
-<snack_class> = (chocolate cookies) | chips | biscuits | bread | pringles | (strawberry cookies);
-<food_class> = (baby food) | crackers | coffee | yeast | noodles | beans; 
-
+<grab_object> = <cleaning_class> | <drink_class> | <candy_class> | <food_class> | <container_class> | tool | (bathroom stuff) | (cleaning stuff) | drinks | snacks | object | food | something | stuff | item | beverage | things;
+<cleaning_class> = cloth | (dishwashing soap) | soap | sponge | (toilet paper);
+<drink_class> = water | milk | smoothie | tea | (kinder coke);
+<candy_class> = (little bananas) | licorice | tuc | (pineapple cookies) | (strawberry cookies) | wafer;
+<food_class> = rice | paprika | macaroni | lemon | (chocolate sprinkles) | avocado | apple; 
+<container_class> = bowl | plate | (storage box) ;
 
 
 <verb> = (bring me) | bring | carry | retrieve | fetch | get | give | find | search for | put | learn | remember | memorize;
 <article> = the | an | some | a | this;
+
+

psGrammar/person/person.jsgf

 #JSGF V1.0;
 grammar ToBI_person;
-public <statement> = <naming> | <N_object> ;
+public <statement> = <naming> ;
 <naming> = [(my name is) | (i am)] <name>;
 <name> = emma | olivia | sophia | isabella | ava | mia | emily | abigail | madison | charlotte | noah | liam | mason | jacob | william | ethan | michael | alexander | james | daniel;
-<N_object> = (apple | avocado | bowl | (chocolate sprinkles) | cloth | (dishwashing soap) | (kinder coke) | lemon | licorice | (little bananas) | macaroni | milk | (pineapple cookies) | paprika | plate | rice | smoothie | soap | sponge | (storage box) | (strawberry cookies) | tea | (toilet paper) | tuc | wafer | water);