Make read_type compiled

kernel/modelverse_kernel/compiled.py

@@ -318,10 +318,9 @@ def instantiate_node(a, b, c, **remainder):
     if "id" not in b:
         b['id'], = yield [("CNV", [b['value']])]
 
-    node, dict_entry, typing = \
+    node, dict_entry = \
         yield [("CN", []),
                ("RD", [a['id'], "model"]),
-               ("RD", [a['id'], "type_mapping"]),
               ]
 
     if c['value'] == "":
@@ -332,7 +331,6 @@ def instantiate_node(a, b, c, **remainder):
         name_node = c
 
     yield [("CD", [dict_entry, name, node])]
-    yield [("CD", [typing, name, b['id']])]
 
     yield [("RETURN", [name_node])]
 """
@@ -390,12 +388,12 @@ def set_in_node(a, b, **remainder):
     value, = yield [("RDN", [a['id'], b['id']])]
     yield [("RETURN", [{'value': value is not None}])]
 
-"""
 def read_type(a, b, **remainder):
     if "value" not in b:
         b['value'], = yield [("RV", [b['id']])]
 
     model, type_mapping, metamodel = yield [("RD", [a['id'], 'model']), ("RD", [a['id'], 'type_mapping']), ("RD", [a['id'], 'metamodel'])]
+    type_mapping, = yield [("RD", [type_mapping, "root"])]
     metamodel, in_model, type_value = yield [("RD", [metamodel, 'model']), ("RD", [model, b['value']]), ("RD", [type_mapping, b['value']])]
 
     if in_model is None:
@@ -409,4 +407,3 @@ def read_type(a, b, **remainder):
             yield [("RETURN", [{'value': ""}])]
         else:
             yield [("RETURN", [{'value': type_value}])]
-"""

wrappers/modelverse_SCCD.py

@@ -1,7 +1,7 @@
 """
 Generated by Statechart compiler by Glenn De Jonghe, Joeri Exelmans, Simon Van Mierlo, and Yentl Van Tendeloo (for the inspiration)
 
-Date:   Thu May 31 08:08:52 2018
+Date:   Thu May 31 08:17:54 2018
 
 Model author: Yentl Van Tendeloo
 Model name:   MvK Server