From 83408d5643e17566ed26a2990d6580511703fbc8 Mon Sep 17 00:00:00 2001
From: Tiago 47c <pal@neuromancer>
Date: Thu, 8 Apr 2021 15:16:14 +0000
Subject: [PATCH] Add nonterminals to cupro demo grammars

---
 psGrammar/demos/cupro/commands.jsgf     | 5 ++++-
 psGrammar/demos/cupro/kitchen_demo.jsgf | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/psGrammar/demos/cupro/commands.jsgf b/psGrammar/demos/cupro/commands.jsgf
index cd24d421..d566f3a4 100644
--- a/psGrammar/demos/cupro/commands.jsgf
+++ b/psGrammar/demos/cupro/commands.jsgf
@@ -1,7 +1,7 @@
 #JSGF V1.0;
 grammar commands;
 
-public <command> = [<robot>] ( <followMe> | <ordering> | <learn> | <rec> | <count> | <explain> | <listen> | <hand> | <see> | <save> | <who> | <gripper> | <demo> | <grasp>);
+public <command> = [<robot>] ( <followMe> | <ordering> | <learn> | <rec> | <count> | <explain> | <listen> | <hand> | <see> | <save> | <who> | <gripper> | <demo> | <grasp> | <kitchenDrawer> | <cleanup> | <setTable> );
 
 <robot> = (tiago | robot | tobi);
 
@@ -19,3 +19,6 @@ public <command> = [<robot>] ( <followMe> | <ordering> | <learn> | <rec> | <coun
 <gripper> = (show me your gripper);
 <demo> = (end the (demonstration | demo));
 <grasp> = ((grasp | give ) [me] ( an | the ) object);
+<kitchenDrawer> = (tell me about the kitchen);
+<cleanup> = (clean up the table);
+<setTable> = (set the table);
diff --git a/psGrammar/demos/cupro/kitchen_demo.jsgf b/psGrammar/demos/cupro/kitchen_demo.jsgf
index 7d546c35..fd075eb5 100644
--- a/psGrammar/demos/cupro/kitchen_demo.jsgf
+++ b/psGrammar/demos/cupro/kitchen_demo.jsgf
@@ -1,7 +1,7 @@
 #JSGF V1.0;
 grammar commands;
 
-public <command> = [<robot>] ( <demo> | <save> | <place> | <introduction>);
+public <command> = [<robot>] ( <demo> | <save> | <place> | <introduction> | <setTable>);
 
 <robot> = (robot | tiago | tobi);
 
@@ -9,3 +9,7 @@ public <command> = [<robot>] ( <demo> | <save> | <place> | <introduction>);
 <save> = (save location);
 <place> = (go to);
 <introduction> = (introduce yourself);
+
+<setTable> = (set the table for <guestNumber>);
+
+<guestNumber> = (one guest) | (two guests);
-- 
GitLab