[generator, generator.c, runtime.c] fixed C-generator after C++-generator changes

4 files changed, 41 insertions, 10 deletions

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
index 5e3ab435e..3fe054f81 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend
@@ -28,12 +28,13 @@ import org.eclipse.xtext.generator.JavaIoFileSystemAccess
 import org.eclipse.etrice.generator.generic.RoomExtensions

 import org.eclipse.etrice.generator.generic.ProcedureHelpers

 import org.eclipse.etrice.generator.generic.GenericActorClassGenerator

-

+import org.eclipse.etrice.generator.generic.ILanguageExtension

 

 @Singleton

 class ActorClassGen extends GenericActorClassGenerator {

 	

 	@Inject JavaIoFileSystemAccess fileAccess

+	@Inject extension ILanguageExtension langExt

 	@Inject extension CExtensions

 	@Inject extension RoomExtensions

 	

@@ -231,7 +232,7 @@ class ActorClassGen extends GenericActorClassGenerator {
 			ET_MSC_LOGGER_SYNC_ENTRY("«ac.name»", "_receiveMessage")

 			«IF !xpac.stateMachine.empty»

 				

-				receiveEvent(self«IF handleEvents», (etPort*)ifitem, msg->evtID, (void*)(((char*)msg)+MEM_CEIL(sizeof(etMessage)))«ENDIF»);

+				«langExt.operationScope(ac.name, false)»receiveEvent(self«IF handleEvents», (etPort*)ifitem, msg->evtID, (void*)(((char*)msg)+MEM_CEIL(sizeof(etMessage)))«ENDIF»);

 			«ENDIF»

 			

 			ET_MSC_LOGGER_SYNC_EXIT

@@ -242,7 +243,7 @@ class ActorClassGen extends GenericActorClassGenerator {
 				ET_MSC_LOGGER_SYNC_ENTRY("«ac.name»", "_execute")

 				«IF !xpac.stateMachine.empty»

 					

-					receiveEvent(self«IF handleEvents», NULL, 0, NULL«ENDIF»);

+					«langExt.operationScope(ac.name, false)»receiveEvent(self«IF handleEvents», NULL, 0, NULL«ENDIF»);

 				«ENDIF»

 				

 				ET_MSC_LOGGER_SYNC_EXIT

diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend
index 252bd0214..00384db6e 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/StateMachineGen.xtend
@@ -50,7 +50,7 @@ class StateMachineGen extends GenericStateMachineGenerator {
 			for (i=0; i<«ac.name.toUpperCase»_HISTORY_SIZE; ++i)

 				self->history[i] = NO_STATE;

 		}

-		executeInitTransition(self);

+		«langExt.operationScope(ac.name, false)»executeInitTransition(self);

 	'''}

 	

 	override genExtra(ExpandedActorClass xpac) {

@@ -60,6 +60,10 @@ class StateMachineGen extends GenericStateMachineGenerator {
 		«langExt.accessLevelPrivate»void setState(«ac.name»* self, int new_state) {

 			self->state = new_state;

 		}

+

+		«langExt.accessLevelPrivate»int getState(«ac.name»* self) {

+			return self->state;

+		}

 	'''

 	}

 }

diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
index 110a5cc24..f0d78acb6 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
@@ -27,6 +27,7 @@ import org.eclipse.etrice.core.room.util.RoomHelpers;
 import org.eclipse.etrice.generator.c.gen.CExtensions;

 import org.eclipse.etrice.generator.c.gen.StateMachineGen;

 import org.eclipse.etrice.generator.generic.GenericActorClassGenerator;

+import org.eclipse.etrice.generator.generic.ILanguageExtension;

 import org.eclipse.etrice.generator.generic.ProcedureHelpers;

 import org.eclipse.etrice.generator.generic.RoomExtensions;

 import org.eclipse.xtend2.lib.StringConcatenation;

@@ -41,6 +42,9 @@ public class ActorClassGen extends GenericActorClassGenerator {
   private JavaIoFileSystemAccess fileAccess;

   

   @Inject

+  private ILanguageExtension langExt;

+  

+  @Inject

   private CExtensions _cExtensions;

   

   @Inject

@@ -683,6 +687,9 @@ public class ActorClassGen extends GenericActorClassGenerator {
           _builder.append("\t");

           _builder.newLine();

           _builder.append("\t");

+          String _name_6 = ac.getName();

+          String _operationScope = this.langExt.operationScope(_name_6, false);

+          _builder.append(_operationScope, "	");

           _builder.append("receiveEvent(self");

           {

             if (handleEvents) {

@@ -710,17 +717,17 @@ public class ActorClassGen extends GenericActorClassGenerator {
         }

         if (_or_1) {

           _builder.append("void ");

-          String _name_6 = ac.getName();

-          _builder.append(_name_6, "");

-          _builder.append("_execute(");

           String _name_7 = ac.getName();

           _builder.append(_name_7, "");

+          _builder.append("_execute(");

+          String _name_8 = ac.getName();

+          _builder.append(_name_8, "");

           _builder.append("* self) {");

           _builder.newLineIfNotEmpty();

           _builder.append("\t");

           _builder.append("ET_MSC_LOGGER_SYNC_ENTRY(\"");

-          String _name_8 = ac.getName();

-          _builder.append(_name_8, "	");

+          String _name_9 = ac.getName();

+          _builder.append(_name_9, "	");

           _builder.append("\", \"_execute\")");

           _builder.newLineIfNotEmpty();

           {

@@ -731,6 +738,9 @@ public class ActorClassGen extends GenericActorClassGenerator {
               _builder.append("\t");

               _builder.newLine();

               _builder.append("\t");

+              String _name_10 = ac.getName();

+              String _operationScope_1 = this.langExt.operationScope(_name_10, false);

+              _builder.append(_operationScope_1, "	");

               _builder.append("receiveEvent(self");

               {

                 if (handleEvents) {

diff --git a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
index de6d18f93..aeb1f86f4 100644
--- a/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
+++ b/plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/StateMachineGen.java
@@ -85,8 +85,11 @@ public class StateMachineGen extends GenericStateMachineGenerator {
       _builder.newLine();

       _builder.append("}");

       _builder.newLine();

+      String _name_1 = ac.getName();

+      String _operationScope = this.langExt.operationScope(_name_1, false);

+      _builder.append(_operationScope, "");

       _builder.append("executeInitTransition(self);");

-      _builder.newLine();

+      _builder.newLineIfNotEmpty();

       _xblockexpression = (_builder);

     }

     return _xblockexpression;

@@ -110,6 +113,19 @@ public class StateMachineGen extends GenericStateMachineGenerator {
       _builder.newLine();

       _builder.append("}");

       _builder.newLine();

+      _builder.newLine();

+      String _accessLevelPrivate_1 = this.langExt.accessLevelPrivate();

+      _builder.append(_accessLevelPrivate_1, "");

+      _builder.append("int getState(");

+      String _name_1 = ac.getName();

+      _builder.append(_name_1, "");

+      _builder.append("* self) {");

+      _builder.newLineIfNotEmpty();

+      _builder.append("\t");

+      _builder.append("return self->state;");

+      _builder.newLine();

+      _builder.append("}");

+      _builder.newLine();

       _xblockexpression = (_builder);

     }

     return _xblockexpression;