diff --git a/psGrammar/tasks/gpsr/gpsr2.jsgf b/psGrammar/tasks/gpsr/gpsr2.jsgf index b8c7aa2a87ad0327ec69a4c91e1e5f1758c982e7..2fff02a3b3695f3f81c7877887b7f582a4493b91 100644 --- a/psGrammar/tasks/gpsr/gpsr2.jsgf +++ b/psGrammar/tasks/gpsr/gpsr2.jsgf @@ -57,7 +57,7 @@ public <sentence> = ([tobi | biron] <VP1> ([and|then] <VP2>) [([and|then] <VP3>) <N_class> = food | container | (cleaning stuff) | drink | candy ; <N_place> = (bedroom | chair | fridge | bed | nightstand | closet | kitchen |(kitchen trashbin) | (kitchen counter) | sink | (hallway trashbin) | (tv stand) | livingroom | couch | sideboard | bookcase | (dinner table) | (dinner chair) | (dinner chairs)); -<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| (<N_random_object> object) | (<N_random_object> thing) | (<N_random_object> box)); +<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 ); <N_random_object> = (<color> | <shape> | <color> <shape> | <shape> <color> ); <color> = (green | red | blue | black | white | yellow | purple | pink | brown | orange);