Update c_src

[nit.git] / c_src / static_type._sep.c

diff --git a/c_src/static_type._sep.c b/c_src/static_type._sep.c
index f6cfa61..8278f7d 100644 (file)
--- a/c_src/static_type._sep.c
+++ b/c_src/static_type._sep.c
@@ -1,11 +1,11 @@
 /* This C file is generated by NIT to compile module static_type. */
 #include "static_type._sep.h"
 val_t static_type___MMLocalClass___get_type(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMLocalClass___get_type, 27};
+  struct trace_t trace = {NULL, LOCATE_static_type, 27, LOCATE_static_type___MMLocalClass___get_type};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ATTR_static_type___MMLocalClass____base_type_cache( self) /*MMLocalClass::_base_type_cache*/;
-  variable0 = TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*MMType::==*/)))));
+  variable0 = TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*Object::==*/)))));
   if (UNTAG_Bool(variable0)) { /*if*/
     variable0 = NEW_static_type___MMTypeSimpleClass___init( self); /*new MMTypeSimpleClass*/
     ATTR_static_type___MMLocalClass____base_type_cache( self) /*MMLocalClass::_base_type_cache*/ = variable0;
@@ -17,7 +17,7 @@ val_t static_type___MMLocalClass___get_type(val_t  self) {
   return variable0;
 }
 void static_type___MMLocalClass___add_ancestor(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMLocalClass___add_ancestor, 34};
+  struct trace_t trace = {NULL, LOCATE_static_type, 34, LOCATE_static_type___MMLocalClass___add_ancestor};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -26,10 +26,10 @@ void static_type___MMLocalClass___add_ancestor(val_t  self, val_t  param0) {
   variable1 = ATTR_static_type___MMLocalClass____ancestors( self) /*MMLocalClass::_ancestors*/;
   variable2 = ((static_type___MMAncestor___local_class_t)CALL( variable0 /*a*/,COLOR_static_type___MMAncestor___local_class))( variable0 /*a*/) /*MMAncestor::local_class*/;
   variable1 = ((abstract_collection___Map___has_key_t)CALL(variable1,COLOR_abstract_collection___Map___has_key))(variable1, variable2) /*Map::has_key*/;
-  if (!UNTAG_Bool( TAG_Bool(!UNTAG_Bool(variable1)))) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMLocalClass___add_ancestor, 37); nit_exit(1);}
+  if (!UNTAG_Bool( TAG_Bool(!UNTAG_Bool(variable1)))) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMLocalClass___add_ancestor, LOCATE_static_type, 37); nit_exit(1);}
   variable1 = ((static_type___MMAncestor___local_class_t)CALL( variable0 /*a*/,COLOR_static_type___MMAncestor___local_class))( variable0 /*a*/) /*MMAncestor::local_class*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  self) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, self)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  self) /*MMLocalClass::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMLocalClass___add_ancestor, 38); nit_exit(1);}
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  self) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, self)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  self) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMLocalClass___add_ancestor, LOCATE_static_type, 38); nit_exit(1);}
   variable1 = ATTR_static_type___MMLocalClass____ancestors( self) /*MMLocalClass::_ancestors*/;
   variable2 = ((static_type___MMAncestor___local_class_t)CALL( variable0 /*a*/,COLOR_static_type___MMAncestor___local_class))( variable0 /*a*/) /*MMAncestor::local_class*/;
   ((abstract_collection___Map_____braeq_t)CALL(variable1,COLOR_abstract_collection___Map_____braeq))(variable1, variable2,  variable0 /*a*/) /*Map::[]=*/;
@@ -37,20 +37,20 @@ void static_type___MMLocalClass___add_ancestor(val_t  self, val_t  param0) {
   return;
 }
 val_t static_type___MMLocalClass___ancestors(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMLocalClass___ancestors, 42};
+  struct trace_t trace = {NULL, LOCATE_static_type, 42, LOCATE_static_type___MMLocalClass___ancestors};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_static_type___MMLocalClass____ancestors( self) /*MMLocalClass::_ancestors*/;
 }
 val_t static_type___MMLocalClass___ancestor(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMLocalClass___ancestor, 45};
+  struct trace_t trace = {NULL, LOCATE_static_type, 45, LOCATE_static_type___MMLocalClass___ancestor};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 = ATTR_static_type___MMLocalClass____ancestors( self) /*MMLocalClass::_ancestors*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*Map::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMLocalClass___ancestor, 48); nit_exit(1);}
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMLocalClass___ancestor, LOCATE_static_type, 48); nit_exit(1);}
   variable1 = ATTR_static_type___MMLocalClass____ancestors( self) /*MMLocalClass::_ancestors*/;
   variable1 = ((abstract_collection___Map___has_key_t)CALL(variable1,COLOR_abstract_collection___Map___has_key))(variable1,  variable0 /*c*/) /*Map::has_key*/;
   if (UNTAG_Bool(variable1)) { /*if*/
@@ -66,70 +66,78 @@ val_t static_type___MMLocalClass___ancestor(val_t  self, val_t  param0) {
   return variable1;
 }
 val_t static_type___MMLocalProperty___signature(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMLocalProperty___signature, 60};
-  val_t variable0;
+  struct trace_t trace = {NULL, LOCATE_static_type, 57, LOCATE_static_type___MMLocalProperty___signature};
   trace.prev = tracehead; tracehead = &trace;
-  variable0 = ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/;
-  variable0 = TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*MMSignature::==*/)))));
-  if (UNTAG_Bool(variable0)) { /*if*/
-    variable0 = ATTR_abstractmetamodel___MMLocalProperty____super_prop( self) /*MMLocalProperty::_super_prop*/;
-    variable0 = TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*MMLocalProperty::==*/)))));
-    if (UNTAG_Bool(variable0)) { /*if*/
-      variable0 = ATTR_abstractmetamodel___MMLocalProperty____concrete_property( self) /*MMLocalProperty::_concrete_property*/;
-      variable0 = ((static_type___MMLocalProperty___signature_t)CALL(variable0,COLOR_static_type___MMLocalProperty___signature))(variable0) /*MMConcreteProperty::signature*/;
-      ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/ = variable0;
-    } else { /*if*/
-      variable0 = ATTR_abstractmetamodel___MMLocalProperty____super_prop( self) /*MMLocalProperty::_super_prop*/;
-      variable0 = ((static_type___MMLocalProperty___signature_t)CALL(variable0,COLOR_static_type___MMLocalProperty___signature))(variable0) /*MMLocalProperty::signature*/;
-      ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/ = variable0;
-    }
-  }
-  variable0 = ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/;
-  variable0 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*MMSignature::==*/)))))));
-  if (!UNTAG_Bool(variable0)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMLocalProperty___signature, 70); nit_exit(1);}
-  variable0 = ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/;
-  goto return_label3;
-  return_label3: while(false);
   tracehead = trace.prev;
-  return variable0;
+  return ATTR_static_type___MMLocalProperty____signature( self) /*MMLocalProperty::_signature*/;
 }
 void static_type___MMLocalProperty___signature__eq(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMLocalProperty___signature__eq, 74};
