finished our trimmed grammar

psGrammar/tasks/gpsr/eegpsr23.jsgf

@@ -4,11 +4,15 @@ grammar speechRecognition;
 
 public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 
-<command> 			= (<cmd>);
+<command>               = <CMDcountObj> | <CMDtransferObj> | <CMDfollow> | <CMDgreetTwo>;
 
-<cmd>               = <countObj>;
+<CMDcountObj>              = (<V_count> <NP_category> (items | objects) at <NP_placement> and (inform | (report to))  <NP_me>) | (<V_count> <NP_category> (items | objects) are in <NP_placement>);
 
-<countObj>              = (<V_count> <NP_category> (items | objects) at <NP_placement> and (inform | (report to))  <NP_me>) | (<V_count> <NP_category> (items | objects) are in <NP_placement>);
+<CMDtransferObj>           = <V_deliver> <NP_me> some <NP_category> from <NP_placement>;
+
+<CMDfollow>                = <V_follow> the person at <NP_beacon>;
+
+<CMDgreetTwo>                 = <V_meet> <NP_name> at <NP_beacon> then <V_meet> <NP_personalpron> in <NP_roomTwo>;
 
 <deliverPrep> 			= to;
 <placePrep> 			= on;
@@ -30,11 +34,11 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <V_deliver> 			= bring | give | deliver;
 <V_bring> 			= bring | give;
 <V_go> 			= go | navigate;
-<V_find> 			= find | locate | (look for);
+<V_find> 			= find | locate | (look for) | pinpoint | spot;
 <V_talk> 			= tell | say;
 <V_answer> 			= answer;
 <V_follow> 			= follow;
-<V_meet> 			= meet | face | contact | greet | find;
+<V_meet> 			= meet | face | contact | greet | find | (get to know) | (get acquainted with);
 <V_guide> 			= guide | escort | take | lead | accompany;
 <V_tell> 			= tell;
 <V_count> 			= (count the) | (tell me how many);
@@ -79,17 +83,19 @@ public <sentence> 		= [could you | robot | tobi | tiago] [please] <command>;
 <N_objectpron> 		= it;
 <N_objectprop> 		= biggest | largest | smallest | heaviest | lightest | thinnest;
 <N_me>        			= me;
-<N_gestperson> 		= (person waving) | (person (raising | rising) [their] (left|right) arm) | (person pointing to the (left|right)) | (person calling);
+<N_gestperson> 		= person <N_gesture>;
 <N_poseperson> 		= (person sitting) | (person standing) | (person lying down);
 <N_genderperson> 		= man | woman | boy | girl | (male person) | (female person);
 <N_genderpersonplural> 	= men | women | boys | girls | male | female;
-<N_agegenderpersonplural>	= people | men | women | guests | elders | children;
+<N_agegenderpersonplural>	= people | men | women | elders | children;
 <N_talk> 			= (something about yourself) | (the time) | (what day is (today | tomorrow)) | (your teams (name | country | affiliation)) | (the day of the (week | month)) | (a joke);
 <N_answer> 			= (a question);
 <N_personalpron> 		= them | her | his | him | it;
 <N_personattribute> 		= name | gender | pose;
 <N_posture> 			= sitting | standing | lying down;
 <N_three>           = three;
+<N_gesture>         = (waving) | (raising their left arm) | (raising their right arm) | (pointing to the left) | (pointing to the right);
+<N_clothed>         = (dressed in);
 
 <N_object>                  	= sponge | cleanser | (red wine) | (juice pack) | (cola) | (tropical juice) | (milk) | (iced tea) | (orange juice) | (tuna) | (tomato soup) | spam | mustard | (strawberry jello) | (chocolate jello) | (coffee grounds) | sugar | pear | plum | peach | lemon | orange | strawberry | banana | apple | (tennis ball) | (soccer ball) | (rubiks cube) | dice | baseball | pringles | cornflakes | cheezit | spoon | plate | cup | fork | bowl | knife;
 <N_category>                	= (cleaning supplies) | drinks | food | fruits | toys | snacks | dishes;