From 137a4ff7ef50e3f57400272a0288bf3739152067 Mon Sep 17 00:00:00 2001
From: skoester <skoester@techfak.uni-bielefeld.de>
Date: Thu, 23 Apr 2015 23:08:29 +0200
Subject: [PATCH] updated gpsr grammar

---
 ps-grammar/gpsr/gpsr.jsgf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ps-grammar/gpsr/gpsr.jsgf b/ps-grammar/gpsr/gpsr.jsgf
index 451ffc51..53d84e2e 100644
--- a/ps-grammar/gpsr/gpsr.jsgf
+++ b/ps-grammar/gpsr/gpsr.jsgf
@@ -12,21 +12,21 @@ public <task> = <location_task> | <item_task> | <interact_task>;
 
 
 
-<item_task> = (<interact_item> | <move_item> | <transport_item>) [[(and | then)] <task>];
+<item_task> = (<interact_item> | <move_item> | <transport_item> ) [[(and | then)] <task>];
 
 
-<interact_item> = <search_commands> [the] <items> [[and] <move_item>];
+<interact_item> = <search_commands> [the] <items> [[and] (<move_item> | <item_destination>)];
 <search_commands> = identify | detect | find | count;
 
 <move_item> = <move_commands> (([the | this] <items>) | it | them );
 <move_commands> = get | take | grasp ;
 
-<transport_item> = [and] <transport_commands> [<pron>] [<items>] [<item_destination>];
+<transport_item> = [and] <transport_commands> [<pron>] [<items> | <person>] [<item_destination>];
 <transport_commands> = (bring | carry | retrieve) [<noname>];
-<item_destination> = [<person>] [at | to] [<locations>];
+<item_destination> = [<noname>] [<pron>] [<locations>];
 
 
-<items> = [the] (coffee | crackers | milk | chocolate | coke | sponge);
+<items> = [<pron>] (coffee | crackers | milk | chocolate | coke | sponge);
 
 
 
-- 
GitLab