+  struct trace_t trace = {NULL, LOCATE_static_type, 57, LOCATE_static_type___MMLocalProperty___signature__eq};
+  trace.prev = tracehead; tracehead = &trace;
+  ATTR_static_type___MMLocalProperty____signature( self) /*MMLocalProperty::_signature*/ =  param0;
+  tracehead = trace.prev;
+  return;
+}
+val_t static_type___MMLocalProperty___signature_for(val_t  self, val_t  param0) {
+  struct trace_t trace = {NULL, LOCATE_static_type, 62, LOCATE_static_type___MMLocalProperty___signature_for};
   val_t variable0;
+  val_t variable1;
+  val_t variable2;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
-  ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/ =  variable0 /*s*/;
+  variable1 = ((abstractmetamodel___MMLocalProperty___local_class_t)CALL( self,COLOR_abstractmetamodel___MMLocalProperty___local_class))( self) /*MMLocalProperty::local_class*/;
+  variable1 = ((static_type___MMLocalClass___get_type_t)CALL(variable1,COLOR_static_type___MMLocalClass___get_type))(variable1) /*MMLocalClass::get_type*/;
+  variable1 = TAG_Bool(( variable0 /*t*/ == variable1) || (( variable0 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*t*/,variable1)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*t*/,COLOR_kernel___Object_____eqeq))( variable0 /*t*/, variable1) /*Object::==*/)))));
+  if (UNTAG_Bool(variable1)) { /*if*/
+    variable1 = ((static_type___MMLocalProperty___signature_t)CALL( self,COLOR_static_type___MMLocalProperty___signature))( self) /*MMLocalProperty::signature*/;
+    goto return_label3;
+  }
+  variable1 = ATTR_static_type___MMLocalProperty____signatures_cache( self) /*MMLocalProperty::_signatures_cache*/;
+  variable1 = ((abstract_collection___CoupleMap___has_key_t)CALL(variable1,COLOR_abstract_collection___Map___has_key))(variable1,  variable0 /*t*/) /*CoupleMap::has_key*/;
+  if (UNTAG_Bool(variable1)) { /*if*/
+    variable1 = ATTR_static_type___MMLocalProperty____signatures_cache( self) /*MMLocalProperty::_signatures_cache*/;
+    variable1 = ((abstract_collection___CoupleMap_____bra_t)CALL(variable1,COLOR_abstract_collection___Map_____bra))(variable1,  variable0 /*t*/) /*CoupleMap::[]*/;
+    goto return_label3;
+  }
+  variable2 = ((static_type___MMLocalProperty___signature_t)CALL( self,COLOR_static_type___MMLocalProperty___signature))( self) /*MMLocalProperty::signature*/;
+  variable2 = ((static_type___MMSignature___adaptation_to_t)CALL(variable2,COLOR_static_type___MMSignature___adaptation_to))(variable2,  variable0 /*t*/) /*MMSignature::adaptation_to*/;
+  variable1 = variable2;
+  variable2 = ATTR_static_type___MMLocalProperty____signatures_cache( self) /*MMLocalProperty::_signatures_cache*/;
+  ((hash___HashMap_____braeq_t)CALL(variable2,COLOR_abstract_collection___Map_____braeq))(variable2,  variable0 /*t*/,  variable1 /*res*/) /*HashMap::[]=*/;
+  variable1 =  variable1 /*res*/;
+  goto return_label3;
+  return_label3: while(false);
   tracehead = trace.prev;
-  return;
+  return variable1;
 }
 val_t static_type___MMSignature___recv(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMSignature___recv, 79};
+  struct trace_t trace = {NULL, LOCATE_static_type, 76, LOCATE_static_type___MMSignature___recv};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_static_type___MMSignature____recv( self) /*MMSignature::_recv*/;
 }
 val_t static_type___MMSignature___return_type(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMSignature___return_type, 85};
+  struct trace_t trace = {NULL, LOCATE_static_type, 82, LOCATE_static_type___MMSignature___return_type};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_static_type___MMSignature____return_type( self) /*MMSignature::_return_type*/;
 }
 val_t static_type___MMSignature___arity(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMSignature___arity, 88};
+  struct trace_t trace = {NULL, LOCATE_static_type, 85, LOCATE_static_type___MMSignature___arity};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
-  variable0 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && UNTAG_Bool(((array___AbstractArray_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*Array::==*/)))));
-  if (!UNTAG_Bool(variable0)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMSignature___arity, 91); nit_exit(1);}
+  variable0 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable0)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMSignature___arity, LOCATE_static_type, 88); nit_exit(1);}
   variable0 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
-  variable0 = ((array___AbstractArray___length_t)CALL(variable0,COLOR_abstract_collection___Collection___length))(variable0) /*Array::length*/;
-  goto return_label5;
-  return_label5: while(false);
+  variable0 = ((array___AbstractArray___length_t)CALL(variable0,COLOR_abstract_collection___Collection___length))(variable0) /*AbstractArray::length*/;
+  goto return_label4;
+  return_label4: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t static_type___MMSignature_____l(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMSignature_____l, 95};
+  struct trace_t trace = {NULL, LOCATE_static_type, 92, LOCATE_static_type___MMSignature_____l};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -137,31 +145,37 @@ val_t static_type___MMSignature_____l(val_t  self, val_t  param0) {
     val_t variable4;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*s*/ ==  NIT_NULL /*null*/) || (( variable0 /*s*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*s*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*s*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*s*/,COLOR_kernel___Object_____eqeq))( variable0 /*s*/,  NIT_NULL /*null*/) /*MMSignature::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMSignature_____l, 98); nit_exit(1);}
-  variable1 = TAG_Bool(( self ==  variable0 /*s*/) || (( self != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( self,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( self, variable0 /*s*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( self,COLOR_kernel___Object_____eqeq))( self,  variable0 /*s*/) /*MMSignature::==*/)))));
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*s*/ ==  NIT_NULL /*null*/) || (( variable0 /*s*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*s*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*s*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*s*/,COLOR_kernel___Object_____eqeq))( variable0 /*s*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMSignature_____l, LOCATE_static_type, 95); nit_exit(1);}
+  variable1 = TAG_Bool(( self ==  variable0 /*s*/) || (( self != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( self,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( self, variable0 /*s*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( self,COLOR_kernel___Object_____eqeq))( self,  variable0 /*s*/) /*Object::==*/)))));
   if (UNTAG_Bool(variable1)) { /*if*/
     variable1 =  TAG_Bool(true);
-    goto return_label6;
+    goto return_label5;
   }
   variable1 = ATTR_static_type___MMSignature____recv( self) /*MMSignature::_recv*/;
   variable1 = ((static_type___MMType___module_t)CALL(variable1,COLOR_static_type___MMType___module))(variable1) /*MMType::module*/;
   variable2 = ((static_type___MMSignature___recv_t)CALL( variable0 /*s*/,COLOR_static_type___MMSignature___recv))( variable0 /*s*/) /*MMSignature::recv*/;
   variable2 = ((static_type___MMType___module_t)CALL(variable2,COLOR_static_type___MMType___module))(variable2) /*MMType::module*/;
-  variable1 = TAG_Bool((variable1 == variable2) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1,variable2)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1, variable2) /*MMModule::==*/)))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMSignature_____l, 102); nit_exit(1);}
+  variable1 = TAG_Bool((variable1 == variable2) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1,variable2)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1, variable2) /*Object::==*/)))));
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMSignature_____l, LOCATE_static_type, 99); nit_exit(1);}
   variable1 = ((static_type___MMSignature___arity_t)CALL( self,COLOR_static_type___MMSignature___arity))( self) /*MMSignature::arity*/;
   variable2 = ((static_type___MMSignature___arity_t)CALL( variable0 /*s*/,COLOR_static_type___MMSignature___arity))( variable0 /*s*/) /*MMSignature::arity*/;
