added xtend build to pom and added more C code generator features

plugins/org.yakindu.sct.generator.c/pom.xml

@@ -27,6 +27,37 @@
 					</execution>
 				</executions>
 			</plugin>
-		</plugins>
+			
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<configuration>
+					<filesets>
+						<fileset>
+							<directory>xtend-gen</directory>
+							<includes>
+								<include>**</include>
+							</includes>
+							<excludes>
+								<exclude>.gitignore</exclude>
+								<exclude>.svn/</exclude>
+							</excludes>
+						</fileset>
+					</filesets>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.eclipse.xtend</groupId>
+				<artifactId>xtend-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+		</plugins>		
 	</build>
 </project>

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/ActionCode.xtend

@@ -16,11 +16,28 @@ import com.google.inject.Inject
 import org.yakindu.sct.model.stext.stext.EventDefinition
 import org.yakindu.sct.model.stext.stext.LogicalOrExpression
 import org.yakindu.sct.model.sexec.TimeEvent
+import org.yakindu.sct.model.stext.stext.EventRaisingExpression
+import org.yakindu.sct.model.stext.stext.LogicalAndExpression
+import org.yakindu.sct.model.stext.stext.LogicalNotExpression
+import org.yakindu.sct.model.stext.stext.LogicalRelationExpression
+import org.yakindu.sct.model.stext.validation.ITypeInferrer
+import org.yakindu.base.types.ITypeSystemAccess
+import org.yakindu.sct.model.stext.stext.BitwiseAndExpression
+import org.yakindu.sct.model.stext.stext.BitwiseOrExpression
+import org.yakindu.sct.model.stext.stext.BitwiseXorExpression
+import org.yakindu.sct.model.stext.stext.NumericalAddSubtractExpression
+import org.yakindu.sct.model.stext.stext.NumericalMultiplyDivideExpression
+import org.yakindu.sct.model.stext.stext.NumericalUnaryExpression
+import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression
+import org.yakindu.sct.model.stext.stext.ActiveStateReferenceExpression
+import org.yakindu.sct.model.stext.stext.FeatureCall
 
 class ActionCode {
 	
 	@Inject extension Naming
 	@Inject extension Navigation
+	@Inject extension ITypeInferrer
+	@Inject extension ITypeSystemAccess
 	
 	
 		/** todo externalize */
@@ -29,11 +46,11 @@ class ActionCode {
 		
 	/** todo externalize */
 	def dispatch access (EventDefinition it) 
-		'''«scHandle»->«scope.instance».«name.asIdentifier»_raised'''
+		'''«scHandle»->«scope.instance».«name.asIdentifier»'''
 		
 	/** todo externalize */
 	def dispatch access (TimeEvent it) 
-		'''«scHandle»->«scope.instance».«name.asIdentifier»_raised'''
+		'''«scHandle»->«scope.instance».«name.asIdentifier»'''
 		
 	def dispatch access (EObject it) 
 		'''#warning can't access elements of type «getClass().name»'''
@@ -65,14 +82,26 @@ class ActionCode {
 	def dispatch code (PrimitiveValueExpression it) 
 		'''«value.code»'''	
 
-		
+	/* Refering to declared elements */
+	
 	def dispatch code (ElementReferenceExpression it) 
-		'''«reference.access»'''
+		'''«reference.access.raised»'''
+		
+	def dispatch code (FeatureCall it) 
+		'''«feature.access.raised»'''
 		
 		
+	/* Statements */
+	
 	def dispatch code (AssignmentExpression it)
 		'''«varRef.code» «operator.literal» «expression.code»'''
 		
+	def dispatch code (EventRaisingExpression it)
+		'''
+		«IF value != null»
+			«event.definition.access.value» = «value.code»;
+		«ENDIF»
+		«event.definition.access.raised» = bool_true'''	
 
 
 	/* Logical Expressions */
@@ -80,159 +109,48 @@ class ActionCode {
 	def dispatch code (LogicalOrExpression it)
 		'''«rightOperand.code» || «leftOperand.code»'''
 		
+	def dispatch code (LogicalAndExpression it)
+		'''«rightOperand.code» && «leftOperand.code»'''
+		
+	def dispatch code (LogicalNotExpression it)
+		'''! «operand.code»'''
+		
+	def dispatch code (LogicalRelationExpression it) '''
+		«IF leftOperand.type.isString»
+			(strcmp(«leftOperand.code», «rightOperand.code») «operator.literal» 0)
+		«ELSE»
+			«leftOperand.code»«operator.literal»«rightOperand.code»
+		«ENDIF»
+		'''
+	
+	/* Bitwise Operations */
+	
+	def dispatch code (BitwiseAndExpression it)
+		'''«rightOperand.code» & «leftOperand.code»'''
+	
+	def dispatch code (BitwiseOrExpression it)
+		'''«rightOperand.code» | «leftOperand.code»'''
+	
+	def dispatch code (BitwiseXorExpression it)
+		'''«rightOperand.code» ^ «leftOperand.code»'''
+	
+
+	/* Numerical operations */
+	
+	def dispatch code (NumericalAddSubtractExpression it)
+		'''«rightOperand.code» «operator.literal» «leftOperand.code»'''
+	
+	def dispatch code (NumericalMultiplyDivideExpression it)
+		'''«rightOperand.code» «operator.literal» «leftOperand.code»'''
+	
+	def dispatch code (NumericalUnaryExpression it)
+		'''«operator.literal» «operand.code»'''
+	
+	/* TODO: check if event is active */
+	def dispatch code (EventValueReferenceExpression it)
+		'''«value.definition.code.value»'''
 	
-///* EventRaising */
-//String toCCode(EventRaisingExpression eventRaising) :
-//	((eventRaising.value == null)?"":
-//	"((" + eventRaising.event.getEventName() + "*)" + eventRaising.statemachineHandleName() + "->" + eventRaising.getInterfaceName() + "." + eventRaising.event.getEventName() + ")->value = " 
-//	+ eventRaising.value.toCCode() + ";") + 
-//	" statemachine_cy_setEvent(&" + eventRaising.statemachineHandleName() + 
-//	"->base, " + eventRaising.statemachineHandleName() + "->" + 
-//	eventRaising.getInterfaceName() + "." + 
-//	eventRaising.event.getEventName() + "); ";
-//
-//String addValue(EventRaisingExpression event) :
-//  ( (event.value == null)?"":("((" +event.event.getEventName() + "*)ev)->value = " + event.value.toCCode() + "; ") );
-//
-///* Logical Expressions */
-//String toCCode(LogicalOrExpression expression) :
-//  	" ( " + expression.leftOperand.toCCode() + " ) " + " || " + " ( " + expression.rightOperand.toCCode() + " ) ";
-//  	
-//String toCCode(LogicalAndExpression expression) :
-//  	" ( " + expression.leftOperand.toCCode() + " ) " + " && " + " ( " + expression.rightOperand.toCCode() + " ) ";
-//
-//String toCCode(LogicalNotExpression expression) :
-//  	" ~" + " ( " + expression.operand.toCCode() + " ) ";
-//
-//String toCCode(LogicalRelationExpression expression) :
-//	if (expression.leftOperand.inferType().isString()) then
-//		"("+expression.leftOperand.toCCode()+"==NULL?"+expression.rightOperand.toCCode()+"==NULL:strcmp("+expression.leftOperand.toCCode()+", "+expression.rightOperand.toCCode()+")==0)"
-//	else
-//		" ( " + expression.leftOperand.toCCode() + " ) " + getOperator(expression.operator) + " ( " + expression.rightOperand.toCCode() + " ) ";
-//    
-//String toCCode(BitwiseAndExpression expression) :
-//  	" ( " + expression.leftOperand.toCCode() + " ) " + " & " + " ( " + expression.rightOperand.toCCode() + " ) ";
-//
-//String toCCode(BitwiseOrExpression expression) :
-//  	" ( " + expression.leftOperand.toCCode() + " ) " + " | " + " ( " + expression.rightOperand.toCCode() + " ) ";
-//
-//String toCCode(BitwiseXorExpression expression) :
-//  	" ( " + expression.leftOperand.toCCode() + " ) " + " ^ " + " ( " + expression.rightOperand.toCCode() + " ) ";
-//
-//String toCCode(NumericalAddSubtractExpression expression) :
-//  	" ( " + expression.leftOperand.toCCode() + " ) " + getOperator(expression.operator) + " ( " + expression.rightOperand.toCCode() + " ) ";
-//  	
-//String toCCode(NumericalMultiplyDivideExpression expression) :
-//  	" ( " + expression.leftOperand.toCCode() + " ) " + getOperator(expression.operator) + " ( " + expression.rightOperand.toCCode() + " ) ";
-//
-//
-//String toCCode(NumericalUnaryExpression expression) :
-//    getOperator(expression.operator) + " ( " + expression.operand.toCCode() + " ) ";
-//
-///* can not handle internal scope  */
-//
-//ExecutionFlow getExecutionFlow(InterfaceScope this) : ((ExecutionFlow)this.eContainer);
-//String interfaceObjectName(InterfaceScope this) : "iface" + ((this.name == null)?"":this.name.toFirstUpper());
-//
-//String getOperator(AdditiveOperator operator) : 
-//    switch(operator) {
-//    	case(AdditiveOperator::plus) : " + "
-//    	case(AdditiveOperator::minus) : " - "
-//    	default : ""
-//    };
-//
-//String getOperator(MultiplicativeOperator operator) : 
-//    switch(operator) {
-//    	case(MultiplicativeOperator::mul) : " * "
-//    	case(MultiplicativeOperator::div) : " / "
-//    	case(MultiplicativeOperator::mod) : " % "
-//    	default : ""
-//    };
-//
-//String getOperator(RelationalOperator operator) :
-//	switch (operator) {
-//	  case (RelationalOperator::greater) : " > "
-//	  case (RelationalOperator::greaterEqual) : " >= "
-//	  case (RelationalOperator::smaller) : " < "
-//	  case (RelationalOperator::smallerEqual) : " <= "
-//	  case (RelationalOperator::equals) : " == "
-//	  case (RelationalOperator::notEquals) : " != "
-//	  default : ""
-//	};
-//
-//String getOperator(UnaryOperator operator) :
-//	switch (operator) {
-//	  case (UnaryOperator::negative) : " -"
-//	  case (UnaryOperator::positive) : " + "
-//	  case (UnaryOperator::complement) : " ~ "
-//	  default : ""
-//	};
-//
-//Set[EventDefinition] getInEvents(Scope interface) : 
-//	{};
-//
-//Set[EventDefinition] getOutEvents(Scope interface) : 
-//	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::OUT);
-//
-//Set[EventDefinition] getLocalEvents(Scope interface) : 
-//	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::LOCAL);
-//  
-//Set[EventDefinition] getInEvents(InterfaceScope interface) : 
-//	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::IN);
-//
-//Set[EventDefinition] getOutEvents(InterfaceScope interface) : 
-//	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::OUT);
-//
-//Set[EventDefinition] getLocalEvents(InterfaceScope interface) : 
-//	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::LOCAL);
-//
-//Set[EventDefinition] getInEvents(InternalScope interface) : 
-//	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::IN);
-//
-//Set[EventDefinition] getOutEvents(InternalScope interface) : 
-//	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::OUT);
-//
-//Set[EventDefinition] getLocalEvents(InternalScope interface) : 
-//	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::LOCAL);
-//
-//// is this just relevant for events?
-//String toCCode(ElementReferenceExpression ref) :
-//	ref.reference.toCCode()+ (if (ref.operationCall) then "("+ref.getInterfaceCallComma()+ref.args.toCCode().toString(",")+")" else "");
-//
-//String toCCode(EObject ref) :
-//	"/* toCode not defined for: "+ref+" */";
-//String toCCode(Feature ref) :
-//	"/* toCode not defined for: "+ref+" */";
-//String toCCode(FeatureCall ref) :
-//	ref.feature.toCCode()+ (if (ref.operationCall) then "("+ref.getInterfaceCallComma()+ref.args.toCCode().toString(",")+")" else "");
-//
-//String toCCode(Declaration dec) :
-//	"Declartion type not specified";
-//
-//String toCCode(OperationDefinition dec) :
-//	" " +dec.getMethodName();
-//
-//String toCCode(TimeEvent time_ev) :
-//    " ( eventSet_check( &"+time_ev.statemachineHandleName()+"->base.eventSet, " + time_ev.getEventEnumName() + ") ) ";
-//
-//String toCCode(VariableDefinition var) :
-//    " " + var.statemachineHandleName() + "->" + var.getInterface() + 
-//    "." + var.getName() + " ";
-//	
-//String toCCode(EventDefinition evDef) :
-//    " ( eventSet_check( &" + evDef.statemachineHandleName() + "->base.eventSet, " + evDef.getEventEnumName() + ") ) ";
-//
-///*
-//String toCCode(EventRaisedReferenceExpression errExp) :
-//	" eventSet_check( &" + errExp.statemachineHandleName() + "->base.eventSet, " + errExp.value.getEventEnumName() + ")";
-//*/
-//String toCCode(EventValueReferenceExpression evrExp) :
-//	"((" +evrExp.value.getEventName() + "*)" + evrExp.statemachineHandleName() + "->base.eventList[" + evrExp.value.getEventEnumName() + "])->value";
-//
-//String toCCode(ActiveStateReferenceExpression asrExp) :
-//	"isActive("+asrExp.value.StateEnumName()+") /* function not implemented yet */";
-//
-//List[Scope] getUsableScopes(List[Scope] scList) :
-//	scList.select(e| InterfaceScope.isInstance(e) || InternalScope.isInstance(e));
+	def dispatch code (ActiveStateReferenceExpression it)
+		'''isActive(«value.name.asIdentifier»)'''
 	
 }

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/Naming.xtend

@@ -158,7 +158,10 @@ class Naming {
 	
 	def dispatch String elementName(ExecutionNode it) { name }	
 	
-	def dispatch String elementName(ExecutionFlow it) { "" }	
+	def dispatch String elementName(ExecutionFlow it) { "" }
+	
+	def raised(CharSequence it) { it + '_raised' }	
+	def value(CharSequence it)  { it + '_value' }	
 	
 	
 	

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/Navigation.xtend

@@ -20,6 +20,9 @@ import org.yakindu.sct.model.sexec.ExecutionScope
 import org.yakindu.sct.model.sexec.ExecutionRegion
 import java.util.List
 import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.stext.stext.ElementReferenceExpression
+import org.yakindu.sct.model.stext.stext.Expression
+import org.yakindu.sct.model.stext.stext.FeatureCall
 
 class Navigation {
 	
@@ -170,5 +173,13 @@ class Navigation {
 	def dispatch isReactSequence(ExecutionNode it, Step s) { reactSequence == s }
 	def dispatch isReactSequence(EObject it, Step s) { false }
 	
-
+	def dispatch Declaration definition(ElementReferenceExpression it) {
+		if (reference instanceof Declaration) reference as Declaration
+	}
+	def dispatch Declaration definition(FeatureCall it) {
+		if (feature instanceof Declaration) feature as Declaration
+	}
+	def dispatch Declaration definition(Expression it) { null }
+	
+		
 }