Disallowed multi-cardinality role assignments, sets now map to thrift…

… sets.
d3scomp · Mar 23, 2016 · bb6e3c5 · bb6e3c5
1 parent d7a2c72
commit bb6e3c5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/jdeeco-edl/src/cz/cuni/mff/d3s/jdeeco/edl/generator/EDLGenerator.xtend b/jdeeco-edl/src/cz/cuni/mff/d3s/jdeeco/edl/generator/EDLGenerator.xtend
@@ -163,6 +163,9 @@ struct «d.name» {
 	}
 
 	def String getThriftTypeName(String type) {
+		if (type.startsWith("set"))
+			return "set<" + getThriftTypeName(EDLUtils.stripSet(type)) + ">"
+
 		switch type {
 			case PrimitiveTypes.INT:
 				"i32"

diff --git a/jdeeco-edl/src/cz/cuni/mff/d3s/jdeeco/edl/validation/EDLValidator.xtend b/jdeeco-edl/src/cz/cuni/mff/d3s/jdeeco/edl/validation/EDLValidator.xtend
@@ -125,6 +125,10 @@ class EDLValidator extends AbstractEDLValidator implements ITypeResolutionContex
 			if (!EDLUtils.convertible(queryType, fieldType)) {
 				error("Invalid assignment - field and query types do not correspond. Field type: " + fieldType + " Query type: " + queryType, rule, EdlPackage.Literals.EXCHANGE_RULE__FIELD)
 			}
+
+			if (queryType.equals(fieldType) && !EDLUtils.stripSet(fieldType).startsWith("set") && ensemble.roles.exists[it.cardinalityMax != 1 && rule.field.toParts().get(0).equals(it.name)]) {
+				error("Invalid assignment - it is not allowed to change the members of a role in knowledge exchange rules." , rule, EdlPackage.Literals.EXCHANGE_RULE__FIELD)
+			}
 		}
 
 		for (RoleDefinition roleDefinition : ensemble.roles) {