renamed DefaultTypeSystem to GenericTypeSystem

plugins/org.yakindu.sct.domain.default_/src/org/yakindu/sct/domain/default_/modules/DefaultSequencerModule.java

@@ -15,7 +15,7 @@ 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.GenericTypeSystem;
 import org.yakindu.base.types.typesystem.ITypeSystem;
 import org.yakindu.sct.model.sexec.transformation.IModelSequencer;
 import org.yakindu.sct.model.sexec.transformation.ModelSequencer;
@@ -54,7 +54,7 @@ public class DefaultSequencerModule extends AbstractGenericModule {
 	}
 	
 	public Class<? extends ITypeSystem> bindITypesystem(){
-		return DefaultTypeSystem.class;
+		return GenericTypeSystem.class;
 	}
 
 	public Class<? extends IResourceDescriptions> bindIResourceDescriptions() {

plugins/org.yakindu.sct.domain.default_/src/org/yakindu/sct/domain/default_/modules/DefaultTypeSystemModule.java

@@ -12,7 +12,7 @@ package org.yakindu.sct.domain.default_.modules;
 
 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.GenericTypeSystem;
 import org.yakindu.base.types.typesystem.ITypeSystem;
 import org.yakindu.sct.model.stext.inferrer.STextTypeInferrer;
 
@@ -27,7 +27,7 @@ import org.yakindu.sct.model.stext.inferrer.STextTypeInferrer;
 public class DefaultTypeSystemModule extends AbstractGenericModule {
 
 	public Class<? extends ITypeSystem> bindITypeSystem() {
-		return DefaultTypeSystem.class;
+		return GenericTypeSystem.class;
 	}
 
 	public Class<? extends ITypeSystemInferrer> bindITypeSystemInferrer() {

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

@@ -39,7 +39,6 @@ import org.yakindu.base.expressions.expressions.ShiftExpression
 import org.yakindu.base.expressions.expressions.StringLiteral
 import org.yakindu.base.expressions.expressions.TypeCastExpression
 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.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.naming.INamingService
@@ -49,6 +48,7 @@ import org.yakindu.sct.model.stext.stext.EventRaisingExpression
 import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression
 import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.base.types.typesystem.GenericTypeSystem
 
 class ExpressionCode {
 
@@ -120,7 +120,7 @@ class ExpressionCode {
 	def dispatch CharSequence code(LogicalNotExpression it) '''! «operand.code»'''
 
 	def dispatch CharSequence code(LogicalRelationExpression it) '''
-	«IF isSame(leftOperand.inferType(null), getType(DefaultTypeSystem.STRING))»
+	«IF isSame(leftOperand.inferType(null), getType(GenericTypeSystem.STRING))»
 		(strcmp(«leftOperand.code», «rightOperand.code») «operator.literal» 0)
 	«ELSE»«leftOperand.code» «operator.literal» «rightOperand.code»«ENDIF»'''
 

plugins/org.yakindu.sct.generator.c/src/org/yakindu/sct/generator/c/types/CTypeSystemAccess.xtend

@@ -15,7 +15,7 @@ import org.yakindu.base.types.Type
 import org.yakindu.base.types.typesystem.ITypeSystem
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.*
+import static org.yakindu.base.types.typesystem.GenericTypeSystem.*
 
 /**
  * @author andreas muelder

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

@@ -29,7 +29,6 @@ import org.yakindu.base.expressions.expressions.ShiftExpression
 import org.yakindu.base.expressions.expressions.StringLiteral
 import org.yakindu.base.expressions.expressions.TypeCastExpression
 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.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.naming.INamingService
@@ -39,6 +38,7 @@ import org.yakindu.sct.model.stext.stext.EventRaisingExpression
 import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression
 import org.yakindu.sct.model.stext.stext.OperationDefinition
 import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.base.types.typesystem.GenericTypeSystem
 
 class ExpressionCode {
 
@@ -112,7 +112,7 @@ class ExpressionCode {
 	def dispatch CharSequence code(LogicalNotExpression it) '''! «operand.code»'''
 
 	def dispatch CharSequence code(LogicalRelationExpression it) '''
-	«IF isSame(leftOperand.inferType(null), getType(DefaultTypeSystem.STRING))»
+	«IF isSame(leftOperand.inferType(null), getType(GenericTypeSystem.STRING))»
 		(strcmp(«leftOperand.code», «rightOperand.code») «operator.literal» 0)
 	«ELSE»«leftOperand.code» «operator.literal» «rightOperand.code»«ENDIF»'''
 

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

@@ -36,7 +36,6 @@ import org.yakindu.base.expressions.expressions.TypeCastExpression
 import org.yakindu.base.expressions.expressions.UnaryOperator
 import org.yakindu.base.types.Operation
 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.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.TimeEvent
@@ -47,6 +46,7 @@ import org.yakindu.sct.model.stext.stext.ActiveStateReferenceExpression
 import org.yakindu.sct.model.stext.stext.EventRaisingExpression
 import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression
 import org.yakindu.sct.model.stext.stext.OperationDefinition
+import org.yakindu.base.types.typesystem.GenericTypeSystem
 
 class ExpressionCode {
 
@@ -138,7 +138,7 @@ class ExpressionCode {
 	}
 
 	def dispatch String code(LogicalRelationExpression expression) {
-		if (isSame(expression.leftOperand.inferType(null), getType(DefaultTypeSystem.STRING))) {
+		if (isSame(expression.leftOperand.inferType(null), getType(GenericTypeSystem.STRING))) {
 			expression.logicalString
 		} else
 			expression.leftOperand.code + expression.operator.code + expression.rightOperand.code;

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

@@ -12,7 +12,6 @@ package org.yakindu.sct.generator.java
 import com.google.inject.Inject
 import java.util.List
 import org.eclipse.xtext.generator.IFileSystemAccess
-import org.yakindu.base.types.typesystem.DefaultTypeSystem
 import org.yakindu.base.types.typesystem.ITypeSystem
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.Check
@@ -23,6 +22,7 @@ import org.yakindu.sct.model.stext.stext.Direction
 import org.yakindu.sct.model.stext.stext.EventDefinition
 import org.yakindu.sct.model.stext.stext.InterfaceScope
 import org.yakindu.sct.model.stext.stext.VariableDefinition
+import org.yakindu.base.types.typesystem.GenericTypeSystem
 
 class Statemachine {
 	
@@ -96,7 +96,7 @@ class Statemachine {
 		«FOR event : flow.internalScopeEvents»
 		private boolean «event.symbol»;
 		
-		«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+		«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 			private «event.type.targetLanguageName» «event.valueIdentifier»;
 		«ENDIF»
 		«ENDFOR»
@@ -313,12 +313,12 @@ class Statemachine {
 			
 			private boolean «event.symbol»;
 			
-			«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+			«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 				private «event.type.targetLanguageName» «event.valueIdentifier»;
 			«ENDIF»
 			
 			«IF event.direction == Direction::IN»
-				«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+				«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 					public void raise«event.name.asName»(«event.type.targetLanguageName» value) {
 						«event.symbol» = true;
 						«event.valueIdentifier» = value;
@@ -343,7 +343,7 @@ class Statemachine {
 					return «event.symbol»;
 				}
 				
-				«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+				«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 					private void raise«event.name.asName»(«event.type.targetLanguageName» value) {
 						«event.symbol» = true;
 						«event.valueIdentifier» = value;
@@ -419,7 +419,7 @@ class Statemachine {
 	
 	def private internalScopeFunctions (ExecutionFlow flow) '''
 		«FOR event : flow.internalScopeEvents»
-			«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+			«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 				private void raise«event.name.asEscapedName»(«event.type.targetLanguageName» value) {
 					«event.valueIdentifier» = value;
 					«event.symbol» = true;
@@ -453,7 +453,7 @@ class Statemachine {
 			«var InterfaceScope scope = flow.defaultScope»
 			«FOR event : scope.eventDefinitions»
 				«IF event.direction == Direction::IN»
-					«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+					«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 					public void raise«event.name.asName»(«event.type.targetLanguageName» value) {
 						«scope.interfaceName.asEscapedIdentifier».raise«event.name.asName»(value);
 					}
@@ -467,7 +467,7 @@ class Statemachine {
 					public boolean isRaised«event.name.asName»() {
 						return «scope.interfaceName.asEscapedIdentifier».isRaised«event.name.asName»();
 					}
-					«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+					«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 						public «event.type.targetLanguageName» get«event.name.asName»Value() {
 							return «scope.interfaceName.asEscapedIdentifier».get«event.name.asName»Value();
 						}

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

@@ -12,7 +12,6 @@ package org.yakindu.sct.generator.java
 import com.google.inject.Inject
 import org.eclipse.xtext.generator.IFileSystemAccess
 import org.yakindu.base.types.Parameter
-import org.yakindu.base.types.typesystem.DefaultTypeSystem
 import org.yakindu.base.types.typesystem.ITypeSystem
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 import org.yakindu.sct.model.sexec.ExecutionFlow
@@ -22,6 +21,7 @@ import org.yakindu.sct.model.stext.stext.Direction
 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.base.types.typesystem.GenericTypeSystem
 
 class StatemachineInterface {
 
@@ -114,7 +114,7 @@ class StatemachineInterface {
 				public interface «scope.getInterfaceListenerName()» {
 					«FOR event : scope.eventDefinitions»
 						«IF event.direction == Direction::OUT»
-							«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+							«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 								public void on«event.name.toFirstUpper()»Raised(«event.type.targetLanguageName» value);
 							«ELSE»
 								public void on«event.name.toFirstUpper()»Raised();
@@ -143,7 +143,7 @@ class StatemachineInterface {
 		'''
 			«FOR event : scope.eventDefinitions»
 				«IF event.direction == Direction::IN»
-				«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+				«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 						public void raise«event.name.asName»(«event.type.targetLanguageName» value);
 					«ELSE»
 						public void raise«event.name.asName»();
@@ -151,7 +151,7 @@ class StatemachineInterface {
 				«ELSEIF event.direction == Direction::OUT»
 					public boolean isRaised«event.name.asName»();
 					««« IMPORTANT: An event not specifying a type is regarded to have a void type
-				«IF event.type != null && !isSame(event.type, getType(DefaultTypeSystem.VOID))»
+				«IF event.type != null && !isSame(event.type, getType(GenericTypeSystem.VOID))»
 						public «event.type.targetLanguageName» get«event.name.asName»Value();
 					«ENDIF»	
 				«ENDIF»

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/types/JavaTypeSystemAccess.xtend

@@ -15,7 +15,7 @@ import org.yakindu.base.types.Type
 import org.yakindu.base.types.typesystem.ITypeSystem
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.*
+import static org.yakindu.base.types.typesystem.GenericTypeSystem.*
 
 /**
  * @author andreas muelder

plugins/org.yakindu.sct.generator.java/src/org/yakindu/sct/generator/java/types/OldJavaTypeSystemAccess.xtend

@@ -15,7 +15,7 @@ import org.yakindu.base.types.Type
 import org.yakindu.base.types.typesystem.ITypeSystem
 import org.yakindu.sct.generator.core.types.ICodegenTypeSystemAccess
 
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.*
+import static org.yakindu.base.types.typesystem.GenericTypeSystem.*
 
 /**
  * @author andreas muelder

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/inferrer/STextTypeInferrer.java

@@ -10,9 +10,9 @@
  */
 package org.yakindu.sct.model.stext.inferrer;
 
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.BOOLEAN;
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.INTEGER;
-import static org.yakindu.base.types.typesystem.DefaultTypeSystem.VOID;
+import static org.yakindu.base.types.typesystem.ITypeSystem.BOOLEAN;
+import static org.yakindu.base.types.typesystem.ITypeSystem.INTEGER;
+import static org.yakindu.base.types.typesystem.ITypeSystem.VOID;
 
 import org.eclipse.emf.ecore.EObject;
 import org.yakindu.base.expressions.expressions.ElementReferenceExpression;
@@ -28,7 +28,6 @@ import org.yakindu.sct.model.stext.stext.EventRaisingExpression;
 import org.yakindu.sct.model.stext.stext.EventValueReferenceExpression;
 import org.yakindu.sct.model.stext.stext.Guard;
 import org.yakindu.sct.model.stext.stext.TimeEventSpec;
-import org.yakindu.sct.model.stext.stext.TypeAliasDefinition;
 import org.yakindu.sct.model.stext.stext.VariableDefinition;
 
 /**