-  variable1 = TAG_Bool((variable1)==(variable2));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMSignature_____l, 103); nit_exit(1);}
-  variable1 = ATTR_static_type___MMSignature____return_type( self) /*MMSignature::_return_type*/;
-  variable1 = TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*MMType::==*/)))));
-  variable2 = ((static_type___MMSignature___return_type_t)CALL( variable0 /*s*/,COLOR_static_type___MMSignature___return_type))( variable0 /*s*/) /*MMSignature::return_type*/;
-  variable2 = TAG_Bool((variable2 ==  NIT_NULL /*null*/) || ((variable2 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable2, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))(variable2,  NIT_NULL /*null*/) /*MMType::==*/)))));
-  variable1 = TAG_Bool((variable1)==(variable2));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMSignature_____l, 104); nit_exit(1);}
+  variable1 = TAG_Bool((variable1)!=(variable2));
+  variable2 = variable1;
+  if (!UNTAG_Bool(variable2)) { /* or */
+    variable2 = ATTR_static_type___MMSignature____return_type( self) /*MMSignature::_return_type*/;
+    variable2 = TAG_Bool((variable2 ==  NIT_NULL /*null*/) || ((variable2 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable2, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))(variable2,  NIT_NULL /*null*/) /*Object::==*/)))));
+    variable3 = ((static_type___MMSignature___return_type_t)CALL( variable0 /*s*/,COLOR_static_type___MMSignature___return_type))( variable0 /*s*/) /*MMSignature::return_type*/;
+    variable3 = TAG_Bool((variable3 ==  NIT_NULL /*null*/) || ((variable3 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable3,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable3, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable3,COLOR_kernel___Object_____eqeq))(variable3,  NIT_NULL /*null*/) /*Object::==*/)))));
+    variable2 = TAG_Bool((variable2)!=(variable3));
+  }
+  variable1 = variable2;
+  if (UNTAG_Bool(variable1)) { /*if*/
+    variable1 =  TAG_Bool(false);
+    goto return_label5;
+  }
   variable1 = ATTR_static_type___MMSignature____return_type( self) /*MMSignature::_return_type*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*MMType::==*/)))))));
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*Object::==*/)))))));
   variable2 = variable1;
   if (UNTAG_Bool(variable2)) { /* and */
     variable2 = ATTR_static_type___MMSignature____return_type( self) /*MMSignature::_return_type*/;
@@ -172,10 +186,10 @@ val_t static_type___MMSignature_____l(val_t  self, val_t  param0) {
   variable1 = variable2;
   if (UNTAG_Bool(variable1)) { /*if*/
     variable1 =  TAG_Bool(false);
-    goto return_label6;
+    goto return_label5;
   }
   variable1 = ((static_type___MMSignature___arity_t)CALL( self,COLOR_static_type___MMSignature___arity))( self) /*MMSignature::arity*/;
-  variable2 = NEW_range___Range___without_last( TAG_Int(0), variable1); /*new Range[Int]*/
+  variable2 = NEW_range___Range___without_last( TAG_Int(0), variable1); /*new Range[E]*/
   variable1 = variable2;
   variable1 = ((range___Range___iterator_t)CALL(variable1,COLOR_abstract_collection___Collection___iterator))(variable1) /*Range::iterator*/;
   while (true) { /*for*/
@@ -187,20 +201,20 @@ val_t static_type___MMSignature_____l(val_t  self, val_t  param0) {
     variable3 = ((static_type___MMType_____l_t)CALL(variable3,COLOR_static_type___MMType_____l))(variable3, variable4) /*MMType::<*/;
     if (UNTAG_Bool( TAG_Bool(!UNTAG_Bool(variable3)))) { /*if*/
       variable1 =  TAG_Bool(false);
-      goto return_label6;
+      goto return_label5;
     }
-    continue_7: while(0);
+    continue_6: while(0);
     ((abstract_collection___Iterator___next_t)CALL(variable1,COLOR_abstract_collection___Iterator___next))(variable1) /*Iterator::next*/;
   }
-  break_7: while(0);
+  break_6: while(0);
   variable1 =  TAG_Bool(true);
-  goto return_label6;
-  return_label6: while(false);
+  goto return_label5;
+  return_label5: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t static_type___MMSignature_____bra(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMSignature_____bra, 117};
+  struct trace_t trace = {NULL, LOCATE_static_type, 113, LOCATE_static_type___MMSignature_____bra};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -209,33 +223,33 @@ val_t static_type___MMSignature_____bra(val_t  self, val_t  param0) {
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
-  variable1 = ((array___AbstractArray___length_t)CALL(variable1,COLOR_abstract_collection___Collection___length))(variable1) /*Array::length*/;
+  variable1 = ((array___AbstractArray___length_t)CALL(variable1,COLOR_abstract_collection___Collection___length))(variable1) /*AbstractArray::length*/;
   variable1 = TAG_Bool(UNTAG_Int(variable1)>UNTAG_Int( variable0 /*i*/));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMSignature_____bra, 120); nit_exit(1);}
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMSignature_____bra, LOCATE_static_type, 116); nit_exit(1);}
   variable1 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
   variable2 =  variable0 /*i*/;
   variable3 = TAG_Bool(UNTAG_Int( variable2 /*index*/)>=UNTAG_Int( TAG_Int(0)));
   variable4 = variable3;
   if (UNTAG_Bool(variable4)) { /* and */
     variable4 = variable1;
-    variable4 = ATTR_array___AbstractArray____length(variable4) /*Array::_length*/;
+    variable4 = ATTR_array___AbstractArray____length(variable4) /*AbstractArray::_length*/;
     variable4 = TAG_Bool(UNTAG_Int( variable2 /*index*/)<UNTAG_Int(variable4));
   }
   variable3 = variable4;
-  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_static_type, 229); nit_exit(1);}
   variable3 = variable1;
   variable3 = ATTR_array___Array____items(variable3) /*Array::_items*/;
   variable3 = UNBOX_NativeArray(variable3)[UNTAG_Int( variable2 /*index*/)];
-  goto return_label9;
-  return_label9: while(false);
-  variable1 = variable3;
   goto return_label8;
   return_label8: while(false);
