Removed genmodel handling traversal, as the genmodel features are now available globally

Cleanup

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

@@ -1,4 +1,4 @@
-#Mon Jan 02 09:28:08 CET 2012
-eclipse.preferences.version=1
-encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
-encoding/<project>=Cp1252
+#Fri Jan 20 09:24:46 CET 2012
+eclipse.preferences.version=1
+encoding//.settings/org.eclipse.xtend.shared.ui.prefs=Cp1252
+encoding/<project>=Cp1252

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

@@ -2,6 +2,7 @@
 <?eclipse version="3.4"?>
 
 <plugin>
+<!--
    <extension
          point="org.yakindu.sct.generator.core.generator">
       <SCTGenerator
@@ -11,6 +12,7 @@
             name="YAKINDU C Code Generator">
       </SCTGenerator>
    </extension>
+  -->
    <extension
          point="org.yakindu.sct.generator.core.featuretypes">
       <FeatureLibrary

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/CMakeLists.xpt

@@ -13,10 +13,10 @@ Templates for the main statechart cpp file.
 «EXTENSION org::yakindu::sct::generator::c::templates::Expression»
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'CMakeLists.txt'»
-«getLicenseHeaderPlain(genEntry)»
+«getLicenseHeaderPlain()»
 set( SRC
 	Statemachine_cy.c
 	StatemachineBase.c

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/CustomEventC.xpt

@@ -14,10 +14,10 @@ Templates for the main statechart cpp file.
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE EvName()+'.c'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #include "«EvName()».h"
 
 /* This is needed by the EventPool */

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/CustomEventH.xpt

@@ -15,10 +15,10 @@ Templates for the main statechart cpp file.
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE EvName()+'.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef «EVNAME()»_H_
 #define «EVNAME()»_H_
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/DummyTimer.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'DummyTimer.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef DUMMYTIMER_H_
 #define DUMMYTIMER_H_
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/EventC.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'Event.c'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #include "Event.h"
 
 void _event_init(_Event* handle, uint32_t id)

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/EventH.xpt

@@ -13,10 +13,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'Event.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef EVENT_H_
 #define EVENT_H_
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/EventPoolC.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'EventPool.c'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #include "EventPool.h"
 #include <stdlib.h>
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/EventPoolH.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'EventPool.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef EVENTPOOL_H_
 #define EVENTPOOL_H_
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/EventSetC.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'EventSet.c'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #include "EventSet.h"
 #include <stdlib.h>
 
@@ -89,6 +89,20 @@ void eventSet_clean(EventSet* handle) {
 		handle->_set[i] = bool_false;
 }
 
+void eventSet_clean_input(EventSet* handle) {
+	uint32_t i;
+	for (i = 0; i < handle->maxEvents; ++i)
+	  if (handle->eventType[i] == ev_type_input)	
+		handle->_set[i] = bool_false;
+}
+
+void eventSet_clean_output(EventSet* handle) {
+	uint32_t i;
+	for (i = 0; i < handle->maxEvents; ++i)
+	  if (handle->eventType[i] == ev_type_output)
+		handle->_set[i] = bool_false;
+}
+
 void eventSet_set(EventSet* handle, const uint32_t evid) {
 	if (evid < handle->maxEvents) {
 		handle->_set[evid] = bool_true;
@@ -98,17 +112,17 @@ void eventSet_set(EventSet* handle, const uint32_t evid) {
 sc_boolean eventSet_isAny_input(EventSet* handle) {
 	uint32_t i;
 	for (i = 0; i < handle->maxEvents; ++i)
-		if (handle->eventType[i] == ev_type_input &&handle->_set[i])
-			return (bool_true);
-	return (bool_false);
+		if ((handle->eventType[i] == ev_type_input) && (handle->_set[i] == bool_true))
+			return bool_true;
+	return bool_false;
 }
 
 sc_boolean eventSet_isAny_output(EventSet* handle) {
 	uint32_t i;
 	for (i = 0; i < handle->maxEvents; ++i)
-		if (handle->eventType[i] == ev_type_output && handle->_set[i])
-			return (bool_true);
-	return (bool_false);
+		if ((handle->eventType[i] == ev_type_output) && (handle->_set[i] == bool_true))
+			return bool_true;
+	return bool_false;
 }
 
 void eventSet_clean_single(EventSet* handle, const uint32_t evid)

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/EventSetH.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'EventSet.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef EVENTSET_H_
 #define EVENTSET_H_
 
@@ -52,6 +52,8 @@ extern void eventSet_set(EventSet* handle, const uint32_t evid);
 extern sc_boolean eventSet_isAny_input(EventSet* handle);
 extern sc_boolean eventSet_isAny_output(EventSet* handle);
 extern void eventSet_clean_single(EventSet* handle, const uint32_t evid);
+extern void eventSet_clean_input(EventSet* handle);
+extern void eventSet_clean_output(EventSet* handle);
 
 #ifdef __cplusplus
 }

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/Main.xpt

@@ -21,40 +21,40 @@ Contais the root templates that call the different file templates.
  	«this.setGenEntry(genEntry)»
  	
 	«REM» basis files «ENDREM»
-	«EXPAND EventH::file(genEntry) FOR this»
-	«EXPAND EventC::file(genEntry) FOR this»
+	«EXPAND EventH::file FOR this» 
+	«EXPAND EventC::file FOR this»
 
-	«EXPAND TimerH::file(genEntry) FOR this»
-	«EXPAND TimerC::file(genEntry) FOR this»
+	«EXPAND TimerH::file FOR this»
+	«EXPAND TimerC::file FOR this»
 
-	«EXPAND EventSetH::file(genEntry) FOR this»
-	«EXPAND EventSetC::file(genEntry) FOR this»
+	«EXPAND EventSetH::file FOR this»
+	«EXPAND EventSetC::file FOR this»
 
-	«EXPAND StatemachineBaseH::file(genEntry) FOR this» 
-	«EXPAND StatemachineBaseC::file(genEntry) FOR this»
+	«EXPAND StatemachineBaseH::file FOR this» 
+	«EXPAND StatemachineBaseC::file FOR this»
 
-	«EXPAND Statemachine_cyH::file(genEntry) FOR this»
-	«EXPAND Statemachine_cyC::file(genEntry) FOR this»
+	«EXPAND Statemachine_cyH::file FOR this»
+	«EXPAND Statemachine_cyC::file FOR this»
 
 	«EXPAND Interfaces::file FOR this»
 	«EXPAND InterfaceOOW::file FOR this»
 
     «REM» code that is created by the model «ENDREM»
-	«EXPAND definitionH::file(genEntry) FOR this»
+	«EXPAND definitionH::file FOR this»
 
-	«EXPAND EventPoolH::file(genEntry) FOR this»
-	«EXPAND EventPoolC::file(genEntry) FOR this»
+	«EXPAND EventPoolH::file FOR this»
+	«EXPAND EventPoolC::file FOR this»
 
 	«EXPAND CustomStatemachineH::file FOR this»
 	«EXPAND CustomStatemachineC::file FOR this»
 	«EXPAND CustomStatemachineHOOW::file FOR this»
 	
-	«EXPAND CustomEventH::file(genEntry) FOR this»
-	«EXPAND CustomEventC::file(genEntry) FOR this»
+	«EXPAND CustomEventH::file FOR this»
+	«EXPAND CustomEventC::file FOR this»
 
-	«EXPAND CMakeLists::file(genEntry) FOR this»
+	«EXPAND CMakeLists::file FOR this»
 	
-	«EXPAND DummyTimer::file(genEntry) FOR this»
+	«EXPAND DummyTimer::file FOR this»
 
 «ENDDEFINE»
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/StatemachineBaseC.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'StatemachineBase.c'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #include "StatemachineBase.h"
 #include <stdlib.h>
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/StatemachineBaseH.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'StatemachineBase.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef STATEMACHINEBASE_H_
 #define STATEMACHINEBASE_H_
  

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/Statemachine_cyC.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'Statemachine_cy.c'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #include <stdlib.h>
 #include "definition.h"
 #include "Statemachine_cy.h"
@@ -79,31 +79,13 @@ void statemachine_cy_runCycle(Statemachine_cy* handle) {
 	uint32_t i;
 
 	/* delete all outgoing events */
-	for (i=0; i<handle->eventSet.maxEvents; ++i) {
-		// only delete events, that were marked as out
-		if (eventSet_is_type(&handle->eventSet,i,ev_type_output) && eventSet_check(&handle->eventSet, i)) {
-«REM»
-			// output events are out of our control
-		    // eventPool_freeEvent(handle->eventPool, handle->eventList[i]);
-«ENDREM»
-			eventSet_clean_single(&handle->eventSet, i);
-«REM»//			handle->eventList[i] = 0; «ENDREM»
-		}
-	}
-
+	eventSet_clean_output(&handle->eventSet);
+	
 	/* call internal cycle */
 	statemachine_cy__runCycle(handle);
 
 	/* delete all incoming events */
-	for (i=0; i<handle->eventSet.maxEvents; ++i) {
-		// only delete events, that where marked as out
-		if (eventSet_is_type(&handle->eventSet,i,ev_type_input) && eventSet_check(&handle->eventSet, i)) {
-«REM»//			eventPool_freeEvent(handle->eventPool, handle->eventList[i]); «ENDREM»
-			eventSet_clean_single(&handle->eventSet, i);
-«REM»//			handle->eventList[i] = 0;«ENDREM»
-		}
-	}
-
+	eventSet_clean_input(&handle->eventSet);
 }
 
 void statemachine_cy_setEvent(Statemachine_cy* handle, _Event* ev) {

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/Statemachine_cyH.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'Statemachine_cy.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef STATEMACHINE_CY_H_
 #define STATEMACHINE_CY_H_
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/TimerC.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'Timer.c'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #include "Timer.h"
 
 void timer_setFPtr(Timer* handle, setTimerFPtr stfptr, unsetTimerFPtr utfptr)

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/TimerH.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart c file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'Timer.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef TIMER_H_
 #define TIMER_H_
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/templates/definitionH.xpt

@@ -12,10 +12,10 @@ Templates for the main statechart cpp file.
 
 «EXTENSION org::yakindu::sct::generator::c::templates::Naming»
 
-«DEFINE file(sgen::GeneratorEntry genEntry) FOR ExecutionFlow»
+«DEFINE file FOR ExecutionFlow»
 
 «FILE 'definition.h'»
-«getLicenseHeader(genEntry)»
+«getLicenseHeader()»
 #ifndef DEFINITION_H_
 #define DEFINITION_H_