X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=dsl%2Fxtend%2Fsrc%2Frobots%2Fmissions%2Fgenerator%2FTaskDSLGenerator.xtend;h=d4f6915b3b3b6d6e1bdaf43549e61ccda8ae7558;hb=34dae1e7f9c49481d90b3d26978cc5ab52ccc050;hp=d7ee2ed973351be8dac401cb1912fb981b91d371;hpb=55df69a5d4941d45bd3d860e6cea9b1357e09f98;p=des2015.git

diff --git a/dsl/xtend/src/robots/missions/generator/TaskDSLGenerator.xtend b/dsl/xtend/src/robots/missions/generator/TaskDSLGenerator.xtend
index d7ee2ed..d4f6915 100644
--- a/dsl/xtend/src/robots/missions/generator/TaskDSLGenerator.xtend
+++ b/dsl/xtend/src/robots/missions/generator/TaskDSLGenerator.xtend
@@ -9,9 +9,7 @@ import org.eclipse.xtext.generator.IFileSystemAccess
 import org.eclipse.xtext.generator.IGenerator
 import robots.missions.taskDSL.Behaviour
 import robots.missions.taskDSL.Mission
-import robots.missions.taskDSL.OperatorE
 import robots.missions.taskDSL.Robot
-import robots.missions.taskDSL.StoppingExpression
 
 /**
  * Generates code from your model files on save.
@@ -24,8 +22,8 @@ class TaskDSLGenerator implements IGenerator {
 		var root = resource.allContents.head as Robot;
 		if(root != null){
 			fsa.generateFile("nl/ru/des/Constants.java", makeConstants(root));
-			fsa.generateFile("nl/ru/des/Behaviours.java", makeBehaviours(root.behaviour));
-			fsa.generateFile("nl/ru/des/Missions.java", makeMissions(root.mission));
+			//fsa.generateFile("nl/ru/des/Behaviours.java", makeBehaviours(root.behaviour));
+			//fsa.generateFile("nl/ru/des/Missions.java", makeMissions(root.mission));
 		}
 	}
 	
@@ -49,7 +47,7 @@ public class Missions{
 			«ENDFOR»,
 			new ShutdownBehaviour(sensors, rightMotor, leftMotor, colors){
 				@Override public boolean takeControl(){
-					return «printExpression(m.se)»;
+					return »;
 				}
 			}}
 		«ENDFOR»));
@@ -72,7 +70,7 @@ public class Behaviours{
 		}
 		«IF b.tc != null»
 		@Override public boolean takeControl(){
-			return «printExpression(b.tc)»;
+			return ;
 		}
 		«ENDIF»
 		
@@ -98,26 +96,7 @@ public class Behaviours{
 	«ENDFOR»
 }
 	'''
-	
-	def CharSequence printExpression(StoppingExpression e)'''
-	«IF e.scond != null»
-		«IF !e.scond.colors.nullOrEmpty»
-		sensors.collected(new int[]{«FOR c : e.scond.colors SEPARATOR ","»«c.d.ordinal»«ENDFOR»})
-		«ELSEIF e.scond.touch != null»
-		sensors.«e.scond.touch.d.toString()»Touch()
-		«ELSEIF e.scond.op != null»
-		sensors.distance() «e.scond.op.d.toString()» «e.scond.dist»
-		«ELSEIF e.scond.color != null»
-		sensors.color() == «e.scond.color.d.ordinal»
-		«ENDIF»
-	«ELSE»
-		«IF e.op.d.equals(OperatorE.AND)»
-			«FOR ex : e.s BEFORE "(" SEPARATOR "&&" AFTER ")"»«printExpression(ex)»«ENDFOR»
-		«ELSE»
-			«FOR ex : e.s BEFORE "(" SEPARATOR "&&" AFTER ")"»«printExpression(ex)»«ENDFOR»
-		«ENDIF»	
-	«ENDIF»
-	'''
+
 	
 	def CharSequence makeConstants(Robot robot)'''
 package nl.ru.des;