+  variable1 = variable3;
+  goto return_label7;
+  return_label7: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t static_type___MMSignature___to_s(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMSignature___to_s, 124};
+  struct trace_t trace = {NULL, LOCATE_static_type, 120, LOCATE_static_type___MMSignature___to_s};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -249,24 +263,24 @@ val_t static_type___MMSignature___to_s(val_t  self) {
   trace.prev = tracehead; tracehead = &trace;
   variable0 = NIT_NULL /*decl variable s*/;
   variable1 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && UNTAG_Bool(((array___AbstractArray_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*Array::==*/)))));
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*Object::==*/)))))));
   variable2 = variable1;
   if (UNTAG_Bool(variable2)) { /* and */
     variable2 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
-    variable2 = ((array___AbstractArray___length_t)CALL(variable2,COLOR_abstract_collection___Collection___length))(variable2) /*Array::length*/;
+    variable2 = ((array___AbstractArray___length_t)CALL(variable2,COLOR_abstract_collection___Collection___length))(variable2) /*AbstractArray::length*/;
     variable2 = TAG_Bool(UNTAG_Int(variable2)>UNTAG_Int( TAG_Int(0)));
   }
   variable1 = variable2;
   if (UNTAG_Bool(variable1)) { /*if*/
     variable1 = NIT_NULL /*decl variable tmp*/;
     variable3 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
-    variable3 = ((array___AbstractArray___length_t)CALL(variable3,COLOR_abstract_collection___Collection___length))(variable3) /*Array::length*/;
-    variable4 = NEW_array___Array___with_capacity(variable3); /*new Array[String]*/
+    variable3 = ((array___AbstractArray___length_t)CALL(variable3,COLOR_abstract_collection___Collection___length))(variable3) /*AbstractArray::length*/;
+    variable4 = NEW_array___Array___with_capacity(variable3); /*new Array[E]*/
     variable3 = variable4;
     variable2 = variable3;
     variable3 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
-    variable3 = ((array___AbstractArray___length_t)CALL(variable3,COLOR_abstract_collection___Collection___length))(variable3) /*Array::length*/;
-    variable4 = NEW_range___Range___without_last( TAG_Int(0), variable3); /*new Range[Int]*/
+    variable3 = ((array___AbstractArray___length_t)CALL(variable3,COLOR_abstract_collection___Collection___length))(variable3) /*AbstractArray::length*/;
+    variable4 = NEW_range___Range___without_last( TAG_Int(0), variable3); /*new Range[E]*/
     variable3 = variable4;
     variable3 = ((range___Range___iterator_t)CALL(variable3,COLOR_abstract_collection___Collection___iterator))(variable3) /*Range::iterator*/;
     while (true) { /*for*/
@@ -279,30 +293,30 @@ val_t static_type___MMSignature___to_s(val_t  self) {
       variable9 = variable8;
       if (UNTAG_Bool(variable9)) { /* and */
         variable9 = variable6;
-        variable9 = ATTR_array___AbstractArray____length(variable9) /*Array::_length*/;
+        variable9 = ATTR_array___AbstractArray____length(variable9) /*AbstractArray::_length*/;
         variable9 = TAG_Bool(UNTAG_Int( variable7 /*index*/)<UNTAG_Int(variable9));
       }
       variable8 = variable9;
-      if (!UNTAG_Bool(variable8)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+      if (!UNTAG_Bool(variable8)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_static_type, 229); nit_exit(1);}
       variable8 = variable6;
       variable8 = ATTR_array___Array____items(variable8) /*Array::_items*/;
       variable8 = UNBOX_NativeArray(variable8)[UNTAG_Int( variable7 /*index*/)];
-      goto return_label12;
-      return_label12: while(false);
+      goto return_label11;
+      return_label11: while(false);
       variable6 = variable8;
       variable5 = variable6;
-      variable6 = ((string___Object___to_s_t)CALL( variable5 /*p*/,COLOR_string___Object___to_s))( variable5 /*p*/) /*MMType::to_s*/;
-      ((array___AbstractArray___add_t)CALL( variable2 /*a*/,COLOR_abstract_collection___SimpleCollection___add))( variable2 /*a*/, variable6) /*Array::add*/;
-      continue_11: while(0);
+      variable6 = ((string___Object___to_s_t)CALL( variable5 /*p*/,COLOR_string___Object___to_s))( variable5 /*p*/) /*Object::to_s*/;
+      ((array___AbstractArray___add_t)CALL( variable2 /*a*/,COLOR_abstract_collection___SimpleCollection___add))( variable2 /*a*/, variable6) /*AbstractArray::add*/;
+      continue_10: while(0);
       ((abstract_collection___Iterator___next_t)CALL(variable3,COLOR_abstract_collection___Iterator___next))(variable3) /*Iterator::next*/;
     }
-    break_11: while(0);
+    break_10: while(0);
     variable3 = NEW_string___String___init(); /*new String*/
     variable4 = NEW_string___String___with_native(BOX_NativeString("("), TAG_Int(1)); /*new String*/
     variable5 = variable4;
     ((string___String___append_t)CALL(variable3,COLOR_abstract_collection___IndexedCollection___append))(variable3, variable5) /*String::append*/;
     variable6 = NEW_string___String___with_native(BOX_NativeString(","), TAG_Int(1)); /*new String*/
-    variable6 = ((string___Collection___join_t)CALL( variable2 /*a*/,COLOR_string___Collection___join))( variable2 /*a*/, variable6) /*Array::join*/;
+    variable6 = ((string___Collection___join_t)CALL( variable2 /*a*/,COLOR_string___Collection___join))( variable2 /*a*/, variable6) /*Collection::join*/;
     variable7 = variable6;
     ((string___String___append_t)CALL(variable3,COLOR_abstract_collection___IndexedCollection___append))(variable3, variable7) /*String::append*/;
     variable8 = NEW_string___String___with_native(BOX_NativeString(")"), TAG_Int(1)); /*new String*/
@@ -314,7 +328,7 @@ val_t static_type___MMSignature___to_s(val_t  self) {
     variable0 = variable1 /*s=*/;
   }
   variable1 = ATTR_static_type___MMSignature____return_type( self) /*MMSignature::_return_type*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*MMType::==*/)))))));
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*Object::==*/)))))));
   if (UNTAG_Bool(variable1)) { /*if*/
     variable1 = NEW_string___String___init(); /*new String*/
     variable2 = NEW_string___String___with_native(BOX_NativeString(": "), TAG_Int(2)); /*new String*/
@@ -330,13 +344,66 @@ val_t static_type___MMSignature___to_s(val_t  self) {
     ((string___String___append_t)CALL( variable0 /*s*/,COLOR_abstract_collection___IndexedCollection___append))( variable0 /*s*/, variable1) /*String::append*/;
   }
   variable0 =  variable0 /*s*/;
-  goto return_label10;
-  return_label10: while(false);
+  goto return_label9;
+  return_label9: while(false);
   tracehead = trace.prev;
   return variable0;
 }
