Browse Source

Fixed generation of "isActive" function.

markus.muehlbrandt@gmail.com 13 years ago
parent
commit
2303cbb555

+ 3 - 4
plugins/org.yakindu.sct.generator.c/.settings/org.eclipse.core.resources.prefs

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

+ 1 - 1
plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/ActionCode.xtend

@@ -150,6 +150,6 @@ class ActionCode {
 		'''«value.definition.event.valueAccess»'''
 	
 	def dispatch code (ActiveStateReferenceExpression it)
-		'''isActive(«value.name.asIdentifier»)'''
+		'''«flow.nameOfIsActiveFunction»(«scHandle», «value.fullyQualifiedName»)'''
 	
 }

+ 14 - 2
plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/Naming.xtend

@@ -15,11 +15,23 @@ import org.yakindu.sct.model.stext.stext.InternalScope
 import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.model.stext.stext.VariableDefinition
 import org.yakindu.sct.model.sgraph.Event
+import org.yakindu.sct.model.stext.naming.StextNameProvider
+import org.yakindu.sct.model.sgraph.State
 
 class Naming {
 
-	@Inject extension Navigation
-	@Inject extension Base
+	@Inject
+	extension Navigation
+	
+	@Inject
+	extension Base
+	
+	@Inject
+	private StextNameProvider provider;
+	
+	def getFullyQualifiedName(State state) {
+		provider.getFullyQualifiedName(state).toString.asIdentifier
+	}
 	
 	def module(ExecutionFlow it) {
 		name.asIdentifier.toFirstUpper