Browse Source

Add handling for invalid types (#1093)

* Add handling for invalid types

* Change Object to Any

* Remove dependency to simulation.core

* Remove import of simulation.core.Any
Rene Beckmann 8 years ago
parent
commit
581ef0d9fb

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

@@ -557,25 +557,25 @@ class SequenceBuilder {
 	}
 	
 
-	def dispatch Expression buildValue(boolean b) {
+	def dispatch Expression buildValue(Boolean b) {
 		val PrimitiveValueExpression pve = factory.createPrimitiveValueExpression
 		val BoolLiteral lit = factory.createBoolLiteral
-		lit.value = b
+		lit.value = b.booleanValue
 		pve.value = lit
 
 		pve
 	}
 
-	def dispatch Expression buildValue(int i) {
+	def dispatch Expression buildValue(Integer i) {
 		val PrimitiveValueExpression pve = factory.createPrimitiveValueExpression
 		val IntLiteral lit = factory.createIntLiteral
-		lit.value = i
+		lit.value = i.intValue
 		pve.value = lit
 
 		pve
 	}
 	
-	def dispatch Expression buildValue(long i) {
+	def dispatch Expression buildValue(Long i) {
 		val PrimitiveValueExpression pve = factory.createPrimitiveValueExpression
 		val IntLiteral lit = factory.createIntLiteral
 		lit.value = i.intValue
@@ -584,19 +584,19 @@ class SequenceBuilder {
 		pve
 	}
 
-	def dispatch Expression buildValue(double d) {
+	def dispatch Expression buildValue(Double d) {
 		val PrimitiveValueExpression pve = factory.createPrimitiveValueExpression
 		val DoubleLiteral lit = factory.createDoubleLiteral
-		lit.value = d
+		lit.value = d.doubleValue
 		pve.value = lit
 
 		pve
 	}
 	
-	def dispatch Expression buildValue(float d) {
+	def dispatch Expression buildValue(Float d) {
 		val PrimitiveValueExpression pve = factory.createPrimitiveValueExpression
 		val FloatLiteral lit = factory.createFloatLiteral
-		lit.value = d
+		lit.value = d.floatValue
 		pve.value = lit
 
 		pve
@@ -610,5 +610,9 @@ class SequenceBuilder {
 
 		pve
 	}
+	
+	def dispatch Expression buildValue(Object o) {
+		null
+	}
 
 }