+val_t static_type___MMSignature___adaptation_to(val_t  self, val_t  param0) {
+  struct trace_t trace = {NULL, LOCATE_static_type, 142, LOCATE_static_type___MMSignature___adaptation_to};
+  val_t variable0;
+  val_t variable1;
+  val_t variable2;
+  val_t variable3;
+      val_t variable4;
+      val_t variable5;
+  trace.prev = tracehead; tracehead = &trace;
+  variable0 =  param0;
+  variable1 = ATTR_static_type___MMSignature____recv( self) /*MMSignature::_recv*/;
+  variable1 = TAG_Bool((variable1 ==  variable0 /*r*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, variable0 /*r*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  variable0 /*r*/) /*Object::==*/)))));
+  if (UNTAG_Bool(variable1)) { /*if*/
+    variable1 =  self;
+    goto return_label12;
+  }
+  variable2 = ((static_type___MMType___module_t)CALL( variable0 /*r*/,COLOR_static_type___MMType___module))( variable0 /*r*/) /*MMType::module*/;
+  variable1 = variable2;
+  variable3 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
+  variable2 = variable3;
+  variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable2 /*p*/ ==  NIT_NULL /*null*/) || (( variable2 /*p*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable2 /*p*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable2 /*p*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable2 /*p*/,COLOR_kernel___Object_____eqeq))( variable2 /*p*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (UNTAG_Bool(variable3)) { /*if*/
+    variable3 = NEW_array___Array___init(); /*new Array[E]*/
+    variable2 = variable3 /*p=*/;
+    variable3 = ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/;
+    variable3 = ((array___AbstractArray___iterator_t)CALL(variable3,COLOR_abstract_collection___Collection___iterator))(variable3) /*AbstractArray::iterator*/;
+    while (true) { /*for*/
+      variable4 = ((array___ArrayIterator___is_ok_t)CALL(variable3,COLOR_abstract_collection___Iterator___is_ok))(variable3) /*ArrayIterator::is_ok*/;
+      if (!UNTAG_Bool(variable4)) break; /*for*/
+      variable4 = ((array___ArrayIterator___item_t)CALL(variable3,COLOR_abstract_collection___Iterator___item))(variable3) /*ArrayIterator::item*/;
+      variable5 = ((static_type___MMType___for_module_t)CALL( variable4 /*i*/,COLOR_static_type___MMType___for_module))( variable4 /*i*/,  variable1 /*mod*/) /*MMType::for_module*/;
+      variable5 = ((static_type___MMType___adapt_to_t)CALL(variable5,COLOR_static_type___MMType___adapt_to))(variable5,  variable0 /*r*/) /*MMType::adapt_to*/;
+      ((array___AbstractArray___add_t)CALL( variable2 /*p*/,COLOR_abstract_collection___SimpleCollection___add))( variable2 /*p*/, variable5) /*AbstractArray::add*/;
+      continue_13: while(0);
+      ((array___ArrayIterator___next_t)CALL(variable3,COLOR_abstract_collection___Iterator___next))(variable3) /*ArrayIterator::next*/;
+    }
+    break_13: while(0);
+  }
+  variable4 = ATTR_static_type___MMSignature____return_type( self) /*MMSignature::_return_type*/;
+  variable3 = variable4;
+  variable4 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable3 /*rv*/ ==  NIT_NULL /*null*/) || (( variable3 /*rv*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable3 /*rv*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable3 /*rv*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable3 /*rv*/,COLOR_kernel___Object_____eqeq))( variable3 /*rv*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (UNTAG_Bool(variable4)) { /*if*/
+    variable4 = ((static_type___MMType___for_module_t)CALL( variable3 /*rv*/,COLOR_static_type___MMType___for_module))( variable3 /*rv*/,  variable1 /*mod*/) /*MMType::for_module*/;
+    variable4 = ((static_type___MMType___adapt_to_t)CALL(variable4,COLOR_static_type___MMType___adapt_to))(variable4,  variable0 /*r*/) /*MMType::adapt_to*/;
+    variable3 = variable4 /*rv=*/;
+  }
+  variable4 = NEW_static_type___MMSignature___init( variable2 /*p*/,  variable3 /*rv*/,  variable0 /*r*/); /*new MMSignature*/
+  variable1 = variable4;
+  goto return_label12;
+  return_label12: while(false);
+  tracehead = trace.prev;
+  return variable1;
+}
 void static_type___MMSignature___init(val_t  self, val_t  param0, val_t  param1, val_t  param2, int* init_table) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMSignature___init, 146};
+  struct trace_t trace = {NULL, LOCATE_static_type, 163, LOCATE_static_type___MMSignature___init};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -346,8 +413,8 @@ void static_type___MMSignature___init(val_t  self, val_t  param0, val_t  param1,
   variable1 =  param1;
   variable2 =  param2;
   if (init_table[VAL2OBJ( self)->vft[INIT_TABLE_POS_MMSignature].i]) return;
-  variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*params*/ ==  NIT_NULL /*null*/) || (( variable0 /*params*/ != NIT_NULL) && UNTAG_Bool(((array___AbstractArray_____eqeq_t)CALL( variable0 /*params*/,COLOR_kernel___Object_____eqeq))( variable0 /*params*/,  NIT_NULL /*null*/) /*Array::==*/)))));
-  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMSignature___init, 148); nit_exit(1);}
+  variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*params*/ ==  NIT_NULL /*null*/) || (( variable0 /*params*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*params*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*params*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*params*/,COLOR_kernel___Object_____eqeq))( variable0 /*params*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMSignature___init, LOCATE_static_type, 165); nit_exit(1);}
   ATTR_static_type___MMSignature____params( self) /*MMSignature::_params*/ =  variable0 /*params*/;
   ATTR_static_type___MMSignature____return_type( self) /*MMSignature::_return_type*/ =  variable1 /*return_type*/;
   ATTR_static_type___MMSignature____recv( self) /*MMSignature::_recv*/ =  variable2 /*r*/;
@@ -356,33 +423,33 @@ void static_type___MMSignature___init(val_t  self, val_t  param0, val_t  param1,
   return;
 }
 val_t static_type___MMAncestor___stype(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMAncestor___stype, 157};
+  struct trace_t trace = {NULL, LOCATE_static_type, 174, LOCATE_static_type___MMAncestor___stype};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_static_type___MMAncestor____stype( self) /*MMAncestor::_stype*/;
 }
 void static_type___MMAncestor___stype__eq(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMAncestor___stype__eq, 157};
+  struct trace_t trace = {NULL, LOCATE_static_type, 174, LOCATE_static_type___MMAncestor___stype__eq};
   trace.prev = tracehead; tracehead = &trace;
   ATTR_static_type___MMAncestor____stype( self) /*MMAncestor::_stype*/ =  param0;
   tracehead = trace.prev;
   return;
 }
 val_t static_type___MMAncestor___inheriter(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMAncestor___inheriter, 160};
+  struct trace_t trace = {NULL, LOCATE_static_type, 177, LOCATE_static_type___MMAncestor___inheriter};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_static_type___MMAncestor____inheriter( self) /*MMAncestor::_inheriter*/;
 }
 void static_type___MMAncestor___inheriter__eq(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMAncestor___inheriter__eq, 160};
+  struct trace_t trace = {NULL, LOCATE_static_type, 177, LOCATE_static_type___MMAncestor___inheriter__eq};
   trace.prev = tracehead; tracehead = &trace;
   ATTR_static_type___MMAncestor____inheriter( self) /*MMAncestor::_inheriter*/ =  param0;
   tracehead = trace.prev;
   return;
 }
 val_t static_type___MMAncestor___is_reffinement(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMAncestor___is_reffinement, 163};
