Bläddra i källkod

Introduced ITypedValueProvider interface

Andreas Mülder 11 år sedan
förälder
incheckning
158c0e6aea

+ 6 - 0
plugins/org.yakindu.sct.domain.default_/src/org/yakindu/sct/domain/default_/modules/DefaultSequencerModule.java

@@ -15,6 +15,8 @@ import org.eclipse.xtext.resource.IResourceDescriptions;
 import org.eclipse.xtext.resource.impl.ResourceSetBasedResourceDescriptions;
 import org.eclipse.xtext.service.AbstractGenericModule;
 import org.yakindu.base.types.inferrer.ITypeSystemInferrer;
+import org.yakindu.base.types.typesystem.DefaultTypeSystem;
+import org.yakindu.base.types.typesystem.ITypeSystem;
 import org.yakindu.sct.model.sexec.naming.DefaultNamingService;
 import org.yakindu.sct.model.sexec.naming.INamingService;
 import org.yakindu.sct.model.sexec.transformation.IModelSequencer;
@@ -52,6 +54,10 @@ public class DefaultSequencerModule extends AbstractGenericModule {
 	public Class<? extends ITypeSystemInferrer> bindITypeSystemInferrer() {
 		return STextTypeInferrer.class;
 	}
+	
+	public Class<? extends ITypeSystem> bindITypesystem(){
+		return DefaultTypeSystem.class;
+	}
 
 	public Class<? extends INamingService> bindINamingService() {
 		return DefaultNamingService.class;

+ 1 - 1
plugins/org.yakindu.sct.domain.default_/src/org/yakindu/sct/domain/default_/modules/DefaultSimulationModule.java

@@ -69,7 +69,7 @@ public class DefaultSimulationModule extends AbstractGenericModule {
 	public Class<? extends IModelSequencer> bindIModelSequencer() {
 		return ModelSequencer.class;
 	}
-
+	
 	public Class<? extends IOperationMockup> bindIOperationMockup() {
 		return JavaOperationMockup.class;
 	}

+ 2 - 2
plugins/org.yakindu.sct.model.sexec/src/org/yakindu/sct/model/sexec/transformation/SequenceBuilder.xtend

@@ -13,7 +13,7 @@ import org.yakindu.base.expressions.expressions.NumericalMultiplyDivideExpressio
 import org.yakindu.base.expressions.expressions.PrimitiveValueExpression
 import org.yakindu.base.expressions.expressions.RealLiteral
 import org.yakindu.base.expressions.expressions.StringLiteral
-import org.yakindu.base.types.typesystem.ITypeSystem
+import org.yakindu.base.types.typesystem.ITypeValueProvider
 import org.yakindu.sct.model.sexec.ExecutionFlow
 import org.yakindu.sct.model.sexec.ExecutionRegion
 import org.yakindu.sct.model.sexec.ExecutionState
@@ -40,7 +40,7 @@ class SequenceBuilder {
 	@Inject extension SexecElementMapping mapping
 	@Inject extension TraceExtensions trace
 
-	@Inject extension ITypeSystem ts
+	@Inject extension ITypeValueProvider 
 
 	@Inject @Named("ADD_TRACES")
 	boolean _addTraceSteps

+ 2 - 0
plugins/org.yakindu.sct.simulation.core.sexec/src/org/yakindu/sct/simulation/core/sexec/container/DefaultExecutionContextInitializer.xtend

@@ -37,6 +37,7 @@ import org.yakindu.sct.simulation.core.sruntime.ExecutionSlot
 import org.yakindu.sct.simulation.core.sruntime.impl.CompositeSlotImpl
 import org.yakindu.sct.simulation.core.sruntime.impl.ExecutionEventImpl
 import org.yakindu.sct.simulation.core.sruntime.impl.ExecutionVariableImpl
+import org.yakindu.base.types.typesystem.ITypeValueProvider
 
 /**
  * 
@@ -48,6 +49,7 @@ class DefaultExecutionContextInitializer implements IExecutionContextInitializer
 	@Inject extension IQualifiedNameProvider
 	@Inject extension ITypeSystem
 	@Inject extension ITypeSystemInferrer
+	@Inject extension ITypeValueProvider
 
 	override initialize(ExecutionContext context, ExecutionFlow flow) {
 		flow.scopes.forEach[context.slots += transform]