repositories
/
des2015.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
push
[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
65351f9
..
35ed5b0
100644
(file)
--- a/
dsl/xtend/src/robots/missions/TaskDSL.xtext
+++ b/
dsl/xtend/src/robots/missions/TaskDSL.xtext
@@
-20,7
+20,7
@@
StoppingCondition:
'Collected at least' colors+=Color+ |
'Touched on' touch=LeftRight |
'Light on' light=LeftRight |
'Collected at least' colors+=Color+ |
'Touched on' touch=LeftRight |
'Light on' light=LeftRight |
- '
No object in sight on
' dist=BackFront |
+ '
Distance dangerous at
' dist=BackFront |
'Color is' color=Color;
Behaviour: 'Behaviour' name=ID
'Color is' color=Color;
Behaviour: 'Behaviour' name=ID
@@
-40,11
+40,9
@@
enum RockLakeE: ROCK='rock' | LAKE='lake';
Direction: d=DirectionE;
enum DirectionE: BACKWARDS = 'backward' | FORWARDS = 'forward';
Operator: d=OperatorE;
Direction: d=DirectionE;
enum DirectionE: BACKWARDS = 'backward' | FORWARDS = 'forward';
Operator: d=OperatorE;
-enum OperatorE: AND = '
and' | OR = 'or
';
+enum OperatorE: AND = '
&&' | OR = '||
';
BackFront: d=BackFrontE;
enum BackFrontE: BACK = 'back' | FRONT = 'front';
BackFront: d=BackFrontE;
enum BackFrontE: BACK = 'back' | FRONT = 'front';
-Comparison: d=ComparisonE;
-enum ComparisonE: GE='>' | LE='<';
LeftRight: d=LeftRightE;
enum LeftRightE: LEFT='left' | RIGHT='right';
Color: d=ColorE;
LeftRight: d=LeftRightE;
enum LeftRightE: LEFT='left' | RIGHT='right';
Color: d=ColorE;