+  struct trace_t trace = {NULL, LOCATE_static_type, 180, LOCATE_static_type___MMAncestor___is_reffinement};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
@@ -390,14 +457,14 @@ val_t static_type___MMAncestor___is_reffinement(val_t  self) {
   variable0 = ((static_type___MMType___module_t)CALL(variable0,COLOR_static_type___MMType___module))(variable0) /*MMType::module*/;
   variable1 = ((static_type___MMAncestor___stype_t)CALL( self,COLOR_static_type___MMAncestor___stype))( self) /*MMAncestor::stype*/;
   variable1 = ((static_type___MMType___module_t)CALL(variable1,COLOR_static_type___MMType___module))(variable1) /*MMType::module*/;
-  variable0 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable0 == variable1) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0,variable1)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0, variable1) /*MMModule::==*/)))))));
-  goto return_label14;
-  return_label14: while(false);
+  variable0 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable0 == variable1) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0,variable1)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0, variable1) /*Object::==*/)))))));
+  goto return_label15;
+  return_label15: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t static_type___MMAncestor___is_specialisation(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMAncestor___is_specialisation, 167};
+  struct trace_t trace = {NULL, LOCATE_static_type, 184, LOCATE_static_type___MMAncestor___is_specialisation};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
@@ -407,237 +474,189 @@ val_t static_type___MMAncestor___is_specialisation(val_t  self) {
   variable1 = ((static_type___MMAncestor___inheriter_t)CALL( self,COLOR_static_type___MMAncestor___inheriter))( self) /*MMAncestor::inheriter*/;
   variable1 = ((static_type___MMType___local_class_t)CALL(variable1,COLOR_static_type___MMType___local_class))(variable1) /*MMType::local_class*/;
   variable1 = ((abstractmetamodel___MMLocalClass___global_t)CALL(variable1,COLOR_abstractmetamodel___MMLocalClass___global))(variable1) /*MMLocalClass::global*/;
-  variable0 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable0 == variable1) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0,variable1)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0, variable1) /*MMGlobalClass::==*/)))))));
-  goto return_label15;
-  return_label15: while(false);
+  variable0 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable0 == variable1) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0,variable1)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0, variable1) /*Object::==*/)))))));
+  goto return_label16;
+  return_label16: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t static_type___MMAncestor___local_class(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMAncestor___local_class, 171};
+  struct trace_t trace = {NULL, LOCATE_static_type, 188, LOCATE_static_type___MMAncestor___local_class};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "local_class", LOCATE_static_type___MMAncestor___is_specialisation, 171);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMAncestor___is_specialisation, LOCATE_static_type, 188);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t static_type___MMAncestor___to_s(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMAncestor___to_s, 174};
+  struct trace_t trace = {NULL, LOCATE_static_type, 191, LOCATE_static_type___MMAncestor___to_s};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ((static_type___MMAncestor___stype_t)CALL( self,COLOR_static_type___MMAncestor___stype))( self) /*MMAncestor::stype*/;
-  variable0 = TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*MMType::==*/)))));
+  variable0 = TAG_Bool((variable0 ==  NIT_NULL /*null*/) || ((variable0 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable0, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable0,COLOR_kernel___Object_____eqeq))(variable0,  NIT_NULL /*null*/) /*Object::==*/)))));
   if (UNTAG_Bool(variable0)) { /*if*/
     variable0 = ((static_type___MMAncestor___local_class_t)CALL( self,COLOR_static_type___MMAncestor___local_class))( self) /*MMAncestor::local_class*/;
     variable0 = ((abstractmetamodel___MMLocalClass___to_s_t)CALL(variable0,COLOR_string___Object___to_s))(variable0) /*MMLocalClass::to_s*/;
-    goto return_label16;
+    goto return_label17;
   } else { /*if*/
     variable0 = ((static_type___MMAncestor___stype_t)CALL( self,COLOR_static_type___MMAncestor___stype))( self) /*MMAncestor::stype*/;
-    variable0 = ((string___Object___to_s_t)CALL(variable0,COLOR_string___Object___to_s))(variable0) /*MMType::to_s*/;
-    goto return_label16;
+    variable0 = ((string___Object___to_s_t)CALL(variable0,COLOR_string___Object___to_s))(variable0) /*Object::to_s*/;
+    goto return_label17;
   }
-  return_label16: while(false);
+  return_label17: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t static_type___MMType___module(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___module, 187};
+  struct trace_t trace = {NULL, LOCATE_static_type, 204, LOCATE_static_type___MMType___module};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "module", LOCATE_static_type___MMAncestor___to_s, 187);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMAncestor___to_s, LOCATE_static_type, 204);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t static_type___MMType___local_class(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___local_class, 190};
+  struct trace_t trace = {NULL, LOCATE_static_type, 207, LOCATE_static_type___MMType___local_class};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "local_class", LOCATE_static_type___MMAncestor___to_s, 190);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMAncestor___to_s, LOCATE_static_type, 207);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t static_type___MMType_____l(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType_____l, 193};
+  struct trace_t trace = {NULL, LOCATE_static_type, 210, LOCATE_static_type___MMType_____l};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "<", LOCATE_static_type___MMAncestor___to_s, 193);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMAncestor___to_s, LOCATE_static_type, 210);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t static_type___MMType___is_supertype(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___is_supertype, 196};
+  struct trace_t trace = {NULL, LOCATE_static_type, 213, LOCATE_static_type___MMType___is_supertype};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "is_supertype", LOCATE_static_type___MMAncestor___to_s, 196);
-  nit_exit(1);
-  tracehead = trace.prev;
-  return NIT_NULL;
-}
-val_t static_type___MMType___select_method(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___select_method, 201};
-  val_t variable0;
-  val_t variable1;
-  val_t variable2;
-  trace.prev = tracehead; tracehead = &trace;
-  variable0 =  param0;
-  variable1 = ((static_type___MMType___local_class_t)CALL( self,COLOR_static_type___MMType___local_class))( self) /*MMType::local_class*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*MMLocalClass::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMType___select_method, 204); nit_exit(1);}
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*name*/ ==  NIT_NULL /*null*/) || (( variable0 /*name*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*name*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*name*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*name*/,COLOR_kernel___Object_____eqeq))( variable0 /*name*/,  NIT_NULL /*null*/) /*Symbol::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMType___select_method, 205); nit_exit(1);}
-  variable2 = ((static_type___MMType___local_class_t)CALL( self,COLOR_static_type___MMType___local_class))( self) /*MMType::local_class*/;
-  variable2 = ((abstractmetamodel___MMLocalClass___method_t)CALL(variable2,COLOR_abstractmetamodel___MMLocalClass___method))(variable2,  variable0 /*name*/) /*MMLocalClass::method*/;
-  variable2 = ((static_type___MMType___select_property_t)CALL( self,COLOR_static_type___MMType___select_property))( self, variable2) /*MMType::select_property*/;
-  variable1 = variable2;
-  variable2 = TAG_Bool(( variable1 /*res*/==NIT_NULL) || VAL_ISA( variable1 /*res*/, COLOR_MMMethod, ID_MMMethod)) /*cast MMMethod*/;
-  if (!UNTAG_Bool(variable2)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMType___select_method, 207); nit_exit(1);}
-  variable1 =  variable1 /*res*/;
-  goto return_label17;
-  return_label17: while(false);
-  tracehead = trace.prev;
-  return variable1;
-}
-val_t static_type___MMType___select_attribute(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___select_attribute, 211};
-  val_t variable0;
-  val_t variable1;
-  val_t variable2;
-  trace.prev = tracehead; tracehead = &trace;
-  variable0 =  param0;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*name*/ ==  NIT_NULL /*null*/) || (( variable0 /*name*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*name*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*name*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*name*/,COLOR_kernel___Object_____eqeq))( variable0 /*name*/,  NIT_NULL /*null*/) /*Symbol::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMType___select_attribute, 214); nit_exit(1);}
-  variable1 = ((static_type___MMType___local_class_t)CALL( self,COLOR_static_type___MMType___local_class))( self) /*MMType::local_class*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*MMLocalClass::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMType___select_attribute, 215); nit_exit(1);}
-  variable2 = ((static_type___MMType___local_class_t)CALL( self,COLOR_static_type___MMType___local_class))( self) /*MMType::local_class*/;
-  variable2 = ((abstractmetamodel___MMLocalClass___attribute_t)CALL(variable2,COLOR_abstractmetamodel___MMLocalClass___attribute))(variable2,  variable0 /*name*/) /*MMLocalClass::attribute*/;
-  variable2 = ((static_type___MMType___select_property_t)CALL( self,COLOR_static_type___MMType___select_property))( self, variable2) /*MMType::select_property*/;
-  variable1 = variable2;
-  variable2 = TAG_Bool(( variable1 /*res*/==NIT_NULL) || VAL_ISA( variable1 /*res*/, COLOR_MMAttribute, ID_MMAttribute)) /*cast MMAttribute*/;
-  if (!UNTAG_Bool(variable2)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMType___select_attribute, 217); nit_exit(1);}
-  variable1 =  variable1 /*res*/;
-  goto return_label18;
-  return_label18: while(false);
-  tracehead = trace.prev;
-  return variable1;
-}
-val_t static_type___MMType___select_property(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___select_property, 221};
-  trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "select_property", LOCATE_static_type___MMType___select_attribute, 221);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMAncestor___to_s, LOCATE_static_type, 213);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t static_type___MMType___for_module(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___for_module, 224};
+  struct trace_t trace = {NULL, LOCATE_static_type, 218, LOCATE_static_type___MMType___for_module};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "for_module", LOCATE_static_type___MMType___select_attribute, 224);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMAncestor___to_s, LOCATE_static_type, 218);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t static_type___MMType___adapt_to(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___adapt_to, 227};
+  struct trace_t trace = {NULL, LOCATE_static_type, 221, LOCATE_static_type___MMType___adapt_to};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "adapt_to", LOCATE_static_type___MMType___select_attribute, 227);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMAncestor___to_s, LOCATE_static_type, 221);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t static_type___MMType___upcast_for(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___upcast_for, 231};
+  struct trace_t trace = {NULL, LOCATE_static_type, 225, LOCATE_static_type___MMType___upcast_for};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "upcast_for", LOCATE_static_type___MMType___select_attribute, 231);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMAncestor___to_s, LOCATE_static_type, 225);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t static_type___MMType___not_for_self(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMType___not_for_self, 235};
+  struct trace_t trace = {NULL, LOCATE_static_type, 229, LOCATE_static_type___MMType___not_for_self};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  self;
-  goto return_label19;
-  return_label19: while(false);
+  goto return_label18;
+  return_label18: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t static_type___MMTypeClass___local_class(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeClass___local_class, 242};
+  struct trace_t trace = {NULL, LOCATE_static_type, 236, LOCATE_static_type___MMTypeClass___local_class};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
 }
 val_t static_type___MMTypeClass___module(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeClass___module, 243};
