Some small cleanups

plugins/org.yakindu.sct.generator.c/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,4 @@
-#Mon Nov 28 09:33:07 CET 2011
+#Tue Nov 29 07:52:23 CET 2011
 eclipse.preferences.version=1
 encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
 encoding/<project>=Cp1252

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/Expression.ext

@@ -93,32 +93,6 @@ String toCCode(NumericalAddSubtractExpression expression) :
 String toCCode(NumericalMultiplyDivideExpression expression) :
   	" ( " + expression.leftOperand.toCCode() + " ) " + getOperator(expression.operator) + " ( " + expression.rightOperand.toCCode() + " ) ";
 
-// is this just relevant for events?
-String toCCode(ElementReferenceExpression ref) :
-	ref.value.toCCode();
-
-String toCCode(Declaration dec) :
-	"Declartion type not specified";
-
-String toCCode(TimeEvent time_ev) :
-    " ( eventSet_check( &handle->base.eventSet, ev_" + time_ev.name.toLowerCase() + ") ) ";
-
-String toCCode(VariableDefinition var) :
-    " handle->"+ var.getInterface() + "." + var.name.toLowerCase() + " ";
-	
-String toCCode(EventDefinition evDef) :
-    " ( eventSet_check( &handle->base.eventSet, ev_" + evDef.name.toLowerCase() + ") ) ";
-
-/*
-String getScope(EObject eo) :
-"unkownScope";
-
-String getScope(InterfaceScope ifScope) :
-	"if->";
-	
-String getScope(InternalScope inScope) :
-	"internal->";
-*/
 /* can not handle internal scope  */
 
 ExecutionFlow getExecutionFlow(InterfaceScope this) : ((ExecutionFlow)this.eContainer);
@@ -173,5 +147,31 @@ Set[EventDefinition] getOutEvents(InterfaceScope interface) :
 Set[EventDefinition] getLocalEvents(InterfaceScope interface) : 
 	interface.declarations.typeSelect(EventDefinition).select(e|e.direction == Direction::LOCAL);
 
+// is this just relevant for events?
+String toCCode(ElementReferenceExpression ref) :
+	ref.value.toCCode();
+
+String toCCode(Declaration dec) :
+	"Declartion type not specified";
+
+String toCCode(TimeEvent time_ev) :
+    " ( eventSet_check( &handle->base.eventSet, ev_" + time_ev.name.toLowerCase() + ") ) ";
+
+String toCCode(VariableDefinition var) :
+    " handle->"+ var.getInterface() + "." + var.name.toLowerCase() + " ";
+	
+String toCCode(EventDefinition evDef) :
+    " ( eventSet_check( &handle->base.eventSet, ev_" + evDef.name.toLowerCase() + ") ) ";
+
+/*
+String getScope(EObject eo) :
+"unkownScope";
+
+String getScope(InterfaceScope ifScope) :
+	"if->";
+	
+String getScope(InternalScope inScope) :
+	"internal->";
+*/
 
 	

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/Naming.ext

@@ -9,7 +9,6 @@ String scName(Expression statement) : ((ExecutionFlow)statement.eRootContainer).
 
 List[EventDefinition] declaredEvents(ExecutionFlow flow) : flow.scopes.declarations.typeSelect(EventDefinition);
 List[TimeEvent] declaredTimerEvents(ExecutionFlow flow) : flow.scopes.declarations.typeSelect(TimeEvent);
-
 List[VariableDefinition] declaredVariables(ExecutionFlow flow) : flow.scopes.declarations.typeSelect(VariableDefinition);
 
 String test(NamedElement obj) :  "";