Browse Source

Merge branch 'master' into new-primitives

Yentl Van Tendeloo 9 years ago
parent
commit
ed0f52b319
1 changed files with 2 additions and 2 deletions
  1. 2 2
      bootstrap/conformance_scd.alc

+ 2 - 2
bootstrap/conformance_scd.alc

@@ -21,7 +21,7 @@ Element function set_copy(elem_to_copy : Element):
 
 Boolean function is_direct_instance(model : Element, instance : Element, type : Element):
 	// Just check whether or not the type mapping specifies the type as the type of the instance
-	return dict_read_node(model["type_mapping"], instance) == type
+	return element_eq(dict_read_node(model["type_mapping"], instance), type)
 
 Boolean function is_nominal_instance(model : Element, instance : Element, type : Element):
 	return is_nominal_subtype(type, dict_read_node(model["type_mapping"], instance), model["metamodel"]["type_mapping"], model["inheritance"])
@@ -60,7 +60,7 @@ Boolean function is_structural_instance(model : Element, instance : Element, typ
 	
 Boolean function is_structural_subtype(subtype : Element, supertype : Element):
 	// Determine whether it is just the exact type or not
-	if (subtype == supertype):
+	if (element_eq(subtype, supertype)):
 		return True
 
 	// Find all links that are required (name and type) from the specified type