+  struct trace_t trace = {NULL, LOCATE_static_type, 237, LOCATE_static_type___MMTypeClass___module};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
   variable0 = ((abstractmetamodel___MMLocalClass___module_t)CALL(variable0,COLOR_abstractmetamodel___MMLocalClass___module))(variable0) /*MMLocalClass::module*/;
-  goto return_label20;
-  return_label20: while(false);
+  goto return_label19;
+  return_label19: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t static_type___MMTypeClass_____l(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeClass_____l, 244};
+  struct trace_t trace = {NULL, LOCATE_static_type, 238, LOCATE_static_type___MMTypeClass_____l};
   val_t variable0;
   val_t variable1;
   val_t variable2;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*t*/ ==  NIT_NULL /*null*/) || (( variable0 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*t*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*t*/,COLOR_kernel___Object_____eqeq))( variable0 /*t*/,  NIT_NULL /*null*/) /*MMType::==*/)))))));
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*t*/ ==  NIT_NULL /*null*/) || (( variable0 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*t*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*t*/,COLOR_kernel___Object_____eqeq))( variable0 /*t*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
   variable2 = variable1;
   if (UNTAG_Bool(variable2)) { /* and */
     variable2 = ((static_type___MMType___is_supertype_t)CALL( variable0 /*t*/,COLOR_static_type___MMType___is_supertype))( variable0 /*t*/,  self) /*MMType::is_supertype*/;
   }
   variable1 = variable2;
-  goto return_label21;
-  return_label21: while(false);
+  goto return_label20;
+  return_label20: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t static_type___MMTypeClass___to_s(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeClass___to_s, 246};
+  struct trace_t trace = {NULL, LOCATE_static_type, 240, LOCATE_static_type___MMTypeClass___to_s};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
   variable0 = ((abstractmetamodel___MMLocalClass___to_s_t)CALL(variable0,COLOR_string___Object___to_s))(variable0) /*MMLocalClass::to_s*/;
-  goto return_label22;
-  return_label22: while(false);
+  goto return_label21;
+  return_label21: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t static_type___MMTypeClass___upcast_for(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeClass___upcast_for, 251};
+  struct trace_t trace = {NULL, LOCATE_static_type, 245, LOCATE_static_type___MMTypeClass___upcast_for};
   val_t variable0;
   val_t variable1;
   val_t variable2;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*MMLocalClass::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMTypeClass___upcast_for, 253); nit_exit(1);}
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*c*/ ==  NIT_NULL /*null*/) || (( variable0 /*c*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*c*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*c*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*c*/,COLOR_kernel___Object_____eqeq))( variable0 /*c*/,  NIT_NULL /*null*/) /*MMLocalClass::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMTypeClass___upcast_for, 254); nit_exit(1);}
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMTypeClass___upcast_for, LOCATE_static_type, 247); nit_exit(1);}
+  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*c*/ ==  NIT_NULL /*null*/) || (( variable0 /*c*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*c*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*c*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*c*/,COLOR_kernel___Object_____eqeq))( variable0 /*c*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMTypeClass___upcast_for, LOCATE_static_type, 248); nit_exit(1);}
   variable1 =  self;
   variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
-  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable2 ==  variable0 /*c*/) || ((variable2 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable2, variable0 /*c*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))(variable2,  variable0 /*c*/) /*MMLocalClass::==*/)))))));
+  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable2 ==  variable0 /*c*/) || ((variable2 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable2, variable0 /*c*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))(variable2,  variable0 /*c*/) /*Object::==*/)))))));
   if (UNTAG_Bool(variable2)) { /*if*/
     variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
     variable2 = ((static_type___MMLocalClass___ancestor_t)CALL(variable2,COLOR_static_type___MMLocalClass___ancestor))(variable2,  variable0 /*c*/) /*MMLocalClass::ancestor*/;
     variable1 = variable2 /*t=*/;
   }
