added functionallity for is_active and is_final to C generator

added test for isFinal

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

@@ -145,7 +145,7 @@ class ExpressionCode {
 	/* TODO: check if event is active */
 	def dispatch CharSequence code(EventValueReferenceExpression it) '''«value.definition.event.valueAccess»'''
 
-	def dispatch CharSequence code(ActiveStateReferenceExpression it) '''«flow.activeFctID»(«scHandle», «value.shortName»)'''
+	def dispatch CharSequence code(ActiveStateReferenceExpression it) '''«flow.stateActiveFctID»(«scHandle», «value.shortName»)'''
 
 	def dispatch CharSequence code(ParenthesizedExpression it) '''(«expression.code»)'''
 	

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

@@ -51,7 +51,7 @@ class FlowCode {
 	
 	def dispatch CharSequence code(HistoryEntry it) '''
 		«stepComment»
-		if («scHandle»->historyVector[«region.historyVector.offset»] != «last_state») {
+		if («scHandle»->historyVector[«region.historyVector.offset»] != «null_state») {
 			«historyStep.code»
 		} «IF initialStep != null»else {
 			«initialStep.code»
@@ -120,7 +120,7 @@ class FlowCode {
 	'''
 
 	def dispatch CharSequence code(ExitState it) '''
-		«scHandle»->stateConfVector[«state.stateVector.offset»] = «last_state»;
+		«scHandle»->stateConfVector[«state.stateVector.offset»] = «null_state»;
 		«scHandle»->stateConfVectorPosition = «state.stateVector.offset»;
 	'''
 }

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

@@ -1,249 +1,271 @@
-/**
- * Copyright (c) 2012 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * 	committers of YAKINDU - initial API and implementation
- * 
- */
-package org.yakindu.sct.generator.c
-
-import com.google.inject.Inject
-import java.util.List
-import org.eclipse.emf.ecore.EObject
-import org.yakindu.base.types.Event
-import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
-import org.yakindu.sct.model.sexec.ExecutionFlow
-import org.yakindu.sct.model.sexec.Step
-import org.yakindu.sct.model.sexec.TimeEvent
-import org.yakindu.sct.model.sexec.naming.INamingService
-import org.yakindu.sct.model.sgen.GeneratorEntry
-import org.yakindu.sct.model.sgraph.Scope
-import org.yakindu.sct.model.sgraph.State
-import org.yakindu.sct.model.stext.naming.StextNameProvider
-import org.yakindu.sct.model.stext.stext.EventDefinition
-import org.yakindu.sct.model.stext.stext.InterfaceScope
-import org.yakindu.sct.model.stext.stext.InternalScope
-import org.yakindu.sct.model.stext.stext.OperationDefinition
-import org.yakindu.sct.model.stext.stext.VariableDefinition
-
-class Naming {
-
-	@Inject extension Navigation
-
-	@Inject extension ICodegenTypeSystemAccess
-
-	@Inject private StextNameProvider provider
-
-	@Inject extension INamingService
-
-	@Inject GeneratorEntry entry
-
-	@Inject extension GenmodelEntries
-
-	public static final String NULL_STRING = "null";
-
-	def getFullyQualifiedName(State state) {
-		provider.getFullyQualifiedName(state).toString.asEscapedIdentifier
-	}
-
-	def module(ExecutionFlow it) {
-		if (entry.moduleName.nullOrEmpty) {
-			return name.asIdentifier.toFirstUpper
-		}
-		return entry.moduleName.toFirstUpper
-	}
-
-	//	def module(InterfaceScope it) {
-	//		flow.type + (if (name.nullOrEmpty) 'Default' else name).asIdentifier.toFirstUpper	
-	//	}
-	def filterNullOrEmptyAndJoin(Iterable<CharSequence> it) {
-		filter[!it?.toString.nullOrEmpty].join('\n')
-	}
-
-	def filterNullOrEmptyAndJoin(List<String> it) {
-		filter[!it?.toString.nullOrEmpty].join('\n')
-	}
-
-	def client(String it) {
-		it + "Required"
-	}
-
-	def timerModule(ExecutionFlow it) {
-		'sc_timer'
-	}
-
-	def typesModule(ExecutionFlow it) {
-		'sc_types'
-	}
-
-	def timerType(ExecutionFlow it) {
-		'SCTimer'
-	}
-
-	def statesEnumType(ExecutionFlow it) {
-		flow.type + 'States'
-	}
-
-	def dispatch String type(InterfaceScope it) {
-		flow.type + 'Iface' + (if(name.nullOrEmpty) '' else name).asIdentifier.toFirstUpper
-	}
-
-	def dispatch String type(InternalScope it) {
-		flow.type + 'Internal'
-	}
-
-	def dispatch String type(Scope it) {
-		flow.type + 'TimeEvents'
-	}
-
-	def dispatch String type(ExecutionFlow it) {
-		if (entry.statemachinePrefix.nullOrEmpty) {
-			return name.asIdentifier.toFirstUpper
-		}
-		return entry.statemachinePrefix.toFirstUpper
-	}
-
-	def dispatch instance(InterfaceScope it) {
-		'iface' + (if(name.nullOrEmpty) '' else name).asIdentifier.toFirstUpper
-	}
-
-	def dispatch instance(Scope it) {
-		'timeEvents'
-	}
-
-	def dispatch instance(InternalScope it) {
-		'internal'
-	}
-
-	def functionPrefix(Scope it) {
-		if (!entry.statemachinePrefix.nullOrEmpty) {
-			return entry.statemachinePrefix
-		}
-		return type.toFirstLower
-	}
-
-	def functionPrefix(ExecutionFlow it) {
-		if (!entry.statemachinePrefix.nullOrEmpty) {
-			return entry.statemachinePrefix + separator
-		}
-		type.toFirstLower + separator
-	}
-
-	def separator() {
-		var sep = entry.separator
-		if (sep.nullOrEmpty) {
-			sep = "_"
-		}
-		return sep
-	}
-
-	def clearInEventsFctID(ExecutionFlow it) {
-		functionPrefix + "clearInEvents"
-	}
-
-	def clearOutEventsFctID(ExecutionFlow it) {
-		functionPrefix + "clearOutEvents"
-	}
-
-	def dispatch last_state(ExecutionFlow it) {
-		type + lastStateID
-	}
-
-	def dispatch last_state(Step it) {
-		execution_flow.type + lastStateID
-	}
-
-	def lastStateID() {
-		separator + "last" + separator + "state"
-	}
-
-	def ExecutionFlow execution_flow(EObject element) {
-		var ret = element;
-
-		while (ret != null) {
-			if (ret instanceof ExecutionFlow) {
-				return ret as ExecutionFlow
-			} else {
-				ret = ret.eContainer;
-			}
-		}
-		return null;
-	}
-
-	def constantName(VariableDefinition it) {
-		(flow.type + separator + scope.type + separator + name.asEscapedIdentifier).toUpperCase
-	}
-
-	def raiseTimeEventFctID(ExecutionFlow it) {
-		functionPrefix + "raiseTimeEvent"
-	}
-
-	def isActiveFctID(ExecutionFlow it) {
-		functionPrefix + "isActive"
-	}
-
-	def asRaiser(EventDefinition it) {
-		scope.functionPrefix + separator + 'raise' + separator + name.asIdentifier.toFirstLower
-	}
-
-	def asRaised(EventDefinition it) {
-		scope.functionPrefix + separator + 'israised' + separator + name.asIdentifier.toFirstLower
-	}
-
-	def asGetter(EventDefinition it) {
-		scope.functionPrefix + separator + 'get' + separator + name.asIdentifier.toFirstLower + separator + 'value'
-	}
-
-	def asGetter(VariableDefinition it) {
-		scope.functionPrefix + separator + 'get' + separator + name.asIdentifier.toFirstLower
-	}
-
-	def asSetter(VariableDefinition it) {
-		scope.functionPrefix + separator + 'set' + separator + name.asIdentifier.toFirstLower
-	}
-
-	def asFunction(OperationDefinition it) {
-		scope.functionPrefix + separator + name.asIdentifier.toFirstLower
-	}
-
-	def raised(CharSequence it) { it + separator + 'raised' }
-
-	def value(CharSequence it) { it + separator + 'value' }
-
-	def h(String it) { it + ".h" }
-
-	def c(String it) { it + ".c" }
-
-	def define(String it) { it.replaceAll('\\.', '_').toUpperCase }
-
-	def dispatch scopeDescription(Scope it) '''scope'''
-
-	def dispatch scopeDescription(InterfaceScope it) '''«IF name == null || name.empty»default interface scope«ELSE»interface scope '«name»'«ENDIF»'''
-
-	def dispatch scopeDescription(InternalScope it) '''internal scope'''
-
-	def scHandleDecl(EObject it) { flow.type + '* ' + scHandle }
-
-	def scHandle() { 'handle' }
-
-	def valueParams(EventDefinition it) {
-		if(hasValue) ', ' + type.targetLanguageName + ' value' else ''
-	}
-
-	def dispatch access(VariableDefinition it) {
-		if (isConst) '''«it.constantName»''' else '''«scHandle»->«scope.instance».«name.asEscapedIdentifier»'''
-	}
-
-	def dispatch access(OperationDefinition it) '''«asFunction»'''
-
-	def dispatch access(Event it) '''«scHandle»->«scope.instance».«name.asIdentifier.raised»'''
-
-	def dispatch access(TimeEvent it) '''«scHandle»->«scope.instance».«shortName.raised»'''
-
-	def dispatch access(EObject it) '''#error cannot access elements of type «getClass().name»'''
-
-	def valueAccess(Event it) '''«scHandle»->«scope.instance».«name.asIdentifier.value»'''
-}
+/**
+ * Copyright (c) 2012 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ * 	committers of YAKINDU - initial API and implementation
+ * 
+ */
+package org.yakindu.sct.generator.c
+
+import com.google.inject.Inject
+import java.util.List
+import org.eclipse.emf.ecore.EObject
+import org.yakindu.base.types.Event
+import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
+import org.yakindu.sct.model.sexec.ExecutionFlow
+import org.yakindu.sct.model.sexec.ExecutionState
+import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.TimeEvent
+import org.yakindu.sct.model.sexec.naming.INamingService
+import org.yakindu.sct.model.sgen.GeneratorEntry
+import org.yakindu.sct.model.sgraph.Scope
+import org.yakindu.sct.model.sgraph.State
+import org.yakindu.sct.model.stext.naming.StextNameProvider
+import org.yakindu.sct.model.stext.stext.EventDefinition
+import org.yakindu.sct.model.stext.stext.InterfaceScope
+import org.yakindu.sct.model.stext.stext.InternalScope
+import org.yakindu.sct.model.stext.stext.OperationDefinition
+import org.yakindu.sct.model.stext.stext.VariableDefinition
+
+class Naming {
+
+	@Inject extension Navigation
+
+	@Inject extension ICodegenTypeSystemAccess
+
+	@Inject private StextNameProvider provider
+
+	@Inject extension INamingService
+
+	@Inject GeneratorEntry entry
+
+	@Inject extension GenmodelEntries
+
+	public static final String NULL_STRING = "null";
+
+	def getFullyQualifiedName(State state) {
+		provider.getFullyQualifiedName(state).toString.asEscapedIdentifier
+	}
+	
+	def dispatch String stateName(State state) {
+		val String name = provider.getFullyQualifiedName(state).toString();
+		name.fullQualifiedStateName
+	}
+	
+	def dispatch String stateName(ExecutionState it) {
+		name.fullQualifiedStateName
+	}
+		
+	def private String fullQualifiedStateName(String name) {
+		name.substring(name.indexOf(".") + 1).replace(".", "_")
+	}
+
+	def module(ExecutionFlow it) {
+		if (entry.moduleName.nullOrEmpty) {
+			return name.asIdentifier.toFirstUpper
+		}
+		return entry.moduleName.toFirstUpper
+	}
+
+	//	def module(InterfaceScope it) {
+	//		flow.type + (if (name.nullOrEmpty) 'Default' else name).asIdentifier.toFirstUpper	
+	//	}
+	def filterNullOrEmptyAndJoin(Iterable<CharSequence> it) {
+		filter[!it?.toString.nullOrEmpty].join('\n')
+	}
+
+	def filterNullOrEmptyAndJoin(List<String> it) {
+		filter[!it?.toString.nullOrEmpty].join('\n')
+	}
+
+	def client(String it) {
+		it + "Required"
+	}
+
+	def timerModule(ExecutionFlow it) {
+		'sc_timer'
+	}
+
+	def typesModule(ExecutionFlow it) {
+		'sc_types'
+	}
+
+	def timerType(ExecutionFlow it) {
+		'SCTimer'
+	}
+
+	def statesEnumType(ExecutionFlow it) {
+		flow.type + 'States'
+	}
+
+	def dispatch String type(InterfaceScope it) {
+		flow.type + 'Iface' + (if(name.nullOrEmpty) '' else name).asIdentifier.toFirstUpper
+	}
+
+	def dispatch String type(InternalScope it) {
+		flow.type + 'Internal'
+	}
+
+	def dispatch String type(Scope it) {
+		flow.type + 'TimeEvents'
+	}
+
+	def dispatch String type(ExecutionFlow it) {
+		if (entry.statemachinePrefix.nullOrEmpty) {
+			return name.asIdentifier.toFirstUpper
+		}
+		return entry.statemachinePrefix.toFirstUpper
+	}
+
+	def dispatch instance(InterfaceScope it) {
+		'iface' + (if(name.nullOrEmpty) '' else name).asIdentifier.toFirstUpper
+	}
+
+	def dispatch instance(Scope it) {
+		'timeEvents'
+	}
+
+	def dispatch instance(InternalScope it) {
+		'internal'
+	}
+
+	def functionPrefix(Scope it) {
+		if (!entry.statemachinePrefix.nullOrEmpty) {
+			return entry.statemachinePrefix
+		}
+		return type.toFirstLower
+	}
+
+	def functionPrefix(ExecutionFlow it) {
+		if (!entry.statemachinePrefix.nullOrEmpty) {
+			return entry.statemachinePrefix + separator
+		}
+		type.toFirstLower + separator
+	}
+
+	def separator() {
+		var sep = entry.separator
+		if (sep.nullOrEmpty) {
+			sep = "_"
+		}
+		return sep
+	}
+
+	def clearInEventsFctID(ExecutionFlow it) {
+		functionPrefix + "clearInEvents"
+	}
+
+	def clearOutEventsFctID(ExecutionFlow it) {
+		functionPrefix + "clearOutEvents"
+	}
+
+	def dispatch null_state(ExecutionFlow it) {
+		type + lastStateID
+	}
+
+	def dispatch null_state(Step it) {
+		execution_flow.type + lastStateID
+	}
+
+	def lastStateID() {
+		separator + "last" + separator + "state"
+	}
+
+	def ExecutionFlow execution_flow(EObject element) {
+		var ret = element;
+
+		while (ret != null) {
+			if (ret instanceof ExecutionFlow) {
+				return ret as ExecutionFlow
+			} else {
+				ret = ret.eContainer;
+			}
+		}
+		return null;
+	}
+
+	def constantName(VariableDefinition it) {
+		(flow.type + separator + scope.type + separator + name.asEscapedIdentifier).toUpperCase
+	}
+
+	def raiseTimeEventFctID(ExecutionFlow it) {
+		functionPrefix + "raiseTimeEvent"
+	}
+
+	def isStateActiveFctID(ExecutionFlow it) {
+		functionPrefix + "isStateActive"
+	}
+	
+	def isActiveFctID(ExecutionFlow it) {
+		functionPrefix + "isActive"
+	}
+	
+	def isFinalFctID(ExecutionFlow it) {
+		functionPrefix + "isFinal"
+	}
+
+	def asRaiser(EventDefinition it) {
+		scope.functionPrefix + separator + 'raise' + separator + name.asIdentifier.toFirstLower
+	}
+
+	def asRaised(EventDefinition it) {
+		scope.functionPrefix + separator + 'israised' + separator + name.asIdentifier.toFirstLower
+	}
+
+	def asGetter(EventDefinition it) {
+		scope.functionPrefix + separator + 'get' + separator + name.asIdentifier.toFirstLower + separator + 'value'
+	}
+
+	def asGetter(VariableDefinition it) {
+		scope.functionPrefix + separator + 'get' + separator + name.asIdentifier.toFirstLower
+	}
+
+	def asSetter(VariableDefinition it) {
+		scope.functionPrefix + separator + 'set' + separator + name.asIdentifier.toFirstLower
+	}
+
+	def asFunction(OperationDefinition it) {
+		scope.functionPrefix + separator + name.asIdentifier.toFirstLower
+	}
+
+	def raised(CharSequence it) { it + separator + 'raised' }
+
+	def value(CharSequence it) { it + separator + 'value' }
+
+	def h(String it) { it + ".h" }
+
+	def c(String it) { it + ".c" }
+
+	def define(String it) { it.replaceAll('\\.', '_').toUpperCase }
+
+	def dispatch scopeDescription(Scope it) '''scope'''
+
+	def dispatch scopeDescription(InterfaceScope it) '''«IF name == null || name.empty»default interface scope«ELSE»interface scope '«name»'«ENDIF»'''
+
+	def dispatch scopeDescription(InternalScope it) '''internal scope'''
+
+	def scHandleDecl(EObject it) { flow.type + '* ' + scHandle }
+
+	def scHandle() { 'handle' }
+
+	def valueParams(EventDefinition it) {
+		if(hasValue) ', ' + type.targetLanguageName + ' value' else ''
+	}
+
+	def dispatch access(VariableDefinition it) {
+		if (isConst) '''«it.constantName»''' else '''«scHandle»->«scope.instance».«name.asEscapedIdentifier»'''
+	}
+
+	def dispatch access(OperationDefinition it) '''«asFunction»'''
+
+	def dispatch access(Event it) '''«scHandle»->«scope.instance».«name.asIdentifier.raised»'''
+
+	def dispatch access(TimeEvent it) '''«scHandle»->«scope.instance».«shortName.raised»'''
+
+	def dispatch access(EObject it) '''#error cannot access elements of type «getClass().name»'''
+
+	def valueAccess(Event it) '''«scHandle»->«scope.instance».«name.asIdentifier.value»'''
+}

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

@@ -62,29 +62,40 @@ class Statemachine {
 			«statemachineTypeDecl»
 
 			/*! Initializes the «type» state machine data structures. Must be called before first usage.*/
-			extern void «functionPrefix»init(«type»* handle);
+			extern void «functionPrefix»init(«scHandleDecl»);
 			
 			/*! Activates the state machine */
-			extern void «functionPrefix»enter(«type»* handle);
+			extern void «functionPrefix»enter(«scHandleDecl»);
 			
 			/*! Deactivates the state machine */
-			extern void «functionPrefix»exit(«type»* handle);
+			extern void «functionPrefix»exit(«scHandleDecl»);
 			
 			/*! Performs a 'run to completion' step. */
-			extern void «functionPrefix»runCycle(«type»* handle);
+			extern void «functionPrefix»runCycle(«scHandleDecl»);
 
 			«IF timed»
 				/*! Raises a time event. */
-				extern void «raiseTimeEventFctID»(«type»* handle, sc_eventid evid);
+				extern void «raiseTimeEventFctID»(«scHandleDecl», sc_eventid evid);
 			«ENDIF»
 			
 			«FOR s : it.scopes.filter( typeof(InterfaceScope) )»
 				«s.scopeFunctionPrototypes»
-				
 			«ENDFOR»
 			
+			/*!
+			 * Checks if the statemachine is active. 
+			 * A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
+			 */
+			extern sc_boolean «isActiveFctID»(«scHandleDecl»);
+			
+			/*!
+			 * Checks if all active states are final. 
+			 * If there are no active states then the statemachine is considered as incative and this method returns false.
+			 */
+			extern sc_boolean «isFinalFctID»(«scHandleDecl»);
+			
 			/*! Checks if the specified state is active. */
-			extern sc_boolean «activeFctID»(«scHandleDecl», «statesEnumType» state);
+			extern sc_boolean «stateActiveFctID»(«scHandleDecl», «statesEnumType» state);
 			
 			#ifdef __cplusplus
 			}
@@ -99,7 +110,7 @@ class Statemachine {
 			«FOR state : states »
 			«state.shortName»,
 			«ENDFOR»
-			«last_state»
+			«null_state»
 		} «statesEnumType»;
 	'''
 
@@ -170,15 +181,15 @@ class Statemachine {
 	def dispatch functionPrototypes(EventDefinition it) '''
 		«IF direction == Direction::IN»
 		/*! Raises the in event '«name»' that is defined in the «scope.scopeDescription». */ 
-		extern void «asRaiser»(«it.flow.type»* handle«valueParams»);
+		extern void «asRaiser»(«scHandleDecl»«valueParams»);
 		
 		«ELSE»
 			/*! Checks if the out event '«name»' that is defined in the «scope.scopeDescription» has been raised. */ 
-			extern sc_boolean «asRaised»(«it.flow.type»* handle);
+			extern sc_boolean «asRaised»(«scHandleDecl»);
 			
 			«IF hasValue»
 				/*! Gets the value of the out event '«name»' that is defined in the «scope.scopeDescription». */ 
-				extern «type.targetLanguageName» «asGetter»(«it.flow.type»* handle);
+				extern «type.targetLanguageName» «asGetter»(«scHandleDecl»);
 				
 			«ENDIF»
 		«ENDIF»
@@ -186,10 +197,10 @@ class Statemachine {
 
 	def dispatch functionPrototypes(VariableDefinition it) '''
 		/*! Gets the value of the variable '«name»' that is defined in the «scope.scopeDescription». */ 
-		extern «type.targetLanguageName» «it.asGetter»(«it.flow.type»* handle);
+		extern «type.targetLanguageName» «it.asGetter»(«scHandleDecl»);
 		«IF !readonly && !const»
 			/*! Sets the value of the variable '«name»' that is defined in the «scope.scopeDescription». */ 
-			extern void «asSetter»(«it.flow.type»* handle, «type.targetLanguageName» value);
+			extern void «asSetter»(«scHandleDecl», «type.targetLanguageName» value);
 		«ENDIF»
 	'''
 }

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

@@ -1,13 +1,13 @@
-/**
- * Copyright (c) 2012 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * 	committers of YAKINDU - initial API and implementation
- * 
- */
+/**
+ * Copyright (c) 2012 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ * 	committers of YAKINDU - initial API and implementation
+ * 
+ */
 package org.yakindu.sct.generator.c
 
 import com.google.inject.Inject
@@ -17,34 +17,36 @@ import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.Check
 import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.Step
+import org.yakindu.sct.model.sexec.extensions.StateVectorExtensions
+import org.yakindu.sct.model.sexec.naming.INamingService
 import org.yakindu.sct.model.sgen.GeneratorEntry
 import org.yakindu.sct.model.sgraph.Statechart
-import org.yakindu.sct.model.sexec.naming.INamingService
 
 class StatemachineC {
 	
 	@Inject extension Naming
+	@Inject extension GenmodelEntries
 	@Inject extension Navigation
-	@Inject extension FlowCode
-	@Inject extension GenmodelEntries
-	@Inject extension ICodegenTypeSystemAccess
-	@Inject extension INamingService
+	@Inject extension ICodegenTypeSystemAccess
+	@Inject extension INamingService
+	@Inject extension FlowCode
+	@Inject protected extension StateVectorExtensions
 	
 	def generateStatemachineC(ExecutionFlow flow, Statechart sc, IFileSystemAccess fsa, GeneratorEntry entry) {
-		flow.initializeNamingService
-		var content = flow.statemachineCContent(entry)
-		var target = flow.module.c
+		flow.initializeNamingService
+		var content = flow.statemachineCContent(entry)
+		var target = flow.module.c
 		fsa.generateFile(target , content)
 	}
 	
-	def statemachineCContent(ExecutionFlow it, GeneratorEntry entry) '''
-		«entry.licenseText»
+	def statemachineCContent(ExecutionFlow it, GeneratorEntry entry) '''
+		«entry.licenseText»
 		
 		#include <stdlib.h>
 		#include <string.h>
 		#include "«typesModule.h»"
 		#include "«module.h»"
-		«IF timed || !it.operations.empty»
+		«IF timed || !it.operations.empty»
 			#include "«module.client.h»"
 		«ENDIF»
 		/*! \file Implementation of the state machine '«name»'
@@ -58,33 +60,36 @@ class StatemachineC {
 		
 		«exitFunction»
 		
+		«activeFunction»
+		
+		«finalFunction»
+		
 		«clearInEventsFunction»
 		
 		«clearOutEventsFunction»
 		
-		«runCycleFunction»
+		«runCycleFunction»
 		
-		«raiseTimeEventFunction»
+		«raiseTimeEventFunction»
 		
-		«isActiveFunction»
+		«isStateActiveFunction»
 		
-		«interfaceFunctions»
+		«interfaceFunctions»
 		
 		«functionImplementations»
 	'''
 	
-	
 	def initFunction(ExecutionFlow it) '''
 		void «functionPrefix»init(«scHandleDecl»)
 		{
 			int i;
 
 			for (i = 0; i < «type.toUpperCase»_MAX_ORTHOGONAL_STATES; ++i)
-				«scHandle»->stateConfVector[i] = «last_state»;
+				«scHandle»->stateConfVector[i] = «null_state»;
 			
 			«IF hasHistory»
 			for (i = 0; i < «type.toUpperCase»_MAX_HISTORY_STATES; ++i)
-				«scHandle»->historyVector[i] = «last_state»;
+				«scHandle»->historyVector[i] = «null_state»;
 			«ENDIF»
 			
 			«scHandle»->stateConfVectorPosition = 0;
@@ -179,8 +184,8 @@ class StatemachineC {
 		«ENDIF»
 	'''
 	
-	def isActiveFunction(ExecutionFlow it) '''
-		sc_boolean «activeFctID»(«scHandleDecl», «statesEnumType» state) {
+	def isStateActiveFunction(ExecutionFlow it) '''
+		sc_boolean «stateActiveFctID»(«scHandleDecl», «statesEnumType» state) {
 			switch (state) {
 				«FOR s : states»
 				case «s.shortName» : 
@@ -193,6 +198,33 @@ class StatemachineC {
 		}
 	'''
 	
+	def isActiveFunction(ExecutionFlow it) '''
+
+		sc_boolean «isActiveFctID»(«scHandleDecl») {
+			return «FOR i : 0 ..< stateVector.size SEPARATOR '||'»«scHandle»->stateConfVector[«i»] != «null_state»«ENDFOR»;
+		}
+	'''
+	
+	def protected isFinalFunction(ExecutionFlow it) {
+		val finalStateImpactVector = flow.finalStateImpactVector
+
+		'''
+			«IF !finalStateImpactVector.isCompletelyCovered»
+			/* 
+			 * Always returns 'false' since this state machine can never become final.
+			 */
+			«ENDIF»
+			sc_boolean «isFinalFctID»(«scHandleDecl»){
+		''' +
+		// only if the impact vector is completely covered by final states the state machine 
+		// can become final
+		{if (finalStateImpactVector.isCompletelyCovered) {'''	return «FOR i : 0 ..<finalStateImpactVector.size SEPARATOR ' && '»(«FOR fs : finalStateImpactVector.get(i) SEPARATOR ' || '»«scHandle»->stateConfVector[«i»] == «IF fs.stateVector.offset == i»«functionPrefix.toFirstUpper»«fs.stateName.asEscapedIdentifier»«ELSE»«null_state»«ENDIF»«ENDFOR»)«ENDFOR»;
+		'''} else {'''   return false;'''} }		
+		+ '''}'''
+	}
+	
+	
+	
 	/* ===================================================================================
 	 * Implementation of interface element accessor functions
 	 */

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/ExpressionCode.xtend

@@ -137,7 +137,7 @@ class ExpressionCode {
 	/* TODO: check if event is active */
 	def dispatch CharSequence code(EventValueReferenceExpression it) '''«value.definition.event.valueAccess»'''
 
-	def dispatch CharSequence code(ActiveStateReferenceExpression it) '''«flow.activeFctID»(«value.shortName»)'''
+	def dispatch CharSequence code(ActiveStateReferenceExpression it) '''«flow.stateActiveFctID»(«value.shortName»)'''
 
 	def dispatch CharSequence code(ParenthesizedExpression it) '''(«expression.code»)'''
 

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/FlowCode.xtend

@@ -29,7 +29,7 @@ class FlowCode extends org.yakindu.sct.generator.c.FlowCode {
 	
 	override dispatch CharSequence code(HistoryEntry it) '''
 		«stepComment»
-		if (historyVector[«region.historyVector.offset»] != «last_state») {
+		if (historyVector[«region.historyVector.offset»] != «null_state») {
 			«historyStep.code»
 		} «IF initialStep != null»else {
 			«initialStep.code»
@@ -88,7 +88,7 @@ class FlowCode extends org.yakindu.sct.generator.c.FlowCode {
 	'''
 
 	override dispatch CharSequence code(ExitState it) '''
-		stateConfVector[«state.stateVector.offset»] = «last_state»;
+		stateConfVector[«state.stateVector.offset»] = «null_state»;
 		stateConfVectorPosition = «state.stateVector.offset»;
 	'''
 }

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

@@ -154,7 +154,7 @@ class Naming extends org.yakindu.sct.generator.c.Naming {
 		"raiseTimeEvent"
 	}
 
-	override isActiveFctID(ExecutionFlow it) {
+	override isStateActiveFctID(ExecutionFlow it) {
 		"isActive"
 	}
 

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineHeader.xtend

@@ -38,7 +38,6 @@ class StatemachineHeader extends Statemachine {
 	@Inject extension ICodegenTypeSystemAccess
 	@Inject extension GenmodelEntriesExtension
 	@Inject extension INamingService
-	@Inject extension ExpressionCode
 
 	protected GeneratorEntry entry
 
@@ -77,7 +76,7 @@ class StatemachineHeader extends Statemachine {
 				«publicFunctionPrototypes»
 				
 				/*! Checks if the specified state is active. */
-				sc_boolean «activeFctID»(«statesEnumType» state);
+				sc_boolean «stateActiveFctID»(«statesEnumType» state);
 			
 			«entry.innerClassVisibility»:
 			

plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineImplementation.xtend

@@ -1,13 +1,13 @@
-/**
- * Copyright (c) 2012 committers of YAKINDU and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * Contributors:
- * 	committers of YAKINDU - initial API and implementation
- * 
- */
+/**
+ * Copyright (c) 2012 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * Contributors:
+ * 	committers of YAKINDU - initial API and implementation
+ * 
+ */
 package org.yakindu.sct.generator.cpp
 
 import com.google.inject.Inject
@@ -23,38 +23,38 @@ import org.yakindu.sct.model.sgen.GeneratorEntry
 import org.yakindu.sct.model.sgraph.Statechart
 import org.yakindu.sct.model.stext.stext.InterfaceScope
 import org.yakindu.sct.model.stext.stext.StatechartScope
-import org.yakindu.sct.model.stext.stext.VariableDefinition
-
+import org.yakindu.sct.model.stext.stext.VariableDefinition
+
 class StatemachineImplementation {
 	
 	@Inject extension Naming
 	@Inject extension Navigation
-	@Inject extension FlowCode
-	@Inject extension GenmodelEntriesExtension
-	@Inject extension ICodegenTypeSystemAccess
-	@Inject extension INamingService
-	@Inject extension ExpressionCode
-	
+	@Inject extension FlowCode
+	@Inject extension GenmodelEntriesExtension
+	@Inject extension ICodegenTypeSystemAccess
+	@Inject extension INamingService
+	@Inject extension ExpressionCode
+	
 	protected GeneratorEntry entry
 	
-	def generateStatemachineImplemenation(ExecutionFlow flow, Statechart sc, IFileSystemAccess fsa, GeneratorEntry entry) {
+	def generateStatemachineImplemenation(ExecutionFlow flow, Statechart sc, IFileSystemAccess fsa, GeneratorEntry entry) {
 		this.entry = entry
 		fsa.generateFile(flow.module.cpp, flow.statemachineContent)
 	}
 	
-	def statemachineContent(ExecutionFlow it) '''
-		«entry.licenseText»
+	def statemachineContent(ExecutionFlow it) '''
+		«entry.licenseText»
 		
-		#include "«module.h»"
+		#include "«module.h»"
 		#include <string.h>
 		/*! \file Implementation of the state machine '«name»'
 		*/
-		
-		«constructorDefinition»
-		
-		«destructorDefinition»
-		
-		«constantDefinitions»
+		
+		«constructorDefinition»
+		
+		«destructorDefinition»
+		
+		«constantDefinitions»
 		
 		«initFunction»
 		
@@ -72,49 +72,49 @@ class StatemachineImplementation {
 
 		«isActiveFunction»
 		
-		«interfaceFunctions»
+		«interfaceFunctions»
 		
 		«functionImplementations»
 	'''
-	
-	def constructorDefinition(ExecutionFlow it) '''
-		«module»::«module»() {
-			
-			«scopes.filter(typeof(StatechartScope)).filter[hasOperations && !entry.useStaticOPC].map['''«OCB_Instance» = null;'''].join('\n')»
-			«IF hasHistory»
-				
-				for (int i = 0; i < «historyStatesConst»; ++i)
-					historyVector[i] = «last_state»;
-			«ENDIF»
-			
-			stateConfVectorPosition = 0;
-			
-			«IF timed»
-				«timerInstance» = NULL;
-			«ENDIF»
-		}
+	
+	def constructorDefinition(ExecutionFlow it) '''
+		«module»::«module»() {
+			
+			«scopes.filter(typeof(StatechartScope)).filter[hasOperations && !entry.useStaticOPC].map['''«OCB_Instance» = null;'''].join('\n')»
+			«IF hasHistory»
+				
+				for (int i = 0; i < «historyStatesConst»; ++i)
+					historyVector[i] = «null_state»;
+			«ENDIF»
+			
+			stateConfVectorPosition = 0;
+			
+			«IF timed»
+				«timerInstance» = NULL;
+			«ENDIF»
+		}
+	'''
+	
+	def destructorDefinition(ExecutionFlow it) '''
+		«module»::~«module»() {
+		}
 	'''
-	
-	def destructorDefinition(ExecutionFlow it) '''
-		«module»::~«module»() {
-		}
-	'''
 	
 	def initFunction(ExecutionFlow it) '''
 		void «module»::init()
 		{
 			for (int i = 0; i < «orthogonalStatesConst»; ++i)
-				stateConfVector[i] = «last_state»;
+				stateConfVector[i] = «null_state»;
 			
 			«IF hasHistory»
 			for (int i = 0; i < «historyStatesConst»; ++i)
-				historyVector[i] = «last_state»;
+				historyVector[i] = «null_state»;
 			
 			«ENDIF»
 			stateConfVectorPosition = 0;
 		
 			clearInEvents();
-			clearOutEvents();
+			clearOutEvents();
 			
 			«initSequence.code»
 
@@ -194,25 +194,25 @@ class StatemachineImplementation {
 	
 	def timedStatemachineFunctions(ExecutionFlow it) '''
 		«IF timed»
-			
-			void «module»::setTimer(«timerInterface»* timer){
-				this->«timerInstance» = timer;
-			}
-			
-			«timerInterface»* «module»::getTimer(){
-				return «timerInstance»;
-			}
-			
+			
+			void «module»::setTimer(«timerInterface»* timer){
+				this->«timerInstance» = timer;
+			}
+			
+			«timerInterface»* «module»::getTimer(){
+				return «timerInstance»;
+			}
+			
 			void «module»::«raiseTimeEventFctID»(sc_eventid evid) {
-				if ((evid >= &timeEvents) && (evid < &timeEvents + sizeof(timeEvents))) {
-					*(sc_boolean*)evid = true;
+				if ((evid >= &timeEvents) && (evid < &timeEvents + sizeof(timeEvents))) {
+					*(sc_boolean*)evid = true;
 				}
 			}
 		«ENDIF»
 	'''
 	
 	def isActiveFunction(ExecutionFlow it) '''
-		sc_boolean «module»::«activeFctID»(«statesEnumType» state) {
+		sc_boolean «module»::«stateActiveFctID»(«statesEnumType» state) {
 			switch (state) {
 				«FOR s : states»
 				case «s.shortName.asEscapedIdentifier» : 
@@ -224,30 +224,30 @@ class StatemachineImplementation {
 			}
 		}
 	'''
-	
-	/* ===================================================================================
-	 * Implementation of interface element access functions
-	 */
-	 
-	def constantDefinitions(ExecutionFlow it) '''
-		«FOR scope : statechartScopes»
-			«FOR d : scope.declarations.filter(typeof(VariableDefinition)).filter[const]»
-				«IF d.type.name != 'void'»const «d.type.targetLanguageName» «d.access» = «d.initialValue.code»;«ENDIF»
-			«ENDFOR»
-		«ENDFOR»
-	'''
+	
+	/* ===================================================================================
+	 * Implementation of interface element access functions
+	 */
+	 
+	def constantDefinitions(ExecutionFlow it) '''
+		«FOR scope : statechartScopes»
+			«FOR d : scope.declarations.filter(typeof(VariableDefinition)).filter[const]»
+				«IF d.type.name != 'void'»const «d.type.targetLanguageName» «d.access» = «d.initialValue.code»;«ENDIF»
+			«ENDFOR»
+		«ENDFOR»
+	'''
 	
 	/* ===================================================================================
 	 * Implementation of interface element access functions
 	 */
 	
 	def interfaceFunctions(ExecutionFlow it) '''
-		«FOR scope : statechartScopes»
-			«IF scope instanceof InterfaceScope»
-			«module»::«scope.interfaceName»* «module»::get«scope.interfaceName»() {
-				return &«scope.instance»;
-			}
-			
+		«FOR scope : statechartScopes»
+			«IF scope instanceof InterfaceScope»
+			«module»::«scope.interfaceName»* «module»::get«scope.interfaceName»() {
+				return &«scope.instance»;
+			}
+			
 			«ENDIF»
 			«FOR event : scope.incomingEvents»
 				void «module»::«scope.interfaceName»::«event.asRaiser»(«event.valueParams») {
@@ -255,90 +255,90 @@ class StatemachineImplementation {
 					«event.localValueAccess» = value;
 					«ENDIF»
 					«event.localAccess» = true;
-				}
-				
-				«IF scope.defaultInterface»
-					void «module»::«event.asRaiser»(«event.valueParams») {
-						«scope.instance».«event.asRaiser»(«IF event.hasValue»value«ENDIF»);
-					}
-					
+				}
+				
+				«IF scope.defaultInterface»
+					void «module»::«event.asRaiser»(«event.valueParams») {
+						«scope.instance».«event.asRaiser»(«IF event.hasValue»value«ENDIF»);
+					}
+					
 				«ENDIF»
 			«ENDFOR»
 			«FOR event : scope.outgoingEvents»
 				sc_boolean «module»::«scope.interfaceName»::«event.asRaised»() {
 					return «event.localAccess»;
-				}
-				
-				«IF scope.defaultInterface»
-					sc_boolean «module»::«event.asRaised»() {
-						return «scope.instance».«event.asRaised»();
-					}
-					
+				}
+				
+				«IF scope.defaultInterface»
+					sc_boolean «module»::«event.asRaised»() {
+						return «scope.instance».«event.asRaised»();
+					}
+					
 				«ENDIF»
 				«IF event.hasValue» 
 					«event.type.targetLanguageName» «module»::«scope.interfaceName»::«event.asGetter»() {
 						return «event.localValueAccess»;
-					}
-					
-					«IF scope.defaultInterface»
-						«event.type.targetLanguageName» «module»::«event.asGetter»() {
-							return «scope.instance».«event.asGetter»();
-						}
-						
+					}
+					
+					«IF scope.defaultInterface»
+						«event.type.targetLanguageName» «module»::«event.asGetter»() {
+							return «scope.instance».«event.asGetter»();
+						}
+						
 					«ENDIF»
 				«ENDIF»
-			«ENDFOR»
-			
-			«FOR event : scope.localEvents»
-				void «module»::«scope.interfaceName»::«event.asRaiser»(«event.valueParams») {
-					«IF event.hasValue»
-					«event.localValueAccess» = value;
-					«ENDIF»
-					«event.localAccess» = true;
-				}
-				
-				sc_boolean «module»::«scope.interfaceName»::«event.asRaised»() {
-					return «event.localAccess»;
-				}
-				
-				«IF event.hasValue» 
-					«event.type.targetLanguageName» «module»::«scope.interfaceName»::«event.asGetter»() {
-						return «event.localValueAccess»;
-					}
-					
-				«ENDIF»
+			«ENDFOR»
+			
+			«FOR event : scope.localEvents»
+				void «module»::«scope.interfaceName»::«event.asRaiser»(«event.valueParams») {
+					«IF event.hasValue»
+					«event.localValueAccess» = value;
+					«ENDIF»
+					«event.localAccess» = true;
+				}
+				
+				sc_boolean «module»::«scope.interfaceName»::«event.asRaised»() {
+					return «event.localAccess»;
+				}
+				
+				«IF event.hasValue» 
+					«event.type.targetLanguageName» «module»::«scope.interfaceName»::«event.asGetter»() {
+						return «event.localValueAccess»;
+					}
+					
+				«ENDIF»
 			«ENDFOR»
 			«FOR variable : scope.variableDefinitions»
 				«variable.type.targetLanguageName» «module»::«scope.interfaceName»::«variable.asGetter»() {
 					return «variable.localAccess»;
-				}
-				
-				«IF scope.defaultInterface»
-					«variable.type.targetLanguageName» «module»::«variable.asGetter»() {
-						return «variable.access»;
-					}
-					
+				}
+				
+				«IF scope.defaultInterface»
+					«variable.type.targetLanguageName» «module»::«variable.asGetter»() {
+						return «variable.access»;
+					}
+					
 				«ENDIF»
 				«IF !variable.readonly && !variable.const»
 					void «module»::«scope.interfaceName»::«variable.asSetter»(«variable.type.targetLanguageName» value) {
 						«variable.localAccess» = value;
-					}
-					
-					«IF scope.defaultInterface»
-						void «module»::«variable.asSetter»(«variable.type.targetLanguageName» value) {
-							«variable.access» = value;
-						}
-						
+					}
+					
+					«IF scope.defaultInterface»
+						void «module»::«variable.asSetter»(«variable.type.targetLanguageName» value) {
+							«variable.access» = value;
+						}
+						
 					«ENDIF»
 				«ENDIF»
-			«ENDFOR»
-			«IF scope.hasOperations && !entry.useStaticOPC»
-				«scope.OCB_InterfaceSetterDeclaration(true)» {
-					«scope.OCB_Instance» = operationCallback;
-				}
+			«ENDFOR»
+			«IF scope.hasOperations && !entry.useStaticOPC»
+				«scope.OCB_InterfaceSetterDeclaration(true)» {
+					«scope.OCB_Instance» = operationCallback;
+				}
 			«ENDIF»
 		«ENDFOR»
-	'''
+	'''
 	
 	/* ===================================================================================
 	 * Handling implementation of internal functions

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/IStatemachine.xtend

@@ -53,7 +53,7 @@ class IStatemachine {
 		
 			/**
 			 * Checks if the statemachine is active. 
-			 * A statemachine is active if it was entered. It is inactive if it has nt been entered at all or if it was exited.
+			 * A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
 			 */
 			public boolean isActive();
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/AlwaysOncycle/AlwaysOncycle.cc

@@ -18,19 +18,19 @@ AlwaysOncycle handle;
 TEST(StatemachineTest, alwaysOncycleTest) {
 	alwaysOncycle_init(&handle);
 	alwaysOncycle_enter(&handle);
-	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateA));
+	EXPECT_TRUE(alwaysOncycle_isStateActive(&handle, AlwaysOncycle_main_region_StateA));
 	while (alwaysOncycleIface_get_value(&handle) < 5l) {
 		alwaysOncycle_runCycle(&handle);
-		EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateA));
+		EXPECT_TRUE(alwaysOncycle_isStateActive(&handle, AlwaysOncycle_main_region_StateA));
 	}
 	alwaysOncycle_runCycle(&handle);
-	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateB));
+	EXPECT_TRUE(alwaysOncycle_isStateActive(&handle, AlwaysOncycle_main_region_StateB));
 	while (alwaysOncycleIface_get_value(&handle) < 5l) {
 		alwaysOncycle_runCycle(&handle);
-		EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateB));
+		EXPECT_TRUE(alwaysOncycle_isStateActive(&handle, AlwaysOncycle_main_region_StateB));
 	}
 	alwaysOncycle_runCycle(&handle);
-	EXPECT_TRUE(alwaysOncycle_isActive(&handle, AlwaysOncycle_main_region_StateA));
+	EXPECT_TRUE(alwaysOncycle_isStateActive(&handle, AlwaysOncycle_main_region_StateA));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/AssignmentAsExpression/AssignmentAsExpression.cc

@@ -18,33 +18,33 @@ AssignmentAsExpression handle;
 TEST(StatemachineTest, simpleAssignment) {
 	assignmentAsExpression_init(&handle);
 	assignmentAsExpression_enter(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Add));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_Add));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_b(&handle) == 5l);
 	EXPECT_TRUE(assignmentAsExpressionIface_get_a(&handle) == 9l);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Subtract));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_Subtract));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_d(&handle) == 6l);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Multiply));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_Multiply));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_e(&handle) == 15l);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Divide));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_Divide));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_g(&handle) == 1l);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Modulo));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_Modulo));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_i(&handle) == 1l);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_Shift));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_Shift));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_j(&handle) == 16l);
 	EXPECT_TRUE(assignmentAsExpressionIface_get_k(&handle) == 4l);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_And));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_boolean_And));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_l(&handle) == 1l);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_Or));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_boolean_Or));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_p(&handle) == 15l);
 	assignmentAsExpression_runCycle(&handle);
-	EXPECT_TRUE(assignmentAsExpression_isActive(&handle, AssignmentAsExpression_main_region_boolean_Xor));
+	EXPECT_TRUE(assignmentAsExpression_isStateActive(&handle, AssignmentAsExpression_main_region_boolean_Xor));
 	EXPECT_TRUE(assignmentAsExpressionIface_get_u(&handle) == 12l);
 	assignmentAsExpression_exit(&handle);
 }

test-plugins/org.yakindu.sct.generator.c.test/gtests/BitExpressions/BitExpressions.cc

@@ -18,12 +18,12 @@ BitExpressions handle;
 TEST(StatemachineTest, BitExpressions) {
 	bitExpressions_init(&handle);
 	bitExpressions_enter(&handle);
-	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_main_region_StateA));
+	EXPECT_TRUE(bitExpressions_isStateActive(&handle, BitExpressions_main_region_StateA));
 	EXPECT_TRUE(bitExpressionsIface_get_myBit1(&handle) == 5l);
 	EXPECT_TRUE(bitExpressionsIface_get_myBit2(&handle) == 7l);
 	bitExpressionsIface_raise_e1(&handle);
 	bitExpressions_runCycle(&handle);
-	EXPECT_TRUE(bitExpressions_isActive(&handle, BitExpressions_main_region_StateB));
+	EXPECT_TRUE(bitExpressions_isStateActive(&handle, BitExpressions_main_region_StateB));
 	EXPECT_TRUE(bitExpressionsIface_get_leftBitshift(&handle) == 10l);
 	EXPECT_TRUE(bitExpressionsIface_get_rightBitshift(&handle) == 2l);
 	EXPECT_TRUE(bitExpressionsIface_get_complementBitshift(&handle) == - 6l );

test-plugins/org.yakindu.sct.generator.c.test/gtests/BooleanExpressions/BooleanExpressions.cc

@@ -18,12 +18,12 @@ BooleanExpressions handle;
 TEST(StatemachineTest, booleanExpressions) {
 	booleanExpressions_init(&handle);
 	booleanExpressions_enter(&handle);
-	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_main_region_StateA));
+	EXPECT_TRUE(booleanExpressions_isStateActive(&handle, BooleanExpressions_main_region_StateA));
 	EXPECT_TRUE(booleanExpressionsIface_get_myBool1(&handle) == true);
 	EXPECT_TRUE(booleanExpressionsIface_get_myBool2(&handle) == false);
 	booleanExpressionsIface_raise_e1(&handle);
 	booleanExpressions_runCycle(&handle);
-	EXPECT_TRUE(booleanExpressions_isActive(&handle, BooleanExpressions_main_region_StateB));
+	EXPECT_TRUE(booleanExpressions_isStateActive(&handle, BooleanExpressions_main_region_StateB));
 	EXPECT_TRUE(booleanExpressionsIface_get_and(&handle) == false);
 	EXPECT_TRUE(booleanExpressionsIface_get_or(&handle) == true);
 	EXPECT_TRUE(booleanExpressionsIface_get_not(&handle) == false);

test-plugins/org.yakindu.sct.generator.c.test/gtests/CKeywords/CKeywords.cc

@@ -18,12 +18,12 @@ CKeywords handle;
 TEST(StatemachineTest, CKeywordsTest) {
 	cKeywords_init(&handle);
 	cKeywords_enter(&handle);
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_char));
+	EXPECT_TRUE(cKeywords_isStateActive(&handle, CKeywords_auto_char));
 	cKeywordsIface_raise_auto(&handle);
 	cKeywords_runCycle(&handle);
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_loop));
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_loop_switch_case));
-	EXPECT_TRUE(cKeywords_isActive(&handle, CKeywords_auto_loop_switch_case_enum_asm));
+	EXPECT_TRUE(cKeywords_isStateActive(&handle, CKeywords_auto_loop));
+	EXPECT_TRUE(cKeywords_isStateActive(&handle, CKeywords_auto_loop_switch_case));
+	EXPECT_TRUE(cKeywords_isStateActive(&handle, CKeywords_auto_loop_switch_case_enum_asm));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/CastExpressions/CastExpressions.cc

@@ -23,7 +23,7 @@ TEST(StatemachineTest, CastExpressionTest) {
 	castExpressions_runCycle(&handle);
 	EXPECT_TRUE(castExpressionsIface_get_realValue(&handle) == 15l);
 	castExpressions_runCycle(&handle);
-	EXPECT_TRUE(castExpressions_isActive(&handle, CastExpressions_main_region_C));
+	EXPECT_TRUE(castExpressions_isStateActive(&handle, CastExpressions_main_region_C));
 	EXPECT_TRUE(castExpressionsIface_get_realValue(&handle) == 757l);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/Choice/Choice.cc

@@ -18,65 +18,65 @@ Choice handle;
 TEST(StatemachineTest, elseChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_e(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_C));
 }
 TEST(StatemachineTest, elseChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_e(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_B));
 }
 TEST(StatemachineTest, defaultChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_g(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_C));
 }
 TEST(StatemachineTest, defaultChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_g(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_B));
 }
 TEST(StatemachineTest, uncheckedChoiceUsingNonDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_f(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_C));
 }
 TEST(StatemachineTest, uncheckedChoiceUsingDefaultTransition) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, false);
 	choiceIface_raise_f(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_B));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_B));
 }
 TEST(StatemachineTest, alwaysTrueTransitionInChoice) {
 	choice_init(&handle);
 	choice_enter(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_A));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_A));
 	choiceIface_set_c(&handle, true);
 	choiceIface_raise_h(&handle);
 	choice_runCycle(&handle);
-	EXPECT_TRUE(choice_isActive(&handle, Choice_main_region_C));
+	EXPECT_TRUE(choice_isStateActive(&handle, Choice_main_region_C));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ConditionalExpression/ConditionalExpression.cc

@@ -18,11 +18,11 @@ ConditionalExpressions handle;
 TEST(StatemachineTest, ConditionalExpressionTest) {
 	conditionalExpressions_init(&handle);
 	conditionalExpressions_enter(&handle);
-	EXPECT_TRUE(conditionalExpressions_isActive(&handle, ConditionalExpressions_main_region_A));
+	EXPECT_TRUE(conditionalExpressions_isStateActive(&handle, ConditionalExpressions_main_region_A));
 	EXPECT_TRUE(conditionalExpressionsIface_get_condition(&handle) == 1l);
 	conditionalExpressionsIface_raise_e(&handle);
 	conditionalExpressions_runCycle(&handle);
-	EXPECT_TRUE(conditionalExpressions_isActive(&handle, ConditionalExpressions_main_region_B));
+	EXPECT_TRUE(conditionalExpressions_isStateActive(&handle, ConditionalExpressions_main_region_B));
 	EXPECT_TRUE(conditionalExpressionsIface_get_condition(&handle) == 2l);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/ConstantsTests/ConstantsTests.cc

@@ -18,7 +18,7 @@ Constants handle;
 TEST(StatemachineTest, constantDefinition) {
 	constants_init(&handle);
 	constants_enter(&handle);
-	EXPECT_TRUE(constants_isActive(&handle, Constants_main_region_A));
+	EXPECT_TRUE(constants_isStateActive(&handle, Constants_main_region_A));
 	EXPECT_TRUE(constantsIface_get_x(&handle) == 10l);
 	EXPECT_TRUE(constantsIface_get_y(&handle) == 20l);
 	EXPECT_TRUE(strcmp(constantsIfaceNamed_get_y(&handle) , "Hello World") == 0);
@@ -27,12 +27,12 @@ TEST(StatemachineTest, constantDefinition) {
 	EXPECT_TRUE(constantsIface_get_result(&handle) == 20l);
 	constantsIface_raise_e(&handle);
 	constants_runCycle(&handle);
-	EXPECT_TRUE(constants_isActive(&handle, Constants_main_region_C));
+	EXPECT_TRUE(constants_isStateActive(&handle, Constants_main_region_C));
 	EXPECT_TRUE(constantsIface_get_result(&handle) == 100l);
 	constantsIface_raise_e2(&handle, constantsIface_get_x(&handle) );
 	constants_runCycle(&handle);
 	EXPECT_TRUE(constantsIface_get_result(&handle) == 1000l);
-	EXPECT_TRUE(constants_isActive(&handle, Constants_main_region_A));
+	EXPECT_TRUE(constants_isStateActive(&handle, Constants_main_region_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepEntry/DeepEntry.cc

@@ -26,13 +26,13 @@ TEST(StatemachineTest, enterToSubstate) {
 	EXPECT_TRUE(deepEntryIface_get_z(&handle) == 2l);
 	deepEntryIface_raise_e(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_B_r_BB));
+	EXPECT_TRUE(deepEntry_isStateActive(&handle, DeepEntry_r2_B_r_BB));
 	deepEntryIface_raise_f(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_C));
+	EXPECT_TRUE(deepEntry_isStateActive(&handle, DeepEntry_r2_C));
 	deepEntryIface_raise_f(&handle);
 	deepEntry_runCycle(&handle);
-	EXPECT_TRUE(deepEntry_isActive(&handle, DeepEntry_r2_B_r_BB));
+	EXPECT_TRUE(deepEntry_isStateActive(&handle, DeepEntry_r2_B_r_BB));
 	EXPECT_TRUE(deepEntryIface_get_y(&handle) == 1l);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/DeepHistory/DeepHistory.cc

@@ -26,16 +26,16 @@ TEST(StatemachineTest, deepHistoryTest) {
 	deepHistory_runCycle(&handle);
 	deepHistoryIface_raise_event7(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!deepHistory_isStateActive(&handle, DeepHistory_mainRegion_State1));
+	EXPECT_TRUE(deepHistory_isStateActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	deepHistoryIface_raise_event2(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(deepHistory_isStateActive(&handle, DeepHistory_mainRegion_State1));
+	EXPECT_TRUE(!deepHistory_isStateActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	deepHistoryIface_raise_event1(&handle);
 	deepHistory_runCycle(&handle);
-	EXPECT_TRUE(!deepHistory_isActive(&handle, DeepHistory_mainRegion_State1));
-	EXPECT_TRUE(deepHistory_isActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!deepHistory_isStateActive(&handle, DeepHistory_mainRegion_State1));
+	EXPECT_TRUE(deepHistory_isStateActive(&handle, DeepHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/DynamicChoice/DynamicChoice.cc

@@ -18,9 +18,9 @@ DynamicChoice handle;
 TEST(StatemachineTest, DynamicChoiceTest) {
 	dynamicChoice_init(&handle);
 	dynamicChoice_enter(&handle);
-	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_main_region_Start));
+	EXPECT_TRUE(dynamicChoice_isStateActive(&handle, DynamicChoice_main_region_Start));
 	dynamicChoice_runCycle(&handle);
-	EXPECT_TRUE(dynamicChoice_isActive(&handle, DynamicChoice_main_region_A));
+	EXPECT_TRUE(dynamicChoice_isStateActive(&handle, DynamicChoice_main_region_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/EmptyTransition/EmptyTransition.cc

@@ -19,8 +19,8 @@ TEST(StatemachineTest, EmptyTransitionTest) {
 	emptyTransition_init(&handle);
 	emptyTransition_enter(&handle);
 	emptyTransition_runCycle(&handle);
-	EXPECT_TRUE(!emptyTransition_isActive(&handle, EmptyTransition_main_region_B));
-	EXPECT_TRUE(emptyTransition_isActive(&handle, EmptyTransition_main_region_A));
+	EXPECT_TRUE(!emptyTransition_isStateActive(&handle, EmptyTransition_main_region_B));
+	EXPECT_TRUE(emptyTransition_isStateActive(&handle, EmptyTransition_main_region_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/EnterState/EnterState.cc

@@ -18,26 +18,26 @@ EnterState handle;
 TEST(StatemachineTest, defaultEntry) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
+	EXPECT_TRUE(enterState_isStateActive(&handle, EnterState_r_A));
 	enterStateIface_raise_e(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_E));
+	EXPECT_TRUE(enterState_isStateActive(&handle, EnterState_r_B_r_E));
 }
 TEST(StatemachineTest, namedEntryThroughNamedTransition) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
+	EXPECT_TRUE(enterState_isStateActive(&handle, EnterState_r_A));
 	enterStateIface_raise_f(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_F));
+	EXPECT_TRUE(enterState_isStateActive(&handle, EnterState_r_B_r_F));
 }
 TEST(StatemachineTest, namedEntryThroughDefaultTransition) {
 	enterState_init(&handle);
 	enterState_enter(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_A));
+	EXPECT_TRUE(enterState_isStateActive(&handle, EnterState_r_A));
 	enterStateIface_raise_g(&handle);
 	enterState_runCycle(&handle);
-	EXPECT_TRUE(enterState_isActive(&handle, EnterState_r_B_r_E));
+	EXPECT_TRUE(enterState_isStateActive(&handle, EnterState_r_B_r_E));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/EntryChoice/EntryChoice.cc

@@ -20,7 +20,7 @@ TEST(StatemachineTest, EntryChoiceTest) {
 	entryChoice_enter(&handle);
 	entryChoice_runCycle(&handle);
 	entryChoice_runCycle(&handle);
-	EXPECT_TRUE(entryChoice_isActive(&handle, EntryChoice_main_region_A));
+	EXPECT_TRUE(entryChoice_isStateActive(&handle, EntryChoice_main_region_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/EntryExitSelfTransition/EntryExitSelfTransition.cc

@@ -20,13 +20,13 @@ TEST(StatemachineTest, SelfTransitionToChildState) {
 	entryExitSelfTransition_enter(&handle);
 	entryExitSelfTransition_runCycle(&handle);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1l);
-	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_B));
+	EXPECT_TRUE(entryExitSelfTransition_isStateActive(&handle, EntryExitSelfTransition_main_region_A__region0_B));
 	entryExitSelfTransitionIface_set_entries(&handle, 0l);
 	entryExitSelfTransitionIface_raise_e(&handle);
 	entryExitSelfTransition_runCycle(&handle);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1l);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 1l);
-	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_C));
+	EXPECT_TRUE(entryExitSelfTransition_isStateActive(&handle, EntryExitSelfTransition_main_region_A__region0_C));
 }
 TEST(StatemachineTest, SelfTransitionFromChildState) {
 	entryExitSelfTransition_init(&handle);
@@ -38,10 +38,10 @@ TEST(StatemachineTest, SelfTransitionFromChildState) {
 	entryExitSelfTransition_runCycle(&handle);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 0l);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 0l);
-	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_C));
+	EXPECT_TRUE(entryExitSelfTransition_isStateActive(&handle, EntryExitSelfTransition_main_region_A__region0_C));
 	entryExitSelfTransitionIface_raise_e1(&handle);
 	entryExitSelfTransition_runCycle(&handle);
-	EXPECT_TRUE(entryExitSelfTransition_isActive(&handle, EntryExitSelfTransition_main_region_A__region0_B));
+	EXPECT_TRUE(entryExitSelfTransition_isStateActive(&handle, EntryExitSelfTransition_main_region_A__region0_B));
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_entries(&handle) == 1l);
 	EXPECT_TRUE(entryExitSelfTransitionIface_get_exits(&handle) == 1l);
 }

test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitOnSelfTransition/ExitOnSelfTransition.cc

@@ -18,7 +18,7 @@ ExitOnSelfTransition handle;
 TEST(StatemachineTest, ExitOnSelfTransitionTest) {
 	exitOnSelfTransition_init(&handle);
 	exitOnSelfTransition_enter(&handle);
-	EXPECT_TRUE(exitOnSelfTransition_isActive(&handle, ExitOnSelfTransition_main_region_A));
+	EXPECT_TRUE(exitOnSelfTransition_isStateActive(&handle, ExitOnSelfTransition_main_region_A));
 	EXPECT_TRUE(exitOnSelfTransitionIface_get_entryCount(&handle) == 1l);
 	EXPECT_TRUE(exitOnSelfTransitionIface_get_exitCount(&handle) == 0l);
 	exitOnSelfTransitionIface_raise_e(&handle);

test-plugins/org.yakindu.sct.generator.c.test/gtests/ExitState/ExitState.cc

@@ -18,33 +18,33 @@ ExitState handle;
 TEST(StatemachineTest, defaultExit) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isStateActive(&handle, ExitState_r_A));
 	exitStateIface_raise_e(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_E));
+	EXPECT_TRUE(exitState_isStateActive(&handle, ExitState_r_E));
 }
 TEST(StatemachineTest, namedExitThroughNamedTransition) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isStateActive(&handle, ExitState_r_A));
 	exitStateIface_raise_f(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_F));
+	EXPECT_TRUE(exitState_isStateActive(&handle, ExitState_r_F));
 }
 TEST(StatemachineTest, namedExitThroughDefaultTransition) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isStateActive(&handle, ExitState_r_A));
 	exitStateIface_raise_g(&handle);
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_E));
+	EXPECT_TRUE(exitState_isStateActive(&handle, ExitState_r_E));
 }
 TEST(StatemachineTest, remainInA) {
 	exitState_init(&handle);
 	exitState_enter(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isStateActive(&handle, ExitState_r_A));
 	exitState_runCycle(&handle);
-	EXPECT_TRUE(exitState_isActive(&handle, ExitState_r_A));
+	EXPECT_TRUE(exitState_isStateActive(&handle, ExitState_r_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/FeatureCalls/FeatureCalls.cc

@@ -18,9 +18,9 @@ FeatureCalls handle;
 TEST(StatemachineTest, FeatureCalls) {
 	featureCalls_init(&handle);
 	featureCalls_enter(&handle);
-	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_main_region_A));
+	EXPECT_TRUE(featureCalls_isStateActive(&handle, FeatureCalls_main_region_A));
 	featureCalls_runCycle(&handle);
-	EXPECT_TRUE(featureCalls_isActive(&handle, FeatureCalls_main_region_A));
+	EXPECT_TRUE(featureCalls_isStateActive(&handle, FeatureCalls_main_region_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/FinalState/FinalState.cc

@@ -0,0 +1,25 @@
+/**
+* Copyright (c) 2015 committers of YAKINDU and others.
+* All rights reserved. This program and the accompanying materials
+* are made available under the terms of the Eclipse Public License v1.0
+* which accompanies this distribution, and is available at
+* http://www.eclipse.org/legal/epl-v10.html
+*
+* Contributors:
+*     committers of YAKINDU - initial API and implementation
+*/
+#include <string>
+#include "gtest/gtest.h"
+#include "FinalState.h"
+
+
+FinalState handle;
+
+TEST(StatemachineTest, StatechartNameTest) {
+	finalState_init(&handle);
+	finalState_enter(&handle);
+	finalState_runCycle(&handle);
+	EXPECT_TRUE(finalState_isFinal(&handle));
+}
+
+		

test-plugins/org.yakindu.sct.generator.c.test/gtests/FinalState/FinalState.sgen

@@ -0,0 +1,19 @@
+GeneratorModel for yakindu::c {
+	statechart FinalState {
+		feature Outlet {
+			targetProject = "gtests"
+			targetFolder = "FinalState"
+		}
+		feature FunctionInlining {
+			inlineReactions = false
+			inlineEntryActions = false
+			inlineEnterSequences = false 
+			inlineExitActions = false
+			inlineExitSequences = false
+			inlineChoices = false
+			inlineEntries = false
+			inlineEnterRegion = false
+			inlineExitRegion = false
+		}
+	}
+}

test-plugins/org.yakindu.sct.generator.c.test/gtests/Guard/Guard.cc

@@ -18,22 +18,22 @@ Guard handle;
 TEST(StatemachineTest, guardTest) {
 	guard_init(&handle);
 	guard_enter(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
+	EXPECT_TRUE(guard_isStateActive(&handle, Guard_main_region_A));
 	guardIface_raise_event1(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
+	EXPECT_TRUE(guard_isStateActive(&handle, Guard_main_region_A));
 	guardIface_raise_event2(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_B));
+	EXPECT_TRUE(guard_isStateActive(&handle, Guard_main_region_B));
 	guardIface_raise_return(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
+	EXPECT_TRUE(guard_isStateActive(&handle, Guard_main_region_A));
 	guardIface_raise_event1(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_B));
+	EXPECT_TRUE(guard_isStateActive(&handle, Guard_main_region_B));
 	guardIface_raise_return(&handle);
 	guard_runCycle(&handle);
-	EXPECT_TRUE(guard_isActive(&handle, Guard_main_region_A));
+	EXPECT_TRUE(guard_isStateActive(&handle, Guard_main_region_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedEntry/GuardedEntry.cc

@@ -19,42 +19,42 @@ TEST(StatemachineTest, EntryNotTakenOnStatechartEnter) {
 	guardedEntry_init(&handle);
 	EXPECT_TRUE(guardedEntryIface_get_guard(&handle) == false);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isStateActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) == false);
 }
 TEST(StatemachineTest, EntryTakenOnStatechartEnter) {
 	guardedEntry_init(&handle);
 	guardedEntryIface_set_guard(&handle, true);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isStateActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) == true);
 }
 TEST(StatemachineTest, EntryTakenInTransition) {
 	guardedEntry_init(&handle);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isStateActive(&handle, GuardedEntry_main_region_A));
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_B));
+	EXPECT_TRUE(guardedEntry_isStateActive(&handle, GuardedEntry_main_region_B));
 	guardedEntryIface_set_guard(&handle, true);
 	guardedEntryIface_set_done(&handle, false);
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isStateActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(guardedEntryIface_get_done(&handle) );
 }
 TEST(StatemachineTest, EntryNotTakenInTransition) {
 	guardedEntry_init(&handle);
 	guardedEntry_enter(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isStateActive(&handle, GuardedEntry_main_region_A));
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_B));
+	EXPECT_TRUE(guardedEntry_isStateActive(&handle, GuardedEntry_main_region_B));
 	guardedEntryIface_set_guard(&handle, false);
 	guardedEntryIface_set_done(&handle, false);
 	guardedEntryIface_raise_e(&handle);
 	guardedEntry_runCycle(&handle);
-	EXPECT_TRUE(guardedEntry_isActive(&handle, GuardedEntry_main_region_A));
+	EXPECT_TRUE(guardedEntry_isStateActive(&handle, GuardedEntry_main_region_A));
 	EXPECT_TRUE(!guardedEntryIface_get_done(&handle) );
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/GuardedExit/GuardedExit.cc

@@ -18,21 +18,21 @@ GuardedExit handle;
 TEST(StatemachineTest, ExitTaken) {
 	guardedExit_init(&handle);
 	guardedExit_enter(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_A));
+	EXPECT_TRUE(guardedExit_isStateActive(&handle, GuardedExit_main_region_A));
 	EXPECT_TRUE(!guardedExitIface_get_guard(&handle) );
 	guardedExitIface_raise_e(&handle);
 	guardedExit_runCycle(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_B));
+	EXPECT_TRUE(guardedExit_isStateActive(&handle, GuardedExit_main_region_B));
 	EXPECT_TRUE(!guardedExitIface_get_done(&handle) );
 }
 TEST(StatemachineTest, ExitNotTaken) {
 	guardedExit_init(&handle);
 	guardedExit_enter(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_A));
+	EXPECT_TRUE(guardedExit_isStateActive(&handle, GuardedExit_main_region_A));
 	guardedExitIface_set_guard(&handle, true);
 	guardedExitIface_raise_e(&handle);
 	guardedExit_runCycle(&handle);
-	EXPECT_TRUE(guardedExit_isActive(&handle, GuardedExit_main_region_B));
+	EXPECT_TRUE(guardedExit_isStateActive(&handle, GuardedExit_main_region_B));
 	EXPECT_TRUE(guardedExitIface_get_done(&handle) );
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/HistoryWithExitPoint/HistoryWithExitPoint.cc

@@ -18,22 +18,22 @@ HistoryWithExitPoint handle;
 TEST(StatemachineTest, historyEntryAfterExit) {
 	historyWithExitPoint_init(&handle);
 	historyWithExitPoint_enter(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_A_r_X1));
+	EXPECT_TRUE(historyWithExitPoint_isStateActive(&handle, HistoryWithExitPoint_mr_A_r_X1));
 	historyWithExitPointIface_raise_push(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_B));
+	EXPECT_TRUE(historyWithExitPoint_isStateActive(&handle, HistoryWithExitPoint_mr_B));
 	historyWithExitPointIface_raise_back(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_A_r_X1));
+	EXPECT_TRUE(historyWithExitPoint_isStateActive(&handle, HistoryWithExitPoint_mr_A_r_X1));
 	historyWithExitPointIface_raise_next(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_A_r_X2));
+	EXPECT_TRUE(historyWithExitPoint_isStateActive(&handle, HistoryWithExitPoint_mr_A_r_X2));
 	historyWithExitPointIface_raise_push(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_B));
+	EXPECT_TRUE(historyWithExitPoint_isStateActive(&handle, HistoryWithExitPoint_mr_B));
 	historyWithExitPointIface_raise_back(&handle);
 	historyWithExitPoint_runCycle(&handle);
-	EXPECT_TRUE(historyWithExitPoint_isActive(&handle, HistoryWithExitPoint_mr_A_r_X2));
+	EXPECT_TRUE(historyWithExitPoint_isStateActive(&handle, HistoryWithExitPoint_mr_A_r_X2));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/HistoryWithoutInitialStep/HistoryWithoutInitialStep.cc

@@ -18,43 +18,43 @@ HistoryWithoutInitialStep handle;
 TEST(StatemachineTest, enterThroughInitialEntry) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_toB(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
 	historyWithoutInitialStepIface_raise_next(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
 }
 TEST(StatemachineTest, enterCThroughHistory) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_toB(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
 	historyWithoutInitialStepIface_raise_toA(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_toHistory(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_C));
 }
 TEST(StatemachineTest, enterDThroughHistory) {
 	historyWithoutInitialStep_init(&handle);
 	historyWithoutInitialStep_enter(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_toB(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
 	historyWithoutInitialStepIface_raise_next(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
 	historyWithoutInitialStepIface_raise_toA(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_A));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_A));
 	historyWithoutInitialStepIface_raise_toHistory(&handle);
 	historyWithoutInitialStep_runCycle(&handle);
-	EXPECT_TRUE(historyWithoutInitialStep_isActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
+	EXPECT_TRUE(historyWithoutInitialStep_isStateActive(&handle, HistoryWithoutInitialStep_main_region_B_r1_D));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/IntegerExpressions/IntegerExpressions.cc

@@ -18,7 +18,7 @@ IntegerExpressions handle;
 TEST(StatemachineTest, integerExpressions) {
 	integerExpressions_init(&handle);
 	integerExpressions_enter(&handle);
-	EXPECT_TRUE(integerExpressions_isActive(&handle, IntegerExpressions_main_region_StateA));
+	EXPECT_TRUE(integerExpressions_isStateActive(&handle, IntegerExpressions_main_region_StateA));
 	EXPECT_TRUE(integerExpressionsIface_get_myInt1(&handle) == 10l);
 	EXPECT_TRUE(integerExpressionsIface_get_myInt2(&handle) == 5l);
 	integerExpressionsIface_raise_e1(&handle);

test-plugins/org.yakindu.sct.generator.c.test/gtests/InternalEventLifeCycle/InternalEventLifeCycle.cc

@@ -18,22 +18,22 @@ InternalEventLifeCycle handle;
 TEST(StatemachineTest, InternalEventLifeCycleTest) {
 	internalEventLifeCycle_init(&handle);
 	internalEventLifeCycle_enter(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r2_C));
 	internalEventLifeCycleIface_raise_e(&handle);
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_D));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r2_D));
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_D));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r2_D));
 	internalEventLifeCycleIface_raise_f(&handle);
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r2_C));
 	internalEventLifeCycle_runCycle(&handle);
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r1_A));
-	EXPECT_TRUE(internalEventLifeCycle_isActive(&handle, InternalEventLifeCycle_r2_C));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r1_A));
+	EXPECT_TRUE(internalEventLifeCycle_isStateActive(&handle, InternalEventLifeCycle_r2_C));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/LocalReactions/LocalReactions.cc

@@ -18,7 +18,7 @@ LocalReactions handle;
 TEST(StatemachineTest, LocalReactionsTest) {
 	localReactions_init(&handle);
 	localReactions_enter(&handle);
-	EXPECT_TRUE(localReactions_isActive(&handle, LocalReactions_main_region_A));
+	EXPECT_TRUE(localReactions_isStateActive(&handle, LocalReactions_main_region_A));
 	localReactions_runCycle(&handle);
 	EXPECT_TRUE(localReactionsIface_get_x(&handle) == 1l);
 }

test-plugins/org.yakindu.sct.generator.c.test/gtests/NullCheck/NullCheck.cc

@@ -18,9 +18,9 @@ NullCheck handle;
 TEST(StatemachineTest, SimpleNullCheckTest) {
 	nullCheck_init(&handle);
 	nullCheck_enter(&handle);
-	EXPECT_TRUE(nullCheck_isActive(&handle, NullCheck_main_region_A));
+	EXPECT_TRUE(nullCheck_isStateActive(&handle, NullCheck_main_region_A));
 	nullCheck_runCycle(&handle);
-	EXPECT_TRUE(nullCheck_isActive(&handle, NullCheck_main_region_B));
+	EXPECT_TRUE(nullCheck_isStateActive(&handle, NullCheck_main_region_B));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/Parenthesis/Parenthesis.cc

@@ -18,7 +18,7 @@ Parenthesis handle;
 TEST(StatemachineTest, simple) {
 	parenthesis_init(&handle);
 	parenthesis_enter(&handle);
-	EXPECT_TRUE(parenthesis_isActive(&handle, Parenthesis_mainRegion_A));
+	EXPECT_TRUE(parenthesis_isStateActive(&handle, Parenthesis_mainRegion_A));
 	EXPECT_TRUE(parenthesisIface_get_erg(&handle) == 8l);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/PriorityValues/PriorityValues.cc

@@ -18,19 +18,19 @@ PriorityValues handle;
 TEST(StatemachineTest, transitionPriority) {
 	priorityValues_init(&handle);
 	priorityValues_enter(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_main_region_A));
+	EXPECT_TRUE(priorityValues_isStateActive(&handle, PriorityValues_main_region_A));
 	priorityValuesIface_raise_event1(&handle);
 	priorityValues_runCycle(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_main_region_C));
+	EXPECT_TRUE(priorityValues_isStateActive(&handle, PriorityValues_main_region_C));
 }
 TEST(StatemachineTest, regionPriority) {
 	priorityValues_init(&handle);
 	priorityValues_enter(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_someRegion_A));
+	EXPECT_TRUE(priorityValues_isStateActive(&handle, PriorityValues_someRegion_A));
 	priorityValuesIface_raise_event2(&handle);
 	priorityValues_runCycle(&handle);
-	EXPECT_TRUE(priorityValues_isActive(&handle, PriorityValues_someRegion_B));
-	EXPECT_TRUE(!priorityValues_isActive(&handle, PriorityValues_main_region_E));
+	EXPECT_TRUE(priorityValues_isStateActive(&handle, PriorityValues_someRegion_B));
+	EXPECT_TRUE(!priorityValues_isStateActive(&handle, PriorityValues_main_region_E));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/RaiseEvent/RaiseEvent.cc

@@ -18,13 +18,13 @@ RaiseEvent handle;
 TEST(StatemachineTest, raiseEvent) {
 	raiseEvent_init(&handle);
 	raiseEvent_enter(&handle);
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_second_region_SateA));
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_main_region_StateA));
+	EXPECT_TRUE(raiseEvent_isStateActive(&handle, RaiseEvent_second_region_SateA));
+	EXPECT_TRUE(raiseEvent_isStateActive(&handle, RaiseEvent_main_region_StateA));
 	raiseEventIface_raise_e2(&handle);
 	raiseEvent_runCycle(&handle);
 	raiseEvent_runCycle(&handle);
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_second_region_StateB));
-	EXPECT_TRUE(raiseEvent_isActive(&handle, RaiseEvent_main_region_StateB));
+	EXPECT_TRUE(raiseEvent_isStateActive(&handle, RaiseEvent_second_region_StateB));
+	EXPECT_TRUE(raiseEvent_isStateActive(&handle, RaiseEvent_main_region_StateB));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/STextKeywordsInStatesAndRegions/STextKeywordsInStatesAndRegions.cc

@@ -18,466 +18,466 @@ STextKeywordsInStatesAndRegions handle;
 TEST(StatemachineTest, activeCheckWithSTextNamedStates) {
 	sTextKeywordsInStatesAndRegions_init(&handle);
 	sTextKeywordsInStatesAndRegions_enter(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_active));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_interface));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_event));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_event));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_in));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_var));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_external));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_external));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_default));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_entry));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_always));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_raise));
 	sTextKeywordsInStatesAndRegionsIface_raise_e1(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_valueof));
 	sTextKeywordsInStatesAndRegionsIface_raise_e2(&handle);
 	sTextKeywordsInStatesAndRegions_runCycle(&handle);
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_local_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_event_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_else_local));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
-	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isActive(&handle, STextKeywordsInStatesAndRegions_active_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_default_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_operation_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_namespace_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_local_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_interface_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_internal_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_event_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_in_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_out_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_var_valueof));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_readonly_namespace));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_external_internal));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_else_local));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_entry_out));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_exit_readonly));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_always_operation));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_oncycle_else));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_raise_exit));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_valueof_oncycle));
+	EXPECT_TRUE(sTextKeywordsInStatesAndRegions_isStateActive(&handle, STextKeywordsInStatesAndRegions_active_valueof));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SameNameDifferentRegion/SameNameDifferentRegion.cc

@@ -18,15 +18,15 @@ SameNameDifferentRegion handle;
 TEST(StatemachineTest, sameNameDifferenRegionTest) {
 	sameNameDifferentRegion_init(&handle);
 	sameNameDifferentRegion_enter(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateA));
+	EXPECT_TRUE(sameNameDifferentRegion_isStateActive(&handle, SameNameDifferentRegion_main_region_StateA));
 	sameNameDifferentRegionIface_raise_e1(&handle);
 	sameNameDifferentRegion_runCycle(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB));
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB_r1_StateA));
+	EXPECT_TRUE(sameNameDifferentRegion_isStateActive(&handle, SameNameDifferentRegion_main_region_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isStateActive(&handle, SameNameDifferentRegion_main_region_StateB_r1_StateA));
 	sameNameDifferentRegionIface_raise_e1(&handle);
 	sameNameDifferentRegion_runCycle(&handle);
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB));
-	EXPECT_TRUE(sameNameDifferentRegion_isActive(&handle, SameNameDifferentRegion_main_region_StateB_r1_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isStateActive(&handle, SameNameDifferentRegion_main_region_StateB));
+	EXPECT_TRUE(sameNameDifferentRegion_isStateActive(&handle, SameNameDifferentRegion_main_region_StateB_r1_StateB));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ShallowHistory/ShallowHistory.cc

@@ -26,28 +26,28 @@ TEST(StatemachineTest, shallowHistoryTest) {
 	shallowHistory_runCycle(&handle);
 	shallowHistoryIface_raise_event7(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State1));
+	EXPECT_TRUE(shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	shallowHistoryIface_raise_event6(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(!shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
 	shallowHistoryIface_raise_event5(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State8));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State8));
+	EXPECT_TRUE(shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 	shallowHistoryIface_raise_event2(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
+	EXPECT_TRUE(!shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State1));
 	shallowHistoryIface_raise_event1(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State1));
+	EXPECT_TRUE(shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(!shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State1));
 	shallowHistoryIface_raise_event5(&handle);
 	shallowHistory_runCycle(&handle);
-	EXPECT_TRUE(!shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
-	EXPECT_TRUE(shallowHistory_isActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
+	EXPECT_TRUE(!shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State6));
+	EXPECT_TRUE(shallowHistory_isStateActive(&handle, ShallowHistory_mainRegion_State2__region0_State4__region0_State7__region0_State9));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ShallowHistoryWithDeepEntry/ShallowHistoryWithDeepEntry.cc

@@ -18,51 +18,51 @@ ShallowHistoryWithDeepEntry handle;
 TEST(StatemachineTest, noDeepEntryWithinHistory) {
 	shallowHistoryWithDeepEntry_init(&handle);
 	shallowHistoryWithDeepEntry_enter(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
 	shallowHistoryWithDeepEntryIface_raise_toZ(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_A));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_A));
 	shallowHistoryWithDeepEntryIface_raise_toY(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
 	shallowHistoryWithDeepEntryIface_raise_toZ(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_A));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_A));
 }
 TEST(StatemachineTest, deepEntryWithinHistory) {
 	shallowHistoryWithDeepEntry_init(&handle);
 	shallowHistoryWithDeepEntry_enter(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
 	shallowHistoryWithDeepEntryIface_raise_toZ(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_A));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_A));
 	shallowHistoryWithDeepEntryIface_raise_toC(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B__region0_C));
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B__region0_C));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B));
 	shallowHistoryWithDeepEntryIface_raise_toY(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
 	shallowHistoryWithDeepEntryIface_raise_toZ(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B__region0_C));
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B__region0_C));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B));
 }
 TEST(StatemachineTest, directDeepEntryIntoHistory) {
 	shallowHistoryWithDeepEntry_init(&handle);
 	shallowHistoryWithDeepEntry_enter(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
 	shallowHistoryWithDeepEntryIface_raise_toC(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B__region0_C));
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B__region0_C));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B));
 	shallowHistoryWithDeepEntryIface_raise_toY(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Y));
 	shallowHistoryWithDeepEntryIface_raise_toZ(&handle);
 	shallowHistoryWithDeepEntry_runCycle(&handle);
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B__region0_C));
-	EXPECT_TRUE(shallowHistoryWithDeepEntry_isActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B__region0_C));
+	EXPECT_TRUE(shallowHistoryWithDeepEntry_isStateActive(&handle, ShallowHistoryWithDeepEntry_main_region_Z__region0_B));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleEvent/SimpleEvent.cc

@@ -18,13 +18,13 @@ SimpleEvent handle;
 TEST(StatemachineTest, simpleEventTest) {
 	simpleEvent_init(&handle);
 	simpleEvent_enter(&handle);
-	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_main_region_A)) << "Expected A to be active" ;
+	EXPECT_TRUE(simpleEvent_isStateActive(&handle, SimpleEvent_main_region_A)) << "Expected A to be active" ;
 	EXPECT_TRUE(5l== 5l);
 	simpleEventIface_raise_event1(&handle);
 	simpleEvent_runCycle(&handle);
-	EXPECT_TRUE(simpleEvent_isActive(&handle, SimpleEvent_main_region_B)) << "Expected B to be active" ;
+	EXPECT_TRUE(simpleEvent_isStateActive(&handle, SimpleEvent_main_region_B)) << "Expected B to be active" ;
 	simpleEvent_runCycle(&handle);
-	EXPECT_TRUE(!simpleEvent_isActive(&handle, SimpleEvent_main_region_B));
+	EXPECT_TRUE(!simpleEvent_isStateActive(&handle, SimpleEvent_main_region_B));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SimpleHierachy/SimpleHierachy.cc

@@ -18,13 +18,13 @@ SimpleHierachy handle;
 TEST(StatemachineTest, simpleHierachyTest) {
 	simpleHierachy_init(&handle);
 	simpleHierachy_enter(&handle);
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_A));
+	EXPECT_TRUE(simpleHierachy_isStateActive(&handle, SimpleHierachy_main_region_A));
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachyIface_raise_event1(&handle);
 	simpleHierachy_runCycle(&handle);
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_B));
-	EXPECT_TRUE(simpleHierachy_isActive(&handle, SimpleHierachy_main_region_B_subregion1_B1));
+	EXPECT_TRUE(simpleHierachy_isStateActive(&handle, SimpleHierachy_main_region_B));
+	EXPECT_TRUE(simpleHierachy_isStateActive(&handle, SimpleHierachy_main_region_B_subregion1_B1));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/StateIsActive/StateIsActive.cc

@@ -18,13 +18,13 @@ StateIsActive handle;
 TEST(StatemachineTest, stateIsActive) {
 	stateIsActive_init(&handle);
 	stateIsActive_enter(&handle);
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1_R1A));
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2_R2A));
+	EXPECT_TRUE(stateIsActive_isStateActive(&handle, StateIsActive_R1_R1A));
+	EXPECT_TRUE(stateIsActive_isStateActive(&handle, StateIsActive_R2_R2A));
 	stateIsActiveIface_raise_event1(&handle);
 	stateIsActive_runCycle(&handle);
 	stateIsActive_runCycle(&handle);
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R1_R1B));
-	EXPECT_TRUE(stateIsActive_isActive(&handle, StateIsActive_R2_R2B));
+	EXPECT_TRUE(stateIsActive_isStateActive(&handle, StateIsActive_R1_R1B));
+	EXPECT_TRUE(stateIsActive_isStateActive(&handle, StateIsActive_R2_R2B));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/StatechartActive/StatechartActive.cc

@@ -17,25 +17,25 @@ StatechartActive handle;
 
 TEST(StatemachineTest, inactiveBeforeEnter) {
 	statechartActive_init(&handle);
-	EXPECT_TRUE(false);
+	EXPECT_TRUE(!statechartActive_isActive(&handle));
 }
 TEST(StatemachineTest, activeAfterEnter) {
 	statechartActive_init(&handle);
 	statechartActive_enter(&handle);
-	EXPECT_TRUE(false);
+	EXPECT_TRUE(statechartActive_isActive(&handle));
 }
 TEST(StatemachineTest, inactiveAfterExit) {
 	statechartActive_init(&handle);
 	statechartActive_enter(&handle);
 	statechartActive_exit(&handle);
-	EXPECT_TRUE(false);
+	EXPECT_TRUE(!statechartActive_isActive(&handle));
 }
 TEST(StatemachineTest, activeAfterReenter) {
 	statechartActive_init(&handle);
 	statechartActive_enter(&handle);
 	statechartActive_exit(&handle);
 	statechartActive_enter(&handle);
-	EXPECT_TRUE(false);
+	EXPECT_TRUE(statechartActive_isActive(&handle));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/StatechartLocalReactions/StatechartLocalReactions.cc

@@ -18,15 +18,15 @@ StatechartLocalReactions handle;
 TEST(StatemachineTest, statechartLocalReactionsTest) {
 	statechartLocalReactions_init(&handle);
 	statechartLocalReactions_enter(&handle);
-	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S1));
-	EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_region2_a));
+	EXPECT_TRUE(statechartLocalReactions_isStateActive(&handle, StatechartLocalReactions_main_region_S1));
+	EXPECT_TRUE(statechartLocalReactions_isStateActive(&handle, StatechartLocalReactions_region2_a));
 	while (statechartLocalReactionsIface_get_myInt(&handle) < 10l) {
-		EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_region2_a));
+		EXPECT_TRUE(statechartLocalReactions_isStateActive(&handle, StatechartLocalReactions_region2_a));
 		if (statechartLocalReactionsIface_get_myInt(&handle) %2l== 0l) {
-					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S1));;
+					EXPECT_TRUE(statechartLocalReactions_isStateActive(&handle, StatechartLocalReactions_main_region_S1));;
 				  }
 				else {
-					EXPECT_TRUE(statechartLocalReactions_isActive(&handle, StatechartLocalReactions_main_region_S2));;
+					EXPECT_TRUE(statechartLocalReactions_isStateActive(&handle, StatechartLocalReactions_main_region_S2));;
 				}
 		statechartLocalReactions_runCycle(&handle);
 	}

test-plugins/org.yakindu.sct.generator.c.test/gtests/StaticChoice/StaticChoice.cc

@@ -18,7 +18,7 @@ StaticChoice handle;
 TEST(StatemachineTest, StaticChoiceTest) {
 	staticChoice_init(&handle);
 	staticChoice_enter(&handle);
-	EXPECT_TRUE(staticChoice_isActive(&handle, StaticChoice_main_region_Start));
+	EXPECT_TRUE(staticChoice_isStateActive(&handle, StaticChoice_main_region_Start));
 	staticChoice_runCycle(&handle);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/StringExpressions/StringExpressions.cc

@@ -20,31 +20,31 @@ TEST(StatemachineTest, StringExpressionsTest) {
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedStringX(&handle) , "\"X\"") == 0);
 	EXPECT_TRUE(strcmp(stringExpressionsIface_get_quotedStringY(&handle) , "\"Y\"") == 0);
 	stringExpressions_enter(&handle);
-	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_AssignmentChecked));
+	EXPECT_TRUE(stringExpressions_isStateActive(&handle, StringExpressions_AssignmentChecked));
 	stringExpressionsIface_raise_e(&handle);
 	stringExpressions_runCycle(&handle);
-	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_VarToVarCompareSucceeded));
+	EXPECT_TRUE(stringExpressions_isStateActive(&handle, StringExpressions_VarToVarCompareSucceeded));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&handle) );
 	stringExpressionsIface_raise_e(&handle);
 	stringExpressions_runCycle(&handle);
-	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_VarToConstCompareSucceeded));
+	EXPECT_TRUE(stringExpressions_isStateActive(&handle, StringExpressions_VarToConstCompareSucceeded));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&handle) );
 	stringExpressionsIface_raise_e(&handle);
 	stringExpressions_runCycle(&handle);
-	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_ConstToVarCompareSucceeded));
+	EXPECT_TRUE(stringExpressions_isStateActive(&handle, StringExpressions_ConstToVarCompareSucceeded));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarNotEqual(&handle) );
 	stringExpressionsIface_raise_e(&handle);
 	stringExpressions_runCycle(&handle);
-	EXPECT_TRUE(stringExpressions_isActive(&handle, StringExpressions_ConstToConstCompareSucceeded));
+	EXPECT_TRUE(stringExpressions_isStateActive(&handle, StringExpressions_ConstToConstCompareSucceeded));
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_guardStringNotEqual(&handle) );
 	EXPECT_TRUE(stringExpressionsIface_get_stringVarEqual(&handle) );

test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncFork/SyncFork.cc

@@ -18,25 +18,25 @@ SyncFork handle;
 TEST(StatemachineTest, syncForkTest) {
 	syncFork_init(&handle);
 	syncFork_enter(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_A));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_A));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C1));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D1));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B_r1_C1));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B_r2_D1));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C2));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D2));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B_r1_C2));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B_r2_D2));
 	syncForkIface_raise_e(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_A));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_A));
 	syncForkIface_raise_f(&handle);
 	syncFork_runCycle(&handle);
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r1_C1));
-	EXPECT_TRUE(syncFork_isActive(&handle, SyncFork_main_region_B_r2_D1));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B_r1_C1));
+	EXPECT_TRUE(syncFork_isStateActive(&handle, SyncFork_main_region_B_r2_D1));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/SyncJoin/SyncJoin.cc

@@ -18,70 +18,70 @@ SyncJoin handle;
 TEST(StatemachineTest, syncJoin_C2_Waits) {
 	syncJoin_init(&handle);
 	syncJoin_enter(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_e(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_f(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_A));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_A));
 }
 TEST(StatemachineTest, syncJoin_D2_Waits) {
 	syncJoin_init(&handle);
 	syncJoin_enter(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D1));
 	syncJoinIface_raise_f(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C1));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C1));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D2));
 	syncJoinIface_raise_e(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r1_C2));
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_B_r2_D2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r1_C2));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_B_r2_D2));
 }
 TEST(StatemachineTest, doubleEntryActionBug) {
 	syncJoin_init(&handle);
@@ -92,7 +92,7 @@ TEST(StatemachineTest, doubleEntryActionBug) {
 	syncJoinIface_raise_jc(&handle);
 	syncJoinIface_raise_jd(&handle);
 	syncJoin_runCycle(&handle);
-	EXPECT_TRUE(syncJoin_isActive(&handle, SyncJoin_main_region_A));
+	EXPECT_TRUE(syncJoin_isStateActive(&handle, SyncJoin_main_region_A));
 	EXPECT_TRUE(syncJoinIface_get_x(&handle) == 1l);
 }
 

test-plugins/org.yakindu.sct.generator.c.test/gtests/TimedTransitions/TimedTransitions.cc

@@ -19,10 +19,10 @@ TimedTransitions handle;
 TEST(StatemachineTest, Timer01) {
 	timedTransitions_init(&handle);
 	timedTransitions_enter(&handle);
-	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_main_region_Start));
+	EXPECT_TRUE(timedTransitions_isStateActive(&handle, TimedTransitions_main_region_Start));
 	// here should be waited 2030 Seconds
 	timedTransitions_runCycle(&handle);
-	EXPECT_TRUE(timedTransitions_isActive(&handle, TimedTransitions_main_region_End));
+	EXPECT_TRUE(timedTransitions_isStateActive(&handle, TimedTransitions_main_region_End));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/TransitionWithoutCondition/TransitionWithoutCondition.cc

@@ -18,9 +18,9 @@ TransitionWithoutCondition handle;
 TEST(StatemachineTest, TransitionWithoutConditionTest) {
 	transitionWithoutCondition_init(&handle);
 	transitionWithoutCondition_enter(&handle);
-	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_main_region_A));
+	EXPECT_TRUE(transitionWithoutCondition_isStateActive(&handle, TransitionWithoutCondition_main_region_A));
 	transitionWithoutCondition_runCycle(&handle);
-	EXPECT_TRUE(transitionWithoutCondition_isActive(&handle, TransitionWithoutCondition_main_region_B));
+	EXPECT_TRUE(transitionWithoutCondition_isStateActive(&handle, TransitionWithoutCondition_main_region_B));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/TriggerGuardExpressions/TriggerGuardExpressions.cc

@@ -18,38 +18,38 @@ TriggerGuardExpressions handle;
 TEST(StatemachineTest, trueGuard) {
 	triggerGuardExpressions_init(&handle);
 	triggerGuardExpressions_enter(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_A));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_A));
 	triggerGuardExpressionsIface_raise_e1(&handle);
 	triggerGuardExpressionsIface_set_b(&handle, true);
 	triggerGuardExpressions_runCycle(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_B));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_B));
 	triggerGuardExpressions_runCycle(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_A));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_A));
 	triggerGuardExpressionsIface_raise_e2(&handle);
 	triggerGuardExpressions_runCycle(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_B));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_B));
 	triggerGuardExpressions_runCycle(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_A));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_A));
 	triggerGuardExpressionsIface_raise_e1(&handle);
 	triggerGuardExpressionsIface_raise_e2(&handle);
 	triggerGuardExpressions_runCycle(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_B));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_B));
 }
 TEST(StatemachineTest, falseGuard) {
 	triggerGuardExpressions_init(&handle);
 	triggerGuardExpressions_enter(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_A));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_A));
 	triggerGuardExpressionsIface_set_b(&handle, false);
 	triggerGuardExpressionsIface_raise_e1(&handle);
 	triggerGuardExpressions_runCycle(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_A));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_A));
 	triggerGuardExpressionsIface_raise_e2(&handle);
 	triggerGuardExpressions_runCycle(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_A));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_A));
 	triggerGuardExpressionsIface_raise_e1(&handle);
 	triggerGuardExpressionsIface_raise_e2(&handle);
 	triggerGuardExpressions_runCycle(&handle);
-	EXPECT_TRUE(triggerGuardExpressions_isActive(&handle, TriggerGuardExpressions_main_region_A));
+	EXPECT_TRUE(triggerGuardExpressions_isStateActive(&handle, TriggerGuardExpressions_main_region_A));
 }
 
 		

test-plugins/org.yakindu.sct.generator.c.test/gtests/ValuedEvents/ValuedEvents.cc

@@ -25,10 +25,10 @@ TEST(StatemachineTest, valuedEventsTest) {
 	valuedEventsIface_raise_realEvent(&handle, 20l);
 	valuedEventsIface_raise_stringEvent(&handle, "tool");
 	valuedEvents_runCycle(&handle);
-	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_integer_region_D));
-	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_string_region_D));
-	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_boolean_region_D));
-	EXPECT_TRUE(valuedEvents_isActive(&handle, ValuedEvents_real_region_D));
+	EXPECT_TRUE(valuedEvents_isStateActive(&handle, ValuedEvents_integer_region_D));
+	EXPECT_TRUE(valuedEvents_isStateActive(&handle, ValuedEvents_string_region_D));
+	EXPECT_TRUE(valuedEvents_isStateActive(&handle, ValuedEvents_boolean_region_D));
+	EXPECT_TRUE(valuedEvents_isStateActive(&handle, ValuedEvents_real_region_D));
 	EXPECT_TRUE(valuedEventsIface_get_myInt(&handle) == 23l);
 	EXPECT_TRUE(valuedEventsIface_get_myBool(&handle) == false);
 	EXPECT_TRUE(valuedEventsIface_get_myReal(&handle) == 20l);

test-plugins/org.yakindu.sct.generator.c.test/model/test.sgen

@@ -11,17 +11,17 @@ GeneratorModel for sctunit::c {
 			WrapToJUnit="true"	
 		}
 		
-		feature FunctionInlining {
-			inlineReactions = false
-			inlineEntryActions = false
-			inlineExitActions = false
-			inlineEnterSequences = false
-			inlineExitSequences = false
-			inlineChoices = false
-			inlineEnterRegion = false
-			inlineExitRegion = false
-			inlineEntries = false
-		}
+		feature FunctionInlining {
+			inlineReactions = false
+			inlineEntryActions = false
+			inlineExitActions = false
+			inlineEnterSequences = false
+			inlineExitSequences = false
+			inlineChoices = false
+			inlineEnterRegion = false
+			inlineExitRegion = false
+			inlineEntries = false
+		}
 		
 	}	
 		
@@ -32,8 +32,8 @@ GeneratorModel for sctunit::c {
 			targetFolder = "test-gen"			
 		}
 		
-		feature JUnitWrapper {
-			WrapToJUnit =  "true" 
+		feature JUnitWrapper {
+			WrapToJUnit =  "true" 
 		}	
 				
 		feature FunctionInlining {
@@ -506,6 +506,30 @@ GeneratorModel for sctunit::c {
 		}		
 	}
 	
+	test FinalState{
+		
+		feature Outlet{ 
+			targetProject = "org.yakindu.sct.generator.c.test" 
+			targetFolder = "test-gen"			
+		}		
+				
+		feature JUnitWrapper {
+			WrapToJUnit =  "true" 
+		}			
+						
+		feature FunctionInlining {
+			inlineReactions = false
+			inlineEntryActions = false
+			inlineExitActions = false
+			inlineEnterSequences = false
+			inlineExitSequences = false
+			inlineChoices = false
+			inlineEnterRegion = false
+			inlineExitRegion = false
+			inlineEntries = false
+		}		
+	}
+	
 	test Guard{
 		
 		feature Outlet{ 

test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/AllTests.java

@@ -21,7 +21,7 @@ import org.junit.runners.Suite.SuiteClasses;
 		DeepHistory.class, DynamicChoice.class, EmptyTransition.class,
 		EnterState.class, EntryChoice.class, EntryExitSelfTransition.class,
 		ExitOnSelfTransition.class, ExitState.class, FeatureCalls.class,
-		Guard.class, GuardedEntry.class, GuardedExit.class,
+		FinalState.class, Guard.class, GuardedEntry.class, GuardedExit.class,
 		HistoryWithExitPoint.class, HistoryWithoutInitialStep.class,
 		InEventLifeCycle.class, IntegerExpressions.class,
 		InternalEventLifeCycle.class, LocalReactions.class,

test-plugins/org.yakindu.sct.generator.c.test/test-gen/org/yakindu/sct/generator/c/test/FinalState.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2015 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     committers of YAKINDU - initial API and implementation
+ */
+package org.yakindu.sct.generator.c.test;
+
+import java.util.Collection;
+
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.yakindu.sct.generator.c.gtest.GTest;
+import org.yakindu.sct.generator.c.gtest.GTestRunner;
+import org.yakindu.sct.generator.c.gtest.GTestHelper;
+
+@GTest(sourceFile = "gtests/FinalState/FinalState.cc", program = "gtests/FinalState/FinalState", model = "testmodels/SCTUnit/FinalState.sct")
+@RunWith(GTestRunner.class)
+public class FinalState {
+
+	protected final GTestHelper helper = new GTestHelper(this) {
+
+		@Override
+		protected void getSourceFiles(Collection<String> files) {
+			super.getSourceFiles(files);
+			files.add(getFileName(getTestProgram()) + ".c");
+		}
+	};
+
+	@Before
+	public void setUp() {
+		helper.generate();
+		helper.compile();
+	}
+}

test-plugins/org.yakindu.sct.generator.java.test/model/model.sgen

@@ -12,17 +12,17 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 		
-		feature FunctionInlining {
-			inlineReactions = false
-			inlineEntryActions = false
-			inlineExitActions = false
-			inlineEnterSequences = false
-			inlineExitSequences = false
-			inlineChoices = false
-			inlineEnterRegion = false
-			inlineExitRegion = false
-			inlineEntries = false
-		}
+		feature FunctionInlining {
+			inlineReactions = false
+			inlineEntryActions = false
+			inlineExitActions = false
+			inlineEnterSequences = false
+			inlineExitSequences = false
+			inlineChoices = false
+			inlineEnterRegion = false
+			inlineExitRegion = false
+			inlineEntries = false
+		}
 		
 	}
 	
@@ -483,6 +483,30 @@ GeneratorModel for yakindu::java {
 		}
 	}
 	
+	statechart FinalState {
+		feature Outlet {
+			targetProject = "org.yakindu.sct.generator.java.test"
+			targetFolder = "src-gen"
+		}
+
+		feature GeneralFeatures {
+			TimerService = true
+			RuntimeService = true
+		}		
+			
+		feature FunctionInlining {
+			inlineReactions = false
+			inlineEntryActions = false
+			inlineExitActions = false
+			inlineEnterSequences = false
+			inlineExitSequences = false
+			inlineChoices = false
+			inlineEnterRegion = false
+			inlineExitRegion = false
+			inlineEntries = false
+		}
+	}
+		
 	statechart Guard {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"

test-plugins/org.yakindu.sct.generator.java.test/model/test.sgen

@@ -168,6 +168,14 @@ GeneratorModel for sctunit::java {
 		}			
 	}
 	
+	test FinalState{
+		
+		feature Outlet{ 
+			targetProject = "org.yakindu.sct.generator.java.test" 
+			targetFolder = "test-gen"			
+		}			
+	}
+	
 	test Guard{
 		
 		feature Outlet{ 

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/IStatemachine.java

@@ -22,7 +22,7 @@ public interface IStatemachine {
 
 	/**
 	 * Checks if the statemachine is active. 
-	 * A statemachine is active if it was entered. It is inactive if it has nt been entered at all or if it was exited.
+	 * A statemachine is active if it was entered. It is inactive if it has not been entered at all or if it was exited.
 	 */
 	public boolean isActive();
 

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/finalstate/FinalStateStatemachine.java

@@ -0,0 +1,180 @@
+package org.yakindu.scr.finalstate;
+
+public class FinalStateStatemachine implements IFinalStateStatemachine {
+
+	public enum State {
+		main_region_myState, main_region__final_, $NullState$
+	};
+
+	private final State[] stateVector = new State[1];
+
+	private int nextStateIndex;
+
+	public FinalStateStatemachine() {
+
+	}
+
+	public void init() {
+		for (int i = 0; i < 1; i++) {
+			stateVector[i] = State.$NullState$;
+		}
+
+		clearEvents();
+		clearOutEvents();
+
+	}
+
+	public void enter() {
+		entryAction();
+
+		enterSequence_main_region_default();
+	}
+
+	public void exit() {
+		exitSequence_main_region();
+
+		exitAction();
+	}
+
+	/**
+	 * @see IStatemachine#isActive()
+	 */
+	@Override
+	public boolean isActive() {
+
+		return stateVector[0] != State.$NullState$;
+	}
+
+	/** 
+	 * @see IStatemachine#isFinal() 
+	 */
+	@Override
+	public boolean isFinal() {
+		return (stateVector[0] == State.main_region__final_);
+	}
+
+	/**
+	 * This method resets the incoming events (time events included).
+	 */
+	protected void clearEvents() {
+
+	}
+
+	/**
+	 * This method resets the outgoing events.
+	 */
+	protected void clearOutEvents() {
+	}
+
+	/**
+	 * Returns true if the given state is currently active otherwise false.
+	 */
+	public boolean isStateActive(State state) {
+		switch (state) {
+			case main_region_myState :
+				return stateVector[0] == State.main_region_myState;
+			case main_region__final_ :
+				return stateVector[0] == State.main_region__final_;
+			default :
+				return false;
+		}
+	}
+
+	private boolean check_main_region_myState_tr0_tr0() {
+		return true;
+	}
+
+	private void effect_main_region_myState_tr0() {
+		exitSequence_main_region_myState();
+
+		enterSequence_main_region__final__default();
+	}
+
+	/* Entry action for statechart 'FinalState'. */
+	private void entryAction() {
+	}
+
+	/* Exit action for state 'FinalState'. */
+	private void exitAction() {
+	}
+
+	/* 'default' enter sequence for state myState */
+	private void enterSequence_main_region_myState_default() {
+		nextStateIndex = 0;
+		stateVector[0] = State.main_region_myState;
+	}
+
+	/* Default enter sequence for state null */
+	private void enterSequence_main_region__final__default() {
+		nextStateIndex = 0;
+		stateVector[0] = State.main_region__final_;
+	}
+
+	/* 'default' enter sequence for region main region */
+	private void enterSequence_main_region_default() {
+		react_main_region__entry_Default();
+	}
+
+	/* Default exit sequence for state myState */
+	private void exitSequence_main_region_myState() {
+		nextStateIndex = 0;
+		stateVector[0] = State.$NullState$;
+	}
+
+	/* Default exit sequence for final state. */
+	private void exitSequence_main_region__final_() {
+		nextStateIndex = 0;
+		stateVector[0] = State.$NullState$;
+	}
+
+	/* Default exit sequence for region main region */
+	private void exitSequence_main_region() {
+		switch (stateVector[0]) {
+			case main_region_myState :
+				exitSequence_main_region_myState();
+				break;
+
+			case main_region__final_ :
+				exitSequence_main_region__final_();
+				break;
+
+			default :
+				break;
+		}
+	}
+
+	/* The reactions of state myState. */
+	private void react_main_region_myState() {
+		effect_main_region_myState_tr0();
+	}
+
+	/* The reactions of state null. */
+	private void react_main_region__final_() {
+	}
+
+	/* Default react sequence for initial entry  */
+	private void react_main_region__entry_Default() {
+		enterSequence_main_region_myState_default();
+	}
+
+	public void runCycle() {
+
+		clearOutEvents();
+
+		for (nextStateIndex = 0; nextStateIndex < stateVector.length; nextStateIndex++) {
+
+			switch (stateVector[nextStateIndex]) {
+				case main_region_myState :
+					react_main_region_myState();
+					break;
+				case main_region__final_ :
+					react_main_region__final_();
+					break;
+				default :
+					// $NullState$
+			}
+		}
+
+		clearEvents();
+	}
+}

test-plugins/org.yakindu.sct.generator.java.test/src-gen/org/yakindu/scr/finalstate/IFinalStateStatemachine.java

@@ -0,0 +1,5 @@
+package org.yakindu.scr.finalstate;
+import org.yakindu.scr.IStatemachine;
+
+public interface IFinalStateStatemachine extends IStatemachine {
+}

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/sct/generator/java/test/AllTestsTest.java

@@ -22,8 +22,8 @@ import org.junit.runners.Suite.SuiteClasses;
 		DynamicChoiceTest.class, EmptyTransitionTest.class,
 		EnterStateTest.class, EntryChoiceTest.class,
 		EntryExitSelfTransitionTest.class, ExitOnSelfTransitionTest.class,
-		ExitStateTest.class, FeatureCallsTest.class, GuardTest.class,
-		GuardedEntryTest.class, GuardedExitTest.class,
+		ExitStateTest.class, FeatureCallsTest.class, FinalStateTest.class,
+		GuardTest.class, GuardedEntryTest.class, GuardedExitTest.class,
 		HistoryWithExitPointTest.class, HistoryWithoutInitialStepTest.class,
 		InEventLifeCycleTest.class, IntegerExpressionsTest.class,
 		InternalEventLifeCycleTest.class, LocalReactionsTest.class,

test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/sct/generator/java/test/FinalStateTest.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2015 committers of YAKINDU and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     committers of YAKINDU - initial API and implementation
+ */
+
+package org.yakindu.sct.generator.java.test;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.yakindu.scr.finalstate.FinalStateStatemachine;
+import org.yakindu.scr.finalstate.FinalStateStatemachine.State;
+/**
+ *  Unit TestCase for FinalState
+ */
+@SuppressWarnings("all")
+public class FinalStateTest {
+
+	private FinalStateStatemachine statemachine;
+
+	@Before
+	public void setUp() {
+		statemachine = new FinalStateStatemachine();
+		statemachine.init();
+	}
+
+	@After
+	public void tearDown() {
+		statemachine = null;
+	}
+
+	@Test
+	public void testStatechartNameTest() {
+		statemachine.enter();
+		statemachine.runCycle();
+		assertTrue(statemachine.isFinal());
+	}
+}

test-plugins/org.yakindu.sct.test.models/.settings/org.eclipse.core.resources.prefs

@@ -1,39 +1,40 @@
-eclipse.preferences.version=1
-encoding//testmodels/SCTUnit/AlwaysOncycle.sct=UTF-8
-encoding//testmodels/SCTUnit/AssignmentAsExpression.sct=UTF-8
-encoding//testmodels/SCTUnit/ConditionalExpressions.sct=UTF-8
-encoding//testmodels/SCTUnit/Declarations.sct=UTF-8
-encoding//testmodels/SCTUnit/DeepEntry.sct=UTF-8
-encoding//testmodels/SCTUnit/DynamicChoice.sct=UTF-8
-encoding//testmodels/SCTUnit/EmptyTransition.sct=UTF-8
-encoding//testmodels/SCTUnit/EnterState.sct=UTF-8
-encoding//testmodels/SCTUnit/ExitOnSelfTransition.sct=UTF-8
-encoding//testmodels/SCTUnit/ExitState.sct=UTF-8
-encoding//testmodels/SCTUnit/ExitStatechart.sct=UTF-8
-encoding//testmodels/SCTUnit/GuardedEntry.sct=UTF-8
-encoding//testmodels/SCTUnit/GuardedExit.sct=UTF-8
-encoding//testmodels/SCTUnit/HistoryWithoutInitialStep.sct=UTF-8
-encoding//testmodels/SCTUnit/InEventLifeCycle.sct=UTF-8
-encoding//testmodels/SCTUnit/InternalEventLifeCycle.sct=UTF-8
-encoding//testmodels/SCTUnit/LocalReactions.sct=UTF-8
-encoding//testmodels/SCTUnit/LogicalAnd.sct=UTF-8
-encoding//testmodels/SCTUnit/OperationsWithoutBraces.sct=UTF-8
-encoding//testmodels/SCTUnit/OutEventLifeCycle.sct=UTF-8
-encoding//testmodels/SCTUnit/PerformanceTest.sct=UTF-8
-encoding//testmodels/SCTUnit/STextKeywordsInStatesAndRegions.sct=UTF-8
-encoding//testmodels/SCTUnit/ShallowHistoryWithDeepEntry.sct=UTF-8
-encoding//testmodels/SCTUnit/StatechartActive.sct=UTF-8
-encoding//testmodels/SCTUnit/StaticChoice.sct=UTF-8
-encoding//testmodels/SCTUnit/SyncJoin.sct=UTF-8
-encoding//testmodels/SCTUnit/TimedTransitions.sct=UTF-8
-encoding//testmodels/SCTUnit/TransitionWithoutCondition.sct=UTF-8
-encoding//testmodels/SCTUnit/TriggerGuardExpressions.sct=UTF-8
-encoding//testmodels/SCTUnit/TypeAlias.sct=UTF-8
-encoding//testmodels/SCTUnit/ValuedEvents.sct=UTF-8
-encoding//testmodels/validation/EntryTransitionToParentState.sct=UTF-8
-encoding//testmodels/validation/NoTriggerOnTransitionWithExitPointSpec.sct=UTF-8
-encoding//testmodels/validation/RegionCantBeEnteredUsingShallowHistory.sct=UTF-8
-encoding//testmodels/validation/ValidEmptyTransitionFromSync.sct=UTF-8
-encoding//testmodels/validation/ValidTransitionToInnerChoice.sct=UTF-8
-encoding//tests/EntryExitSelfTransition.sctunit=UTF-8
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding//testmodels/SCTUnit/AlwaysOncycle.sct=UTF-8
+encoding//testmodels/SCTUnit/AssignmentAsExpression.sct=UTF-8
+encoding//testmodels/SCTUnit/ConditionalExpressions.sct=UTF-8
+encoding//testmodels/SCTUnit/Declarations.sct=UTF-8
+encoding//testmodels/SCTUnit/DeepEntry.sct=UTF-8
+encoding//testmodels/SCTUnit/DynamicChoice.sct=UTF-8
+encoding//testmodels/SCTUnit/EmptyTransition.sct=UTF-8
+encoding//testmodels/SCTUnit/EnterState.sct=UTF-8
+encoding//testmodels/SCTUnit/ExitOnSelfTransition.sct=UTF-8
+encoding//testmodels/SCTUnit/ExitState.sct=UTF-8
+encoding//testmodels/SCTUnit/ExitStatechart.sct=UTF-8
+encoding//testmodels/SCTUnit/FinalState.sct=UTF-8
+encoding//testmodels/SCTUnit/GuardedEntry.sct=UTF-8
+encoding//testmodels/SCTUnit/GuardedExit.sct=UTF-8
+encoding//testmodels/SCTUnit/HistoryWithoutInitialStep.sct=UTF-8
+encoding//testmodels/SCTUnit/InEventLifeCycle.sct=UTF-8
+encoding//testmodels/SCTUnit/InternalEventLifeCycle.sct=UTF-8
+encoding//testmodels/SCTUnit/LocalReactions.sct=UTF-8
+encoding//testmodels/SCTUnit/LogicalAnd.sct=UTF-8
+encoding//testmodels/SCTUnit/OperationsWithoutBraces.sct=UTF-8
+encoding//testmodels/SCTUnit/OutEventLifeCycle.sct=UTF-8
+encoding//testmodels/SCTUnit/PerformanceTest.sct=UTF-8
+encoding//testmodels/SCTUnit/STextKeywordsInStatesAndRegions.sct=UTF-8
+encoding//testmodels/SCTUnit/ShallowHistoryWithDeepEntry.sct=UTF-8
+encoding//testmodels/SCTUnit/StatechartActive.sct=UTF-8
+encoding//testmodels/SCTUnit/StaticChoice.sct=UTF-8
+encoding//testmodels/SCTUnit/SyncJoin.sct=UTF-8
+encoding//testmodels/SCTUnit/TimedTransitions.sct=UTF-8
+encoding//testmodels/SCTUnit/TransitionWithoutCondition.sct=UTF-8
+encoding//testmodels/SCTUnit/TriggerGuardExpressions.sct=UTF-8
+encoding//testmodels/SCTUnit/TypeAlias.sct=UTF-8
+encoding//testmodels/SCTUnit/ValuedEvents.sct=UTF-8
+encoding//testmodels/validation/EntryTransitionToParentState.sct=UTF-8
+encoding//testmodels/validation/NoTriggerOnTransitionWithExitPointSpec.sct=UTF-8
+encoding//testmodels/validation/RegionCantBeEnteredUsingShallowHistory.sct=UTF-8
+encoding//testmodels/validation/ValidEmptyTransitionFromSync.sct=UTF-8
+encoding//testmodels/validation/ValidTransitionToInnerChoice.sct=UTF-8
+encoding//tests/EntryExitSelfTransition.sctunit=UTF-8
+encoding/<project>=UTF-8

test-plugins/org.yakindu.sct.test.models/testmodels/SCTUnit/FinalState.sct

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/sgraph/2.0.0">
+  <sgraph:Statechart xmi:id="_h7DX0PfmEeS9Au3-0BK9ZQ" name="FinalState">
+    <regions xmi:id="_h7El8vfmEeS9Au3-0BK9ZQ" name="main region">
+      <vertices xsi:type="sgraph:Entry" xmi:id="_h7YvA_fmEeS9Au3-0BK9ZQ">
+        <outgoingTransitions xmi:id="_h7bLQffmEeS9Au3-0BK9ZQ" target="_h7Z9IffmEeS9Au3-0BK9ZQ"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_h7Z9IffmEeS9Au3-0BK9ZQ" name="myState" incomingTransitions="_h7bLQffmEeS9Au3-0BK9ZQ">
+        <outgoingTransitions xmi:id="_mHPrcPfmEeS9Au3-0BK9ZQ" specification="always" target="_lxwjoPfmEeS9Au3-0BK9ZQ"/>
+      </vertices>
+      <vertices xsi:type="sgraph:FinalState" xmi:id="_lxwjoPfmEeS9Au3-0BK9ZQ" incomingTransitions="_mHPrcPfmEeS9Au3-0BK9ZQ"/>
+    </regions>
+  </sgraph:Statechart>
+  <notation:Diagram xmi:id="_h7El8PfmEeS9Au3-0BK9ZQ" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_h7DX0PfmEeS9Au3-0BK9ZQ" measurementUnit="Pixel">
+    <children xmi:id="_h7HpQPfmEeS9Au3-0BK9ZQ" type="Region" element="_h7El8vfmEeS9Au3-0BK9ZQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_h7YH8PfmEeS9Au3-0BK9ZQ" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_h7YH8ffmEeS9Au3-0BK9ZQ"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_h7YH8vfmEeS9Au3-0BK9ZQ"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_h7YvAPfmEeS9Au3-0BK9ZQ" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
+        <children xmi:id="_h7ZWEPfmEeS9Au3-0BK9ZQ" type="Entry" element="_h7YvA_fmEeS9Au3-0BK9ZQ">
+          <children xmi:id="_h7ZWE_fmEeS9Au3-0BK9ZQ" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_h7ZWFvfmEeS9Au3-0BK9ZQ" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_h7ZWF_fmEeS9Au3-0BK9ZQ"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_h7ZWGPfmEeS9Au3-0BK9ZQ"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_h7ZWFPfmEeS9Au3-0BK9ZQ" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_h7ZWFffmEeS9Au3-0BK9ZQ"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_h7ZWEffmEeS9Au3-0BK9ZQ" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_h7Z9IPfmEeS9Au3-0BK9ZQ" x="-1" y="20"/>
+        </children>
+        <children xmi:id="_h7Z9JPfmEeS9Au3-0BK9ZQ" type="State" element="_h7Z9IffmEeS9Au3-0BK9ZQ">
+          <children xsi:type="notation:DecorationNode" xmi:id="_h7akMPfmEeS9Au3-0BK9ZQ" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_h7akMffmEeS9Au3-0BK9ZQ"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_h7akMvfmEeS9Au3-0BK9ZQ"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_h7akM_fmEeS9Au3-0BK9ZQ" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_h7akNPfmEeS9Au3-0BK9ZQ" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_h7akNffmEeS9Au3-0BK9ZQ"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_h7akNvfmEeS9Au3-0BK9ZQ" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_h7Z9JffmEeS9Au3-0BK9ZQ" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_h7Z9JvfmEeS9Au3-0BK9ZQ"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_h7akN_fmEeS9Au3-0BK9ZQ" name="isHorizontal" booleanValue="true"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_h7bLQPfmEeS9Au3-0BK9ZQ" x="53" y="4"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_lxzm8PfmEeS9Au3-0BK9ZQ" type="FinalState" element="_lxwjoPfmEeS9Au3-0BK9ZQ" fontName="Verdana" lineColor="4210752">
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_lxzm8ffmEeS9Au3-0BK9ZQ" x="258" y="20"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_h7YvAffmEeS9Au3-0BK9ZQ"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_h7HpQffmEeS9Au3-0BK9ZQ" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_h7YvAvfmEeS9Au3-0BK9ZQ" x="220" y="10" width="301" height="96"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_h7cZYPfmEeS9Au3-0BK9ZQ" type="StatechartText" fontName="Verdana" lineColor="4210752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_h7cZYvfmEeS9Au3-0BK9ZQ" type="StatechartName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_h7cZY_fmEeS9Au3-0BK9ZQ"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_h7cZZPfmEeS9Au3-0BK9ZQ"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_h7cZZffmEeS9Au3-0BK9ZQ" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_h7cZZvfmEeS9Au3-0BK9ZQ"/>
+      </children>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_h7cZZ_fmEeS9Au3-0BK9ZQ" x="10" y="10" width="200" height="96"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_h7El8ffmEeS9Au3-0BK9ZQ"/>
+    <edges xmi:id="_h7byUPfmEeS9Au3-0BK9ZQ" type="Transition" element="_h7bLQffmEeS9Au3-0BK9ZQ" source="_h7ZWEPfmEeS9Au3-0BK9ZQ" target="_h7Z9JPfmEeS9Au3-0BK9ZQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_h7byVPfmEeS9Au3-0BK9ZQ" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_h7byVffmEeS9Au3-0BK9ZQ"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_h7byVvfmEeS9Au3-0BK9ZQ" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_h7byUffmEeS9Au3-0BK9ZQ" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_h7byU_fmEeS9Au3-0BK9ZQ" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_h7byUvfmEeS9Au3-0BK9ZQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_mHSuwPfmEeS9Au3-0BK9ZQ" type="Transition" element="_mHPrcPfmEeS9Au3-0BK9ZQ" source="_h7Z9JPfmEeS9Au3-0BK9ZQ" target="_lxzm8PfmEeS9Au3-0BK9ZQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_mHTV0ffmEeS9Au3-0BK9ZQ" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_mHTV0vfmEeS9Au3-0BK9ZQ"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_mHT84PfmEeS9Au3-0BK9ZQ" x="-3" y="-7"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_mHSuwffmEeS9Au3-0BK9ZQ" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_mHTV0PfmEeS9Au3-0BK9ZQ" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_mHSuwvfmEeS9Au3-0BK9ZQ" points="[2, 24, -10, -97]$[8, 115, -4, -6]"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>

test-plugins/org.yakindu.sct.test.models/tests/AllTests.sctunit

@@ -1,55 +1,56 @@
-testsuite AllTests {
-	AlwaysOncycle, 
-	AssignmentAsExpression,
-	BitExpressions, 
-	BooleanExpressions,
-	CastExpressions,
-	Choice, 
-	CKeywords,
-	ConditionalExpression,
-	ConstantsTests,
-	Declarations, 
-	DeepEntry,
-	DeepHistory,
-	DynamicChoice,
-	EmptyTransition, 
-	EnterState,
-	EntryChoice,
-	EntryExitSelfTransition,
-	ExitOnSelfTransition, 
-	ExitState,
-	FeatureCalls,
-	Guard, 
-	GuardedEntry, 
-	GuardedExit, 
-	HistoryWithExitPoint,
-	HistoryWithoutInitialStep,
-	InEventLifeCycle, 
-	IntegerExpressions, 
-	InternalEventLifeCycle,
-	LocalReactions,
-	LogicalAndTests, 
-	LogicalOrTests,
-	NamedInterfaceAccess,
-//	OperationsWithoutBraces,
-	OutEventLifeCycle,
-	Parenthesis,
-	PriorityValues,
-	RaiseEvent,
-	SameNameDifferentRegion, 
-	ShallowHistory, 	
-	ShallowHistoryWithDeepEntry, 	
-	SimpleEvent,
-	SimpleHierachy ,
-	StatechartActive , 
-	StatechartLocalReactions,
-	StateIsActive , 
-	StaticChoice,
-	STextKeywordsInStatesAndRegions, 
-	StringExpressions, 
-	SyncFork,
-	SyncJoin, 
-	TransitionWithoutCondition,
-	TriggerGuardExpressions,
-	ValuedEvents
+testsuite AllTests {
+	AlwaysOncycle, 
+	AssignmentAsExpression,
+	BitExpressions, 
+	BooleanExpressions,
+	CastExpressions,
+	Choice, 
+	CKeywords,
+	ConditionalExpression,
+	ConstantsTests,
+	Declarations, 
+	DeepEntry,
+	DeepHistory,
+	DynamicChoice,
+	EmptyTransition, 
+	EnterState,
+	EntryChoice,
+	EntryExitSelfTransition,
+	ExitOnSelfTransition, 
+	ExitState,
+	FeatureCalls,
+	FinalState,
+	Guard, 
+	GuardedEntry, 
+	GuardedExit, 
+	HistoryWithExitPoint,
+	HistoryWithoutInitialStep,
+	InEventLifeCycle, 
+	IntegerExpressions, 
+	InternalEventLifeCycle,
+	LocalReactions,
+	LogicalAndTests, 
+	LogicalOrTests,
+	NamedInterfaceAccess,
+//	OperationsWithoutBraces,
+	OutEventLifeCycle,
+	Parenthesis,
+	PriorityValues,
+	RaiseEvent,
+	SameNameDifferentRegion, 
+	ShallowHistory, 	
+	ShallowHistoryWithDeepEntry, 	
+	SimpleEvent,
+	SimpleHierachy,
+	StatechartActive, 
+	StatechartLocalReactions,
+	StateIsActive, 
+	StaticChoice,
+	STextKeywordsInStatesAndRegions, 
+	StringExpressions, 
+	SyncFork,
+	SyncJoin, 
+	TransitionWithoutCondition,
+	TriggerGuardExpressions,
+	ValuedEvents
 } 

test-plugins/org.yakindu.sct.test.models/tests/FinalState.sctunit

@@ -0,0 +1,10 @@
+
+testgroup FinalState for statechart FinalState{
+	test StatechartNameTest { 
+		enter
+		cycle
+		assert is_final
+		 
+	} 
+}
+