Merge pull request #667 from Yakindu/issue_665

Fix Issue 665

plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SexecElementMapping.xtend

@@ -65,6 +65,7 @@ import org.yakindu.sct.model.stext.stext.StextFactory
 import org.yakindu.sct.model.stext.stext.TimeEventSpec
 import org.yakindu.sct.model.stext.stext.TimeEventType
 import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.base.types.Event
 
 @Singleton class SexecElementMapping {
 	
@@ -283,7 +284,7 @@ import org.yakindu.sct.model.stext.stext.VariableDefinition
 	def dispatch NamedElement resolveRegularEventSpec(RegularEventSpec re, Object context) { if ( re.event != null ) re.event.resolveRegularEventSpec(re) }
 	def dispatch NamedElement resolveRegularEventSpec(FeatureCall fc, Object context) { if (fc.feature != null) fc.feature.resolveRegularEventSpec(fc) }
 	def dispatch NamedElement resolveRegularEventSpec(ElementReferenceExpression ter, Object context) { if (ter.reference != null) ter.reference.resolveRegularEventSpec(ter) }
-	def dispatch NamedElement resolveRegularEventSpec(EventDefinition ed, Object context) { ed }
+	def dispatch NamedElement resolveRegularEventSpec(Event ed, Object context) { ed }
 	
 	
 	def dispatch Expression raised(TimeEventSpec e) {

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/validation/STextJavaValidator.java

@@ -838,7 +838,7 @@ public class STextJavaValidator extends AbstractSTextJavaValidator implements ST
 		if (!isResponsible)
 			return false;
 		Statechart statechart = getStatechart(eObject);
-		if (statechart != null && !domainID.equals(statechart.getDomainID())) {
+		if ((statechart != null) && !domainID.equals(statechart.getDomainID())) {
 			return false;
 		}
 		return true;

plugins/org.yakindu.sct.simulation.core.sexec/src/org/yakindu/sct/simulation/core/sexec/interpreter/DefaultExecutionSlotResolver.xtend

@@ -13,6 +13,7 @@ package org.yakindu.sct.simulation.core.sexec.interpreter
 import com.google.inject.Inject
 import java.util.List
 import org.eclipse.emf.ecore.EObject
+import org.eclipse.xtext.EcoreUtil2
 import org.eclipse.xtext.naming.IQualifiedNameProvider
 import org.eclipse.xtext.util.SimpleAttributeResolver
 import org.yakindu.base.expressions.expressions.AssignmentExpression
@@ -20,71 +21,93 @@ import org.yakindu.base.expressions.expressions.ElementReferenceExpression
 import org.yakindu.base.expressions.expressions.FeatureCall
 import org.yakindu.base.types.Event
 import org.yakindu.base.types.Operation
+import org.yakindu.base.types.Package
 import org.yakindu.base.types.Property
 import org.yakindu.sct.model.stext.stext.InterfaceScope
-import org.yakindu.sct.model.stext.stext.VariableDefinition
 import org.yakindu.sct.simulation.core.sruntime.CompositeSlot
 import org.yakindu.sct.simulation.core.sruntime.ExecutionContext
 import org.yakindu.sct.simulation.core.sruntime.ExecutionSlot
 import org.yakindu.sct.simulation.core.sruntime.ExecutionVariable
-import org.eclipse.xtext.EcoreUtil2
 
 /**
  * Default implementation for resolving execution slots based on expressions.
  * 
  * @author Thomas Kutz
+ * @author axel terfloth
  */
 class DefaultExecutionSlotResolver implements IExecutionSlotResolver {
 
 	@Inject
 	extension IQualifiedNameProvider nameProvider
 
-	def dispatch ExecutionSlot resolve(ExecutionContext context, FeatureCall e) {
-		if (e.feature instanceof VariableDefinition || e.feature instanceof Operation) {
-			return context.getVariable(e.feature.fullyQualifiedName.toString)
+	def dispatch ExecutionSlot resolve(ExecutionContext context, FeatureCall e) {		
+		return resolveByFeature(context, e, e.feature)		
+	}
+	
+	def dispatch ExecutionSlot resolve(ExecutionContext context, ElementReferenceExpression e) {
+		packageNamespaceAwareResolve(context, e.reference)
+	}
+	
+	def dispatch ExecutionSlot resolve(ExecutionContext context, AssignmentExpression e) {
+		return context.resolve(e.varRef)
+	}
+	
+	
+	def dispatch ExecutionSlot resolveByFeature(ExecutionContext context, FeatureCall e, EObject feature){
+		return context.getVariable(e.feature.fullyQualifiedName.toString)
+
+	}
+	
+	def dispatch ExecutionSlot resolveByFeature(ExecutionContext context, FeatureCall e, Event feature){
+		return resolveCompositeSlot(context, e)
+	}
+	
+	def dispatch ExecutionSlot resolveByFeature(ExecutionContext context, FeatureCall e, Property feature){
+		return resolveCompositeSlot(context, e)
+	}
+	
+	
+	def ExecutionSlot resolveCompositeSlot(ExecutionContext context, FeatureCall e){
+		var current = e
+		val List<EObject> calls = newArrayList
+		calls.add(0, e.feature)
+		while (!(current.owner instanceof ElementReferenceExpression)) {
+			current = current.owner as FeatureCall
+			calls.add(0, current.feature)
 		}
-		if (e.feature instanceof Property || e.feature instanceof Event) {
-			var current = e
-			val List<EObject> calls = newArrayList
-			calls.add(0, e.feature)
-			while (!(current.owner instanceof ElementReferenceExpression)) {
-				current = current.owner as FeatureCall
-				calls.add(0, current.feature)
-			}
 
-			// first: get the root slot where to start the search
-			val root = (current.owner as ElementReferenceExpression).reference
-			var ExecutionSlot featureSlot = null
-			
-			if (root instanceof InterfaceScope) {
-				featureSlot = context.getSlot(calls.get(0).fullyQualifiedName.toString)
-				calls.remove(0)
-			}
-			else {
-				featureSlot = packageNamespaceAwareResolve(context, root)
-				if (featureSlot == null)
+
+		// first: get the root slot where to start the search searching
+		val root = (current.owner as ElementReferenceExpression).reference
+		var ExecutionSlot featureSlot = null
+		
+		if (root instanceof InterfaceScope) {
+			featureSlot = context.getSlot(calls.get(0).fullyQualifiedName.toString)
+			calls.remove(0)
+		}
+		else {
+			featureSlot = packageNamespaceAwareResolve(context, root)
+				if (featureSlot == null) {
 					return null // could not find starting slot for feature call
-			}
-			// go through all calls and traverse execution context hierarchy accordingly
-			for (EObject feature : calls) {
+			}	
+		}
+		// go through all calls and traverse execution context hierarchy accordingly
+		for (EObject feature : calls) {
 
-				if (featureSlot instanceof CompositeSlot && (feature instanceof Property || feature instanceof Event)) {
-					featureSlot = (featureSlot as CompositeSlot).slots.findFirst[slot|slot.name == feature.name]
-				}
-				if (featureSlot instanceof ExecutionVariable && feature instanceof Operation) {
-					//					TODO (featureSlot as ExecutionVariable).value
-				}
+			if (featureSlot instanceof CompositeSlot && (feature instanceof Property || feature instanceof Event)) {
+				featureSlot = (featureSlot as CompositeSlot).slots.findFirst[slot|slot.name == feature.name]
+			}
+			if (featureSlot instanceof ExecutionVariable && feature instanceof Operation) {
+				//					TODO (featureSlot as ExecutionVariable).value
 			}
-			return featureSlot
 		}
-	}
-	
-	def dispatch ExecutionSlot resolve(ExecutionContext context, ElementReferenceExpression e) {
-		packageNamespaceAwareResolve(context, e.reference)
+		
+		return featureSlot
+		
 	}
 	
 	def protected ExecutionSlot packageNamespaceAwareResolve(ExecutionContext context, EObject element) {
-		val pkg = EcoreUtil2.getContainerOfType(element, org.yakindu.base.types.Package)
+		val pkg = EcoreUtil2.getContainerOfType(element, Package)
 		if (pkg != null) {
 			context.getSlot(pkg.name + "." + element.fullyQualifiedName.toString)
 		}
@@ -93,11 +116,8 @@ class DefaultExecutionSlotResolver implements IExecutionSlotResolver {
 		}
 	}
 	
-	def dispatch ExecutionSlot resolve(ExecutionContext context, AssignmentExpression e) {
-		return context.resolve(e.varRef)
-	}
 
-	def private name(EObject e) {
+	def protected name(EObject e) {
 		return SimpleAttributeResolver::NAME_RESOLVER.apply(e)
 	}
 }

plugins/org.yakindu.sct.simulation.core.sexec/src/org/yakindu/sct/simulation/core/sexec/interpreter/StextStatementInterpreter.xtend

@@ -295,12 +295,17 @@ class StextStatementInterpreter extends AbstractStatementInterpreter {
 			return call.getFeature();
 		}
 
-		var variableRef = context.resolve(call)
-		if (variableRef instanceof ExecutionVariable || variableRef instanceof CompositeSlot) {
-			return variableRef.getValue
+		var slot = context.resolve(call)
+		if (slot instanceof ExecutionVariable || slot instanceof CompositeSlot) {
+			return slot.getValue
+		}
+		if (slot instanceof ExecutionEvent) {
+			if(call.feature instanceof Operation) {
+				(slot as ExecutionEvent).raised = true	
+			}
+			
+			return (slot as ExecutionEvent).raised
 		}
-		if (variableRef instanceof ExecutionEvent)
-			return (variableRef as ExecutionEvent).raised
 
 		println("No feature found for " + call.feature.fqn + " -> returning null")
 		return null;