-  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable1 /*t*/ ==  NIT_NULL /*null*/) || (( variable1 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable1 /*t*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))( variable1 /*t*/,  NIT_NULL /*null*/) /*MMType::==*/)))))));
-  if (!UNTAG_Bool(variable2)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMTypeClass___upcast_for, 260); nit_exit(1);}
+  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable1 /*t*/ ==  NIT_NULL /*null*/) || (( variable1 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable1 /*t*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))( variable1 /*t*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable2)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMTypeClass___upcast_for, LOCATE_static_type, 254); nit_exit(1);}
   variable1 =  variable1 /*t*/;
-  goto return_label23;
-  return_label23: while(false);
+  goto return_label22;
+  return_label22: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 void static_type___MMTypeClass___init(val_t  self, val_t  param0, int* init_table) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeClass___init, 264};
+  struct trace_t trace = {NULL, LOCATE_static_type, 258, LOCATE_static_type___MMTypeClass___init};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
@@ -648,7 +667,7 @@ void static_type___MMTypeClass___init(val_t  self, val_t  param0, int* init_tabl
   return;
 }
 val_t static_type___MMTypeSimpleClass___is_supertype(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeSimpleClass___is_supertype, 272};
+  struct trace_t trace = {NULL, LOCATE_static_type, 266, LOCATE_static_type___MMTypeSimpleClass___is_supertype};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -656,72 +675,51 @@ val_t static_type___MMTypeSimpleClass___is_supertype(val_t  self, val_t  param0)
   variable0 =  param0;
   variable1 = ((static_type___MMType___local_class_t)CALL( variable0 /*t*/,COLOR_static_type___MMType___local_class))( variable0 /*t*/) /*MMType::local_class*/;
   variable1 = ((abstractmetamodel___MMLocalClass___cshe_t)CALL(variable1,COLOR_abstractmetamodel___MMLocalClass___cshe))(variable1) /*MMLocalClass::cshe*/;
-  variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeSimpleClass::_local_class*/;
+  variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
   variable1 = ((partial_order___PartialOrderElement_____leq_t)CALL(variable1,COLOR_partial_order___PartialOrderElement_____leq))(variable1, variable2) /*PartialOrderElement::<=*/;
-  goto return_label25;
-  return_label25: while(false);
-  tracehead = trace.prev;
-  return variable1;
-}
-val_t static_type___MMTypeSimpleClass___select_property(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeSimpleClass___select_property, 277};
-  val_t variable0;
-  val_t variable1;
-  trace.prev = tracehead; tracehead = &trace;
-  variable0 =  param0;
-  variable1 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeSimpleClass::_local_class*/;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable1 ==  NIT_NULL /*null*/) || ((variable1 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable1, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable1,COLOR_kernel___Object_____eqeq))(variable1,  NIT_NULL /*null*/) /*MMLocalClass::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMTypeSimpleClass___select_property, 279); nit_exit(1);}
-  variable1 = TAG_Bool(( variable0 /*g*/ ==  NIT_NULL /*null*/) || (( variable0 /*g*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*g*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*g*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*g*/,COLOR_kernel___Object_____eqeq))( variable0 /*g*/,  NIT_NULL /*null*/) /*MMGlobalProperty::==*/)))));
-  if (UNTAG_Bool(variable1)) { /*if*/
-    variable1 =  NIT_NULL /*null*/;
-    goto return_label26;
-  }
-  variable1 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeSimpleClass::_local_class*/;
-  variable1 = ((abstractmetamodel___MMLocalClass_____bra_t)CALL(variable1,COLOR_abstractmetamodel___MMLocalClass_____bra))(variable1,  variable0 /*g*/) /*MMLocalClass::[]*/;
-  goto return_label26;
-  return_label26: while(false);
+  goto return_label24;
+  return_label24: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t static_type___MMTypeSimpleClass___for_module(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeSimpleClass___for_module, 286};
+  struct trace_t trace = {NULL, LOCATE_static_type, 271, LOCATE_static_type___MMTypeSimpleClass___for_module};
   val_t variable0;
   val_t variable1;
   val_t variable2;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  self;
-  variable2 = ((static_type___MMTypeClass___module_t)CALL( self,COLOR_static_type___MMType___module))( self) /*MMTypeSimpleClass::module*/;
-  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable2 ==  variable0 /*mod*/) || ((variable2 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable2, variable0 /*mod*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))(variable2,  variable0 /*mod*/) /*MMModule::==*/)))))));
+  variable2 = ((static_type___MMTypeClass___module_t)CALL( self,COLOR_static_type___MMType___module))( self) /*MMTypeClass::module*/;
+  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable2 ==  variable0 /*mod*/) || ((variable2 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable2, variable0 /*mod*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable2,COLOR_kernel___Object_____eqeq))(variable2,  variable0 /*mod*/) /*Object::==*/)))))));
   if (UNTAG_Bool(variable2)) { /*if*/
-    variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeSimpleClass::_local_class*/;
+    variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
     variable2 = ((abstractmetamodel___MMLocalClass___for_module_t)CALL(variable2,COLOR_abstractmetamodel___MMLocalClass___for_module))(variable2,  variable0 /*mod*/) /*MMLocalClass::for_module*/;
     variable2 = ((static_type___MMLocalClass___get_type_t)CALL(variable2,COLOR_static_type___MMLocalClass___get_type))(variable2) /*MMLocalClass::get_type*/;
     variable1 = variable2 /*t=*/;
   }
-  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable1 /*t*/ ==  NIT_NULL /*null*/) || (( variable1 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable1 /*t*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))( variable1 /*t*/,  NIT_NULL /*null*/) /*MMType::==*/)))))));
-  if (!UNTAG_Bool(variable2)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_static_type___MMTypeSimpleClass___for_module, 292); nit_exit(1);}
+  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable1 /*t*/ ==  NIT_NULL /*null*/) || (( variable1 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable1 /*t*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))( variable1 /*t*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable2)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMTypeSimpleClass___for_module, LOCATE_static_type, 277); nit_exit(1);}
   variable1 =  variable1 /*t*/;
-  goto return_label27;
-  return_label27: while(false);
+  goto return_label25;
+  return_label25: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t static_type___MMTypeSimpleClass___adapt_to(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeSimpleClass___adapt_to, 296};
+  struct trace_t trace = {NULL, LOCATE_static_type, 281, LOCATE_static_type___MMTypeSimpleClass___adapt_to};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  self;
-  goto return_label28;
-  return_label28: while(false);
+  goto return_label26;
+  return_label26: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 void static_type___MMTypeSimpleClass___init(val_t  self, val_t  param0, int* init_table) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeSimpleClass___init, 298};
+  struct trace_t trace = {NULL, LOCATE_static_type, 283, LOCATE_static_type___MMTypeSimpleClass___init};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
@@ -732,57 +730,57 @@ void static_type___MMTypeSimpleClass___init(val_t  self, val_t  param0, int* ini
   return;
 }
 val_t static_type___MMTypeNone___module(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeNone___module, 307};
+  struct trace_t trace = {NULL, LOCATE_static_type, 292, LOCATE_static_type___MMTypeNone___module};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_static_type___MMTypeNone____module( self) /*MMTypeNone::_module*/;
 }
 val_t static_type___MMTypeNone_____l(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeNone_____l, 308};
+  struct trace_t trace = {NULL, LOCATE_static_type, 293, LOCATE_static_type___MMTypeNone_____l};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  TAG_Bool(true);
-  goto return_label30;
-  return_label30: while(false);
+  goto return_label28;
+  return_label28: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t static_type___MMTypeNone___is_supertype(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeNone___is_supertype, 309};
+  struct trace_t trace = {NULL, LOCATE_static_type, 294, LOCATE_static_type___MMTypeNone___is_supertype};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  TAG_Bool(false);
-  goto return_label31;
-  return_label31: while(false);
+  goto return_label29;
+  return_label29: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t static_type___MMTypeNone___local_class(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeNone___local_class, 310};
+  struct trace_t trace = {NULL, LOCATE_static_type, 295, LOCATE_static_type___MMTypeNone___local_class};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Aborted (%s: %d)\n", LOCATE_static_type___MMTypeNone___local_class, 310); nit_exit(1);
+  fprintf(stderr, "Aborted"); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_static_type___MMTypeNone___local_class, LOCATE_static_type, 295); nit_exit(1);
   tracehead = trace.prev;
   return variable0;
 }
 val_t static_type___MMTypeNone___upcast_for(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeNone___upcast_for, 311};
+  struct trace_t trace = {NULL, LOCATE_static_type, 296, LOCATE_static_type___MMTypeNone___upcast_for};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  self;
-  goto return_label33;
-  return_label33: while(false);
+  goto return_label31;
+  return_label31: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 void static_type___MMTypeNone___init(val_t  self, val_t  param0, int* init_table) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMTypeNone___init, 313};
+  struct trace_t trace = {NULL, LOCATE_static_type, 298, LOCATE_static_type___MMTypeNone___init};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
@@ -793,7 +791,7 @@ void static_type___MMTypeNone___init(val_t  self, val_t  param0, int* init_table
   return;
 }
 val_t static_type___MMModule___type_none(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_static_type___MMModule___type_none, 317};
+  struct trace_t trace = {NULL, LOCATE_static_type, 302, LOCATE_static_type___MMModule___type_none};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_static_type___MMModule____type_none( self) /*MMModule::_type_none*/;