add sound

[des2015.git] / dsl / xtend / src / robots / missions / TaskDSL.xtext

diff --git a/dsl/xtend/src/robots/missions/TaskDSL.xtext b/dsl/xtend/src/robots/missions/TaskDSL.xtext
index 641e3c3..7fb398a 100644 (file)
--- a/dsl/xtend/src/robots/missions/TaskDSL.xtext
+++ b/dsl/xtend/src/robots/missions/TaskDSL.xtext
@@ -17,22 +17,24 @@ StoppingExpression:
        scond=StoppingCondition;
 
 StoppingCondition:
-       'Collected at least' colors+=Color+ |
+       'flag set' varName=ID |
        'Touched on' touch=LeftRight |
        'Light on' light=LeftRight |
        'Distance dangerous at ' dist=BackFront |
        'Color is' color=Color |
        {StoppingCondition} 'Never';
 
-Behaviour: 'Behaviour' name=ID 
+Behaviour: 'Behaviour' name=ID
        'take control:' tc=StoppingExpression?
-       'action:' actions+=Action+;
+       'action:' actions+=Action+
+       ;
 
 Action:
        whichMotor=LeftRight 'motor' moveDir=Direction ('with speed' spd=INT 'acceleration' acc=INT)? |
        'turn' turnType=Turn ('with speed' spd=INT 'acceleration' acc=INT)? |
        'measure' rl=RockLake|
-       'wait' time=Time;
+       'wait' time=Time |
+       'set flag' varName=ID;
        
 Turn:
        turnDir=LeftRight 'exactly' degrees=INT 'degrees'|