Update c_src

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

diff --git a/c_src/genericity._sep.c b/c_src/genericity._sep.c
index db4d0f8..075feaf 100644 (file)
--- a/c_src/genericity._sep.c
+++ b/c_src/genericity._sep.c
@@ -1,7 +1,7 @@
 /* This C file is generated by NIT to compile module genericity. */
 #include "genericity._sep.h"
 val_t genericity___MMLocalClass___get_formal(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalClass___get_formal, 25};
+  struct trace_t trace = {NULL, LOCATE_genericity, 25, LOCATE_genericity___MMLocalClass___get_formal};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -15,11 +15,11 @@ val_t genericity___MMLocalClass___get_formal(val_t  self, val_t  param0) {
   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_genericity, 229); nit_exit(1);}
   variable3 = variable1;
   variable3 = ATTR_array___Array____items(variable3) /*Array::_items*/;
   variable3 = UNBOX_NativeArray(variable3)[UNTAG_Int( variable2 /*index*/)];
@@ -32,27 +32,27 @@ val_t genericity___MMLocalClass___get_formal(val_t  self, val_t  param0) {
   return variable1;
 }
 void genericity___MMLocalClass___register_formal(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalClass___register_formal, 31};
+  struct trace_t trace = {NULL, LOCATE_genericity, 31, LOCATE_genericity___MMLocalClass___register_formal};
   val_t variable0;
   val_t variable1;
   val_t variable2;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 = ((genericity___MMTypeFormalParameter___def_class_t)CALL( variable0 /*f*/,COLOR_genericity___MMTypeFormalParameter___def_class))( variable0 /*f*/) /*MMTypeFormalParameter::def_class*/;
-  variable1 = 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_genericity___MMLocalClass___register_formal, 35); nit_exit(1);}
+  variable1 = 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_genericity___MMLocalClass___register_formal, LOCATE_genericity, 35); nit_exit(1);}
   variable1 = ((genericity___MMTypeFormalParameter___position_t)CALL( variable0 /*f*/,COLOR_genericity___MMTypeFormalParameter___position))( variable0 /*f*/) /*MMTypeFormalParameter::position*/;
   variable2 = ATTR_genericity___MMLocalClass____formals_types( self) /*MMLocalClass::_formals_types*/;
-  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*/;
   variable1 = TAG_Bool((variable1)==(variable2));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalClass___register_formal, 36); nit_exit(1);}
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_genericity___MMLocalClass___register_formal, LOCATE_genericity, 36); nit_exit(1);}
   variable1 = ATTR_genericity___MMLocalClass____formals_types( self) /*MMLocalClass::_formals_types*/;
-  ((array___AbstractArray___add_t)CALL(variable1,COLOR_abstract_collection___SimpleCollection___add))(variable1,  variable0 /*f*/) /*Array::add*/;
+  ((array___AbstractArray___add_t)CALL(variable1,COLOR_abstract_collection___SimpleCollection___add))(variable1,  variable0 /*f*/) /*AbstractArray::add*/;
   tracehead = trace.prev;
   return;
 }
 val_t genericity___MMLocalClass___get_instantiate_type(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalClass___get_instantiate_type, 43};
+  struct trace_t trace = {NULL, LOCATE_genericity, 43, LOCATE_genericity___MMLocalClass___get_instantiate_type};
   val_t variable0;
   val_t variable1;
     val_t variable2;
@@ -60,7 +60,7 @@ val_t genericity___MMLocalClass___get_instantiate_type(val_t  self, val_t  param
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 = ATTR_genericity___MMLocalClass____types( self) /*MMLocalClass::_types*/;
-  variable1 = ((array___AbstractArray___iterator_t)CALL(variable1,COLOR_abstract_collection___Collection___iterator))(variable1) /*Array::iterator*/;
+  variable1 = ((array___AbstractArray___iterator_t)CALL(variable1,COLOR_abstract_collection___Collection___iterator))(variable1) /*AbstractArray::iterator*/;
   while (true) { /*for*/
     variable2 = ((array___ArrayIterator___is_ok_t)CALL(variable1,COLOR_abstract_collection___Iterator___is_ok))(variable1) /*ArrayIterator::is_ok*/;
     if (!UNTAG_Bool(variable2)) break; /*for*/
@@ -77,7 +77,7 @@ val_t genericity___MMLocalClass___get_instantiate_type(val_t  self, val_t  param
   variable2 = NEW_genericity___MMTypeGeneric___init( self,  variable0 /*t*/); /*new MMTypeGeneric*/
   variable1 = variable2;
   variable2 = ATTR_genericity___MMLocalClass____types( self) /*MMLocalClass::_types*/;
-  ((array___AbstractArray___add_t)CALL(variable2,COLOR_abstract_collection___SimpleCollection___add))(variable2,  variable1 /*g*/) /*Array::add*/;
+  ((array___AbstractArray___add_t)CALL(variable2,COLOR_abstract_collection___SimpleCollection___add))(variable2,  variable1 /*g*/) /*AbstractArray::add*/;
   variable1 =  variable1 /*g*/;
   goto return_label3;
   return_label3: while(false);
@@ -85,7 +85,7 @@ val_t genericity___MMLocalClass___get_instantiate_type(val_t  self, val_t  param
   return variable1;
 }
 val_t genericity___MMLocalClass___formals_types(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalClass___formals_types, 57};
+  struct trace_t trace = {NULL, LOCATE_genericity, 57, LOCATE_genericity___MMLocalClass___formals_types};
   val_t variable0;
     val_t variable1;
       val_t variable2;
@@ -96,12 +96,12 @@ val_t genericity___MMLocalClass___formals_types(val_t  self) {
       val_t variable7;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ATTR_genericity___MMLocalClass____formals_types( self) /*MMLocalClass::_formals_types*/;
-  variable0 = ((array___AbstractArray___is_empty_t)CALL(variable0,COLOR_abstract_collection___Collection___is_empty))(variable0) /*Array::is_empty*/;
+  variable0 = ((array___AbstractArray___is_empty_t)CALL(variable0,COLOR_abstract_collection___Collection___is_empty))(variable0) /*AbstractArray::is_empty*/;
   if (UNTAG_Bool(variable0)) { /*if*/
     variable0 = TAG_Bool(( self==NIT_NULL) || VAL_ISA( self, COLOR_MMConcreteClass, ID_MMConcreteClass)) /*cast MMConcreteClass*/;
-    if (!UNTAG_Bool( TAG_Bool(!UNTAG_Bool(variable0)))) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalClass___formals_types, 62); nit_exit(1);}
+    if (!UNTAG_Bool( TAG_Bool(!UNTAG_Bool(variable0)))) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_genericity___MMLocalClass___formals_types, LOCATE_genericity, 62); nit_exit(1);}
     variable0 = ((abstractmetamodel___MMLocalClass___arity_t)CALL( self,COLOR_abstractmetamodel___MMLocalClass___arity))( self) /*MMLocalClass::arity*/;
-    variable1 = NEW_range___Range___without_last( TAG_Int(0), variable0); /*new Range[Int]*/
+    variable1 = NEW_range___Range___without_last( TAG_Int(0), variable0); /*new Range[E]*/
     variable0 = variable1;
     variable0 = ((range___Range___iterator_t)CALL(variable0,COLOR_abstract_collection___Collection___iterator))(variable0) /*Range::iterator*/;
     while (true) { /*for*/
@@ -112,7 +112,7 @@ val_t genericity___MMLocalClass___formals_types(val_t  self) {
       variable3 = ((abstractmetamodel___MMGlobalClass___intro_t)CALL(variable3,COLOR_abstractmetamodel___MMGlobalClass___intro))(variable3) /*MMGlobalClass::intro*/;
       variable3 = ((genericity___MMLocalClass___get_formal_t)CALL(variable3,COLOR_genericity___MMLocalClass___get_formal))(variable3,  variable1 /*i*/) /*MMLocalClass::get_formal*/;
       variable2 = variable3;
-      variable4 = ((type_formal___MMTypeFormal___name_t)CALL( variable2 /*oft*/,COLOR_type_formal___MMTypeFormal___name))( variable2 /*oft*/) /*MMTypeFormalParameter::name*/;
+      variable4 = ((type_formal___MMTypeFormal___name_t)CALL( variable2 /*oft*/,COLOR_type_formal___MMTypeFormal___name))( variable2 /*oft*/) /*MMTypeFormal::name*/;
       variable5 = NEW_genericity___MMTypeFormalParameter___init(variable4,  variable1 /*i*/,  self); /*new MMTypeFormalParameter*/
       variable4 = variable5;
       variable3 = variable4;
@@ -122,7 +122,7 @@ val_t genericity___MMLocalClass___formals_types(val_t  self) {
     }
     break_6: while(0);
     variable0 = ((abstractmetamodel___MMLocalClass___arity_t)CALL( self,COLOR_abstractmetamodel___MMLocalClass___arity))( self) /*MMLocalClass::arity*/;
-    variable1 = NEW_range___Range___without_last( TAG_Int(0), variable0); /*new Range[Int]*/
+    variable1 = NEW_range___Range___without_last( TAG_Int(0), variable0); /*new Range[E]*/
     variable0 = variable1;
     variable0 = ((range___Range___iterator_t)CALL(variable0,COLOR_abstract_collection___Collection___iterator))(variable0) /*Range::iterator*/;
     while (true) { /*for*/
@@ -139,11 +139,11 @@ val_t genericity___MMLocalClass___formals_types(val_t  self) {
       variable7 = variable6;
       if (UNTAG_Bool(variable7)) { /* and */
         variable7 = variable4;
-        variable7 = ATTR_array___AbstractArray____length(variable7) /*Array::_length*/;
+        variable7 = ATTR_array___AbstractArray____length(variable7) /*AbstractArray::_length*/;
         variable7 = TAG_Bool(UNTAG_Int( variable5 /*index*/)<UNTAG_Int(variable7));
       }
       variable6 = variable7;
-      if (!UNTAG_Bool(variable6)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+      if (!UNTAG_Bool(variable6)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 229); nit_exit(1);}
       variable6 = variable4;
       variable6 = ATTR_array___Array____items(variable6) /*Array::_items*/;
       variable6 = UNBOX_NativeArray(variable6)[UNTAG_Int( variable5 /*index*/)];
@@ -151,7 +151,7 @@ val_t genericity___MMLocalClass___formals_types(val_t  self) {
       return_label8: while(false);
       variable4 = variable6;
       variable3 = variable4;
-      variable4 = ((type_formal___MMTypeFormal___bound_t)CALL( variable2 /*oft*/,COLOR_type_formal___MMTypeFormal___bound))( variable2 /*oft*/) /*MMTypeFormalParameter::bound*/;
+      variable4 = ((type_formal___MMTypeFormal___bound_t)CALL( variable2 /*oft*/,COLOR_type_formal___MMTypeFormal___bound))( variable2 /*oft*/) /*MMTypeFormal::bound*/;
       variable5 = ((abstractmetamodel___MMLocalClass___module_t)CALL( self,COLOR_abstractmetamodel___MMLocalClass___module))( self) /*MMLocalClass::module*/;
       variable4 = ((static_type___MMType___for_module_t)CALL(variable4,COLOR_static_type___MMType___for_module))(variable4, variable5) /*MMType::for_module*/;
       ((genericity___MMTypeFormalParameter___bound__eq_t)CALL( variable3 /*ft*/,COLOR_genericity___MMTypeFormalParameter___bound__eq))( variable3 /*ft*/, variable4) /*MMTypeFormalParameter::bound=*/;
@@ -167,12 +167,12 @@ val_t genericity___MMLocalClass___formals_types(val_t  self) {
   return variable0;
 }
 val_t genericity___MMLocalClass___get_type(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalClass___get_type, 80};
+  struct trace_t trace = {NULL, LOCATE_genericity, 80, LOCATE_genericity___MMLocalClass___get_type};
   val_t variable0;
   val_t variable1;
   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::==*/)))));
   variable1 = variable0;
   if (UNTAG_Bool(variable1)) { /* and */
     variable1 = ((genericity___MMLocalClass___is_generic_t)CALL( self,COLOR_genericity___MMLocalClass___is_generic))( self) /*MMLocalClass::is_generic*/;
@@ -193,7 +193,7 @@ val_t genericity___MMLocalClass___get_type(val_t  self) {
   return variable0;
 }
 val_t genericity___MMLocalClass___is_generic(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalClass___is_generic, 90};
+  struct trace_t trace = {NULL, LOCATE_genericity, 90, LOCATE_genericity___MMLocalClass___is_generic};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ((abstractmetamodel___MMLocalClass___arity_t)CALL( self,COLOR_abstractmetamodel___MMLocalClass___arity))( self) /*MMLocalClass::arity*/;
@@ -203,225 +203,54 @@ val_t genericity___MMLocalClass___is_generic(val_t  self) {
   tracehead = trace.prev;
   return variable0;
 }
-val_t genericity___MMSignature___adaptation_to(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMSignature___adaptation_to, 95};
-  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*/) /*MMType::==*/)))));
-  if (UNTAG_Bool(variable1)) { /*if*/
-    variable1 =  self;
-    goto return_label11;
-  }
-  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) && UNTAG_Bool(((array___AbstractArray_____eqeq_t)CALL( variable2 /*p*/,COLOR_kernel___Object_____eqeq))( variable2 /*p*/,  NIT_NULL /*null*/) /*Array::==*/)))));
-  if (UNTAG_Bool(variable3)) { /*if*/
-    variable3 = NEW_array___Array___init(); /*new Array[MMType]*/
-    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) /*Array::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) /*Array::add*/;
-      continue_12: while(0);
-      ((array___ArrayIterator___next_t)CALL(variable3,COLOR_abstract_collection___Iterator___next))(variable3) /*ArrayIterator::next*/;
-    }
-    break_12: 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*/) /*MMType::==*/)))))));
-  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_label11;
-  return_label11: while(false);
-  tracehead = trace.prev;
-  return variable1;
-}
-val_t genericity___MMLocalProperty___recv(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalProperty___recv, 121};
-  val_t variable0;
-  trace.prev = tracehead; tracehead = &trace;
-  variable0 = ((genericity___MMLocalProperty___signature_t)CALL( self,COLOR_static_type___MMLocalProperty___signature))( self) /*MMLocalProperty::signature*/;
-  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_genericity___MMLocalProperty___recv, 123); nit_exit(1);}
-  variable0 = ((genericity___MMLocalProperty___signature_t)CALL( self,COLOR_static_type___MMLocalProperty___signature))( self) /*MMLocalProperty::signature*/;
-  variable0 = ((static_type___MMSignature___recv_t)CALL(variable0,COLOR_static_type___MMSignature___recv))(variable0) /*MMSignature::recv*/;
-  goto return_label13;
-  return_label13: while(false);
-  tracehead = trace.prev;
-  return variable0;
-}
-void genericity___MMLocalProperty___recv__eq(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalProperty___recv__eq, 127};
-  val_t variable0;
-  val_t variable1;
-  trace.prev = tracehead; tracehead = &trace;
-  variable0 =  param0;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*rec*/ ==  NIT_NULL /*null*/) || (( variable0 /*rec*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*rec*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*rec*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*rec*/,COLOR_kernel___Object_____eqeq))( variable0 /*rec*/,  NIT_NULL /*null*/) /*MMType::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalProperty___recv__eq, 129); nit_exit(1);}
-  variable1 = ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/;
-  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*/) /*MMSignature::==*/)))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalProperty___recv__eq, 131); nit_exit(1);}
-  ATTR_genericity___MMLocalProperty____recv_alone( self) /*MMLocalProperty::_recv_alone*/ =  variable0 /*rec*/;
-  tracehead = trace.prev;
-  return;
-}
-val_t genericity___MMLocalProperty___signature(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalProperty___signature, 135};
-  val_t variable0;
-  val_t variable1;
-  val_t variable2;
-  val_t variable3;
-    val_t variable4;
-  trace.prev = tracehead; tracehead = &trace;
-  variable1 = ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/;
-  variable0 = variable1;
-  variable1 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*sig*/ ==  NIT_NULL /*null*/) || (( variable0 /*sig*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*sig*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*sig*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*sig*/,COLOR_kernel___Object_____eqeq))( variable0 /*sig*/,  NIT_NULL /*null*/) /*MMSignature::==*/)))))));
-  if (UNTAG_Bool(variable1)) { /*if*/
-    variable0 =  variable0 /*sig*/;
-    goto return_label15;
-  }
-  variable1 = TAG_Bool(( self==NIT_NULL) || VAL_ISA( self, COLOR_MMConcreteProperty, ID_MMConcreteProperty)) /*cast MMConcreteProperty*/;
-  if (UNTAG_Bool(variable1)) { /*if*/
-    variable0 =  NIT_NULL /*null*/;
-    goto return_label15;
-  }
-  variable2 = ATTR_abstractmetamodel___MMLocalProperty____super_prop( self) /*MMLocalProperty::_super_prop*/;
-  variable1 = variable2;
-  variable3 = ATTR_abstractmetamodel___MMLocalProperty____concrete_property( self) /*MMLocalProperty::_concrete_property*/;
-  variable2 = variable3;
-  variable3 = TAG_Bool(( variable1 /*sp*/ ==  NIT_NULL /*null*/) || (( variable1 /*sp*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable1 /*sp*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable1 /*sp*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable1 /*sp*/,COLOR_kernel___Object_____eqeq))( variable1 /*sp*/,  NIT_NULL /*null*/) /*MMLocalProperty::==*/)))));
-  if (UNTAG_Bool(variable3)) { /*if*/
-    variable3 = ((genericity___MMLocalProperty___signature_t)CALL( variable2 /*impl*/,COLOR_static_type___MMLocalProperty___signature))( variable2 /*impl*/) /*MMConcreteProperty::signature*/;
-    ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/ = variable3;
-    variable3 = ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/;
-    variable3 = TAG_Bool(!UNTAG_Bool(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*/) /*MMSignature::==*/)))))));
-    if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalProperty___signature, 150); nit_exit(1);}
-  } else { /*if*/
-    variable3 = ((genericity___MMLocalProperty___signature_t)CALL( variable1 /*sp*/,COLOR_static_type___MMLocalProperty___signature))( variable1 /*sp*/) /*MMLocalProperty::signature*/;
-    variable3 = TAG_Bool(!UNTAG_Bool(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*/) /*MMSignature::==*/)))))));
-    if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalProperty___signature, 153); nit_exit(1);}
-    variable3 = ATTR_genericity___MMLocalProperty____recv_alone( self) /*MMLocalProperty::_recv_alone*/;
-    variable3 = TAG_Bool(!UNTAG_Bool(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*/) /*MMType::==*/)))))));
-    if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalProperty___signature, 154); nit_exit(1);}
-    variable3 = ((genericity___MMLocalProperty___signature_t)CALL( variable1 /*sp*/,COLOR_static_type___MMLocalProperty___signature))( variable1 /*sp*/) /*MMLocalProperty::signature*/;
-    variable4 = ATTR_genericity___MMLocalProperty____recv_alone( self) /*MMLocalProperty::_recv_alone*/;
-    variable3 = ((genericity___MMSignature___adaptation_to_t)CALL(variable3,COLOR_genericity___MMSignature___adaptation_to))(variable3, variable4) /*MMSignature::adaptation_to*/;
-    ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/ = variable3;
-  }
-  variable3 = ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/;
-  variable3 = TAG_Bool(!UNTAG_Bool(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*/) /*MMSignature::==*/)))))));
-  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalProperty___signature, 158); nit_exit(1);}
-  variable3 = ATTR_static_type___MMLocalProperty____signature_cache( self) /*MMLocalProperty::_signature_cache*/;
-  variable0 = variable3;
-  goto return_label15;
-  return_label15: while(false);
-  tracehead = trace.prev;
-  return variable0;
-}
-val_t genericity___MMLocalProperty___adapt_property(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalProperty___adapt_property, 163};
-  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::==*/)))))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMLocalProperty___adapt_property, 167); nit_exit(1);}
-  variable2 = ((abstractmetamodel___MMLocalProperty___local_class_t)CALL( self,COLOR_abstractmetamodel___MMLocalProperty___local_class))( self) /*MMLocalProperty::local_class*/;
-  variable2 = ((genericity___MMLocalClass___get_type_t)CALL(variable2,COLOR_static_type___MMLocalClass___get_type))(variable2) /*MMLocalClass::get_type*/;
-  variable1 = variable2;
-  variable2 = TAG_Bool(( variable0 /*t*/ ==  variable1 /*recv*/) || (( variable0 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*t*/, variable1 /*recv*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*t*/,COLOR_kernel___Object_____eqeq))( variable0 /*t*/,  variable1 /*recv*/) /*MMType::==*/)))));
-  if (UNTAG_Bool(variable2)) { /*if*/
-    variable1 =  self;
-    goto return_label16;
-  } else { /*if*/
-    variable2 = ((inheritance___MMLocalProperty___inherit_to_t)CALL( self,COLOR_inheritance___MMLocalProperty___inherit_to))( self,  variable0 /*t*/) /*MMLocalProperty::inherit_to*/;
-    variable1 = variable2;
-    goto return_label16;
-  }
-  return_label16: while(false);
-  tracehead = trace.prev;
-  return variable1;
-}
-void genericity___MMLocalProperty___inherit_from(val_t  self, val_t  param0, val_t  param1) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMLocalProperty___inherit_from, 176};
-  val_t variable0;
-  val_t variable1;
-  trace.prev = tracehead; tracehead = &trace;
-  variable0 =  param0;
-  variable1 =  param1;
-  ((genericity___MMLocalProperty___inherit_from_t)CALL( self,COLOR_SUPER_genericity___MMLocalProperty___inherit_from))( self,  param0,  param1) /*super MMLocalProperty::inherit_from*/;
-  ATTR_genericity___MMLocalProperty____recv_alone( self) /*MMLocalProperty::_recv_alone*/ =  variable1 /*t*/;
-  tracehead = trace.prev;
-  return;
-}
 val_t genericity___MMType___is_generic(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMType___is_generic, 184};
+  struct trace_t trace = {NULL, LOCATE_genericity, 95, LOCATE_genericity___MMType___is_generic};
   trace.prev = tracehead; tracehead = &trace;
-  fprintf(stderr, "Deferred method %s called (%s: %d)\n", "is_generic", LOCATE_genericity___MMLocalProperty___inherit_from, 184);
+  fprintf(stderr, "Deferred method %s called");
+  fprintf(stderr, " in %s (%s:%d)\n", LOCATE_genericity___MMLocalClass___is_generic, LOCATE_genericity, 95);
   nit_exit(1);
   tracehead = trace.prev;
   return NIT_NULL;
 }
 val_t genericity___MMTypeFormal___is_generic(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormal___is_generic, 189};
+  struct trace_t trace = {NULL, LOCATE_genericity, 100, LOCATE_genericity___MMTypeFormal___is_generic};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ATTR_type_formal___MMTypeFormal____bound( self) /*MMTypeFormal::_bound*/;
   variable0 = ((genericity___MMType___is_generic_t)CALL(variable0,COLOR_genericity___MMType___is_generic))(variable0) /*MMType::is_generic*/;
-  goto return_label18;
-  return_label18: while(false);
+  goto return_label11;
+  return_label11: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t genericity___MMTypeSimpleClass___is_generic(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeSimpleClass___is_generic, 193};
+  struct trace_t trace = {NULL, LOCATE_genericity, 104, LOCATE_genericity___MMTypeSimpleClass___is_generic};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  TAG_Bool(false);
-  goto return_label19;
-  return_label19: while(false);
+  goto return_label12;
+  return_label12: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t genericity___MMTypeGeneric___params(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___params, 198};
+  struct trace_t trace = {NULL, LOCATE_genericity, 109, LOCATE_genericity___MMTypeGeneric___params};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_genericity___MMTypeGeneric____params( self) /*MMTypeGeneric::_params*/;
 }
 val_t genericity___MMTypeGeneric___is_generic(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___is_generic, 202};
+  struct trace_t trace = {NULL, LOCATE_genericity, 112, LOCATE_genericity___MMTypeGeneric___is_generic};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  TAG_Bool(true);
-  goto return_label20;
-  return_label20: while(false);
+  goto return_label13;
+  return_label13: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t genericity___MMTypeGeneric___is_supertype(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___is_supertype, 204};
+  struct trace_t trace = {NULL, LOCATE_genericity, 114, LOCATE_genericity___MMTypeGeneric___is_supertype};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -429,27 +258,27 @@ val_t genericity___MMTypeGeneric___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) /*MMTypeGeneric::_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::<=*/;
   if (UNTAG_Bool(variable1)) { /*if*/
-    variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeGeneric::_local_class*/;
+    variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
     variable2 = ((static_type___MMType___upcast_for_t)CALL( variable0 /*t*/,COLOR_static_type___MMType___upcast_for))( variable0 /*t*/, variable2) /*MMType::upcast_for*/;
     variable1 = variable2;
     variable2 = TAG_Bool(( variable1 /*u*/==NIT_NULL) || VAL_ISA( variable1 /*u*/, COLOR_MMTypeGeneric, ID_MMTypeGeneric)) /*cast MMTypeGeneric*/;
     if (UNTAG_Bool(variable2)) { /*if*/
       variable2 = ((genericity___MMTypeGeneric___is_subtype_t)CALL( self,COLOR_genericity___MMTypeGeneric___is_subtype))( self,  variable1 /*u*/) /*MMTypeGeneric::is_subtype*/;
       variable1 = variable2;
-      goto return_label21;
+      goto return_label14;
     }
   }
   variable1 =  TAG_Bool(false);
-  goto return_label21;
-  return_label21: while(false);
+  goto return_label14;
+  return_label14: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t genericity___MMTypeGeneric___upcast_for(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___upcast_for, 215};
+  struct trace_t trace = {NULL, LOCATE_genericity, 125, LOCATE_genericity___MMTypeGeneric___upcast_for};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -457,19 +286,19 @@ val_t genericity___MMTypeGeneric___upcast_for(val_t  self, val_t  param0) {
   variable0 =  param0;
   variable2 = ((genericity___MMTypeGeneric___upcast_for_t)CALL( self,COLOR_SUPER_genericity___MMTypeGeneric___upcast_for))( self,  param0) /*super MMTypeGeneric::upcast_for*/;
   variable1 = variable2;
-  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable1 /*t*/ ==  self) || (( variable1 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable1 /*t*/, self)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))( variable1 /*t*/,  self) /*MMType::==*/)))))));
+  variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable1 /*t*/ ==  self) || (( variable1 /*t*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable1 /*t*/, self)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable1 /*t*/,COLOR_kernel___Object_____eqeq))( variable1 /*t*/,  self) /*Object::==*/)))))));
   if (UNTAG_Bool(variable2)) { /*if*/
     variable2 = ((static_type___MMType___adapt_to_t)CALL( variable1 /*t*/,COLOR_static_type___MMType___adapt_to))( variable1 /*t*/,  self) /*MMType::adapt_to*/;
     variable1 = variable2 /*t=*/;
   }
   variable1 =  variable1 /*t*/;
-  goto return_label22;
-  return_label22: while(false);
+  goto return_label15;
+  return_label15: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t genericity___MMTypeGeneric___for_module(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___for_module, 224};
+  struct trace_t trace = {NULL, LOCATE_genericity, 134, LOCATE_genericity___MMTypeGeneric___for_module};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -479,39 +308,39 @@ val_t genericity___MMTypeGeneric___for_module(val_t  self, val_t  param0) {
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  self;
-  variable2 = ((static_type___MMTypeClass___module_t)CALL( self,COLOR_static_type___MMType___module))( self) /*MMTypeGeneric::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*/
-    variable3 = NEW_array___Array___init(); /*new Array[MMType]*/
+    variable3 = NEW_array___Array___init(); /*new Array[E]*/
     variable2 = variable3;
     variable3 = ATTR_genericity___MMTypeGeneric____params( self) /*MMTypeGeneric::_params*/;
-    variable3 = ((array___AbstractArray___iterator_t)CALL(variable3,COLOR_abstract_collection___Collection___iterator))(variable3) /*Array::iterator*/;
+    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 /*p*/,COLOR_static_type___MMType___for_module))( variable4 /*p*/,  variable0 /*mod*/) /*MMType::for_module*/;
-      ((array___AbstractArray___add_t)CALL( variable2 /*parms*/,COLOR_abstract_collection___SimpleCollection___add))( variable2 /*parms*/, variable5) /*Array::add*/;
-      continue_24: while(0);
+      ((array___AbstractArray___add_t)CALL( variable2 /*parms*/,COLOR_abstract_collection___SimpleCollection___add))( variable2 /*parms*/, variable5) /*AbstractArray::add*/;
+      continue_17: while(0);
       ((array___ArrayIterator___next_t)CALL(variable3,COLOR_abstract_collection___Iterator___next))(variable3) /*ArrayIterator::next*/;
     }
-    break_24: while(0);
-    variable4 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeGeneric::_local_class*/;
+    break_17: while(0);
+    variable4 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
     variable4 = ((abstractmetamodel___MMLocalClass___for_module_t)CALL(variable4,COLOR_abstractmetamodel___MMLocalClass___for_module))(variable4,  variable0 /*mod*/) /*MMLocalClass::for_module*/;
     variable3 = variable4;
     variable4 = ((genericity___MMLocalClass___get_instantiate_type_t)CALL( variable3 /*b*/,COLOR_genericity___MMLocalClass___get_instantiate_type))( variable3 /*b*/,  variable2 /*parms*/) /*MMLocalClass::get_instantiate_type*/;
     variable1 = variable4 /*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_genericity___MMTypeGeneric___for_module, 235); 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_genericity___MMTypeGeneric___for_module, LOCATE_genericity, 145); nit_exit(1);}
   variable1 =  variable1 /*t*/;
-  goto return_label23;
-  return_label23: while(false);
+  goto return_label16;
+  return_label16: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t genericity___MMTypeGeneric___adapt_to(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___adapt_to, 239};
+  struct trace_t trace = {NULL, LOCATE_genericity, 149, LOCATE_genericity___MMTypeGeneric___adapt_to};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -519,31 +348,31 @@ val_t genericity___MMTypeGeneric___adapt_to(val_t  self, val_t  param0) {
     val_t variable4;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
-  variable2 = NEW_array___Array___init(); /*new Array[MMType]*/
+  variable2 = NEW_array___Array___init(); /*new Array[E]*/
   variable1 = variable2;
   variable2 = ATTR_genericity___MMTypeGeneric____params( self) /*MMTypeGeneric::_params*/;
-  variable2 = ((array___AbstractArray___iterator_t)CALL(variable2,COLOR_abstract_collection___Collection___iterator))(variable2) /*Array::iterator*/;
+  variable2 = ((array___AbstractArray___iterator_t)CALL(variable2,COLOR_abstract_collection___Collection___iterator))(variable2) /*AbstractArray::iterator*/;
   while (true) { /*for*/
     variable3 = ((array___ArrayIterator___is_ok_t)CALL(variable2,COLOR_abstract_collection___Iterator___is_ok))(variable2) /*ArrayIterator::is_ok*/;
     if (!UNTAG_Bool(variable3)) break; /*for*/
     variable3 = ((array___ArrayIterator___item_t)CALL(variable2,COLOR_abstract_collection___Iterator___item))(variable2) /*ArrayIterator::item*/;
     variable4 = ((static_type___MMType___adapt_to_t)CALL( variable3 /*i*/,COLOR_static_type___MMType___adapt_to))( variable3 /*i*/,  variable0 /*r*/) /*MMType::adapt_to*/;
-    ((array___AbstractArray___add_t)CALL( variable1 /*rv*/,COLOR_abstract_collection___SimpleCollection___add))( variable1 /*rv*/, variable4) /*Array::add*/;
-    continue_26: while(0);
+    ((array___AbstractArray___add_t)CALL( variable1 /*rv*/,COLOR_abstract_collection___SimpleCollection___add))( variable1 /*rv*/, variable4) /*AbstractArray::add*/;
+    continue_19: while(0);
     ((array___ArrayIterator___next_t)CALL(variable2,COLOR_abstract_collection___Iterator___next))(variable2) /*ArrayIterator::next*/;
   }
-  break_26: while(0);
-  variable3 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeGeneric::_local_class*/;
+  break_19: while(0);
+  variable3 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeClass::_local_class*/;
   variable3 = ((genericity___MMLocalClass___get_instantiate_type_t)CALL(variable3,COLOR_genericity___MMLocalClass___get_instantiate_type))(variable3,  variable1 /*rv*/) /*MMLocalClass::get_instantiate_type*/;
   variable2 = variable3;
   variable1 =  variable2 /*l*/;
-  goto return_label25;
-  return_label25: while(false);
+  goto return_label18;
+  return_label18: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t genericity___MMTypeGeneric___params_equals(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___params_equals, 249};
+  struct trace_t trace = {NULL, LOCATE_genericity, 159, LOCATE_genericity___MMTypeGeneric___params_equals};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -553,16 +382,16 @@ val_t genericity___MMTypeGeneric___params_equals(val_t  self, val_t  param0) {
     val_t variable6;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
-  variable1 = ((array___AbstractArray___length_t)CALL( variable0 /*t*/,COLOR_abstract_collection___Collection___length))( variable0 /*t*/) /*Array::length*/;
+  variable1 = ((array___AbstractArray___length_t)CALL( variable0 /*t*/,COLOR_abstract_collection___Collection___length))( variable0 /*t*/) /*AbstractArray::length*/;
   variable2 = ATTR_genericity___MMTypeGeneric____params( self) /*MMTypeGeneric::_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*/;
   variable1 = TAG_Bool((variable1)!=(variable2));
   if (UNTAG_Bool(variable1)) { /*if*/
     variable1 =  TAG_Bool(false);
-    goto return_label27;
+    goto return_label20;
   }
-  variable1 = ((array___AbstractArray___length_t)CALL( variable0 /*t*/,COLOR_abstract_collection___Collection___length))( variable0 /*t*/) /*Array::length*/;
-  variable2 = NEW_range___Range___without_last( TAG_Int(0), variable1); /*new Range[Int]*/
+  variable1 = ((array___AbstractArray___length_t)CALL( variable0 /*t*/,COLOR_abstract_collection___Collection___length))( variable0 /*t*/) /*AbstractArray::length*/;
+  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*/
@@ -575,124 +404,83 @@ val_t genericity___MMTypeGeneric___params_equals(val_t  self, val_t  param0) {
     variable6 = variable5;
     if (UNTAG_Bool(variable6)) { /* and */
       variable6 = variable3;
-      variable6 = ATTR_array___AbstractArray____length(variable6) /*Array::_length*/;
+      variable6 = ATTR_array___AbstractArray____length(variable6) /*AbstractArray::_length*/;
       variable6 = TAG_Bool(UNTAG_Int( variable4 /*index*/)<UNTAG_Int(variable6));
     }
     variable5 = variable6;
-    if (!UNTAG_Bool(variable5)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+    if (!UNTAG_Bool(variable5)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 229); nit_exit(1);}
     variable5 = variable3;
     variable5 = ATTR_array___Array____items(variable5) /*Array::_items*/;
     variable5 = UNBOX_NativeArray(variable5)[UNTAG_Int( variable4 /*index*/)];
-    goto return_label29;
-    return_label29: while(false);
+    goto return_label22;
+    return_label22: while(false);
     variable3 = variable5;
-    variable3 = TAG_Bool(!UNTAG_Bool(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*/) /*MMType::==*/)))))));
-    if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_array___Array_____bra, 255); nit_exit(1);}
+    variable3 = TAG_Bool(!UNTAG_Bool(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::==*/)))))));
+    if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 165); nit_exit(1);}
     variable3 =  variable2 /*i*/;
     variable4 = TAG_Bool(UNTAG_Int( variable3 /*index*/)>=UNTAG_Int( TAG_Int(0)));
     variable5 = variable4;
     if (UNTAG_Bool(variable5)) { /* and */
-      variable5 = ATTR_array___AbstractArray____length( variable0 /*t*/) /*Array::_length*/;
+      variable5 = ATTR_array___AbstractArray____length( variable0 /*t*/) /*AbstractArray::_length*/;
       variable5 = TAG_Bool(UNTAG_Int( variable3 /*index*/)<UNTAG_Int(variable5));
     }
     variable4 = variable5;
-    if (!UNTAG_Bool(variable4)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+    if (!UNTAG_Bool(variable4)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 229); nit_exit(1);}
     variable4 = ATTR_array___Array____items( variable0 /*t*/) /*Array::_items*/;
     variable4 = UNBOX_NativeArray(variable4)[UNTAG_Int( variable3 /*index*/)];
-    goto return_label30;
-    return_label30: while(false);
+    goto return_label23;
+    return_label23: while(false);
     variable3 = variable4;
-    variable3 = TAG_Bool(!UNTAG_Bool(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*/) /*MMType::==*/)))))));
-    if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_array___Array_____bra, 256); nit_exit(1);}
+    variable3 = TAG_Bool(!UNTAG_Bool(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::==*/)))))));
+    if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 166); nit_exit(1);}
     variable3 = ATTR_genericity___MMTypeGeneric____params( self) /*MMTypeGeneric::_params*/;
     variable4 =  variable2 /*i*/;
     variable5 = TAG_Bool(UNTAG_Int( variable4 /*index*/)>=UNTAG_Int( TAG_Int(0)));
     variable6 = variable5;
     if (UNTAG_Bool(variable6)) { /* and */
       variable6 = variable3;
-      variable6 = ATTR_array___AbstractArray____length(variable6) /*Array::_length*/;
+      variable6 = ATTR_array___AbstractArray____length(variable6) /*AbstractArray::_length*/;
       variable6 = TAG_Bool(UNTAG_Int( variable4 /*index*/)<UNTAG_Int(variable6));
     }
     variable5 = variable6;
-    if (!UNTAG_Bool(variable5)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+    if (!UNTAG_Bool(variable5)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 229); nit_exit(1);}
     variable5 = variable3;
     variable5 = ATTR_array___Array____items(variable5) /*Array::_items*/;
     variable5 = UNBOX_NativeArray(variable5)[UNTAG_Int( variable4 /*index*/)];
-    goto return_label31;
-    return_label31: while(false);
+    goto return_label24;
+    return_label24: while(false);
     variable3 = variable5;
     variable4 =  variable2 /*i*/;
     variable5 = TAG_Bool(UNTAG_Int( variable4 /*index*/)>=UNTAG_Int( TAG_Int(0)));
     variable6 = variable5;
     if (UNTAG_Bool(variable6)) { /* and */
-      variable6 = ATTR_array___AbstractArray____length( variable0 /*t*/) /*Array::_length*/;
+      variable6 = ATTR_array___AbstractArray____length( variable0 /*t*/) /*AbstractArray::_length*/;
       variable6 = TAG_Bool(UNTAG_Int( variable4 /*index*/)<UNTAG_Int(variable6));
     }
     variable5 = variable6;
-    if (!UNTAG_Bool(variable5)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+    if (!UNTAG_Bool(variable5)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 229); nit_exit(1);}
     variable5 = ATTR_array___Array____items( variable0 /*t*/) /*Array::_items*/;
     variable5 = UNBOX_NativeArray(variable5)[UNTAG_Int( variable4 /*index*/)];
-    goto return_label32;
-    return_label32: while(false);
+    goto return_label25;
+    return_label25: while(false);
     variable4 = variable5;
-    variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable3 == variable4) || ((variable3 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable3,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable3,variable4)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable3,COLOR_kernel___Object_____eqeq))(variable3, variable4) /*MMType::==*/)))))));
+    variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool((variable3 == variable4) || ((variable3 != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable3,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable3,variable4)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable3,COLOR_kernel___Object_____eqeq))(variable3, variable4) /*Object::==*/)))))));
     if (UNTAG_Bool(variable3)) { /*if*/
       variable1 =  TAG_Bool(false);
-      goto return_label27;
+      goto return_label20;
     }
-    continue_28: while(0);
+    continue_21: while(0);
     ((abstract_collection___Iterator___next_t)CALL(variable1,COLOR_abstract_collection___Iterator___next))(variable1) /*Iterator::next*/;
   }
-  break_28: while(0);
+  break_21: while(0);
   variable1 =  TAG_Bool(true);
-  goto return_label27;
-  return_label27: while(false);
-  tracehead = trace.prev;
-  return variable1;
-}
-val_t genericity___MMTypeGeneric___select_property(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___select_property, 264};
-  val_t variable0;
-  val_t variable1;
-    val_t variable2;
-      val_t variable3;
-  trace.prev = tracehead; tracehead = &trace;
-  variable0 =  param0;
-  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_label33;
-  }
-  variable1 = ATTR_genericity___MMTypeGeneric____props( self) /*MMTypeGeneric::_props*/;
-  variable1 = ((abstract_collection___Map___has_key_t)CALL(variable1,COLOR_abstract_collection___Map___has_key))(variable1,  variable0 /*g*/) /*Map::has_key*/;
-  if (UNTAG_Bool( TAG_Bool(!UNTAG_Bool(variable1)))) { /*if*/
-    variable1 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeGeneric::_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_genericity___MMTypeGeneric___select_property, 270); nit_exit(1);}
-    variable2 = ATTR_static_type___MMTypeClass____local_class( self) /*MMTypeGeneric::_local_class*/;
-    variable2 = ((inheritance___MMLocalClass_____bra_t)CALL(variable2,COLOR_abstractmetamodel___MMLocalClass_____bra))(variable2,  variable0 /*g*/) /*MMLocalClass::[]*/;
-    variable1 = variable2;
-    variable2 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable1 /*p*/ ==  NIT_NULL /*null*/) || (( variable1 /*p*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable1 /*p*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable1 /*p*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable1 /*p*/,COLOR_kernel___Object_____eqeq))( variable1 /*p*/,  NIT_NULL /*null*/) /*MMLocalProperty::==*/)))))));
-    if (UNTAG_Bool(variable2)) { /*if*/
-      variable3 = ((genericity___MMLocalProperty___adapt_property_t)CALL( variable1 /*p*/,COLOR_genericity___MMLocalProperty___adapt_property))( variable1 /*p*/,  self) /*MMLocalProperty::adapt_property*/;
-      variable2 = variable3;
-      variable3 = ATTR_genericity___MMTypeGeneric____props( self) /*MMTypeGeneric::_props*/;
-      ((abstract_collection___Map_____braeq_t)CALL(variable3,COLOR_abstract_collection___Map_____braeq))(variable3,  variable0 /*g*/,  variable2 /*p2*/) /*Map::[]=*/;
-      variable1 =  variable2 /*p2*/;
-      goto return_label33;
-    } else { /*if*/
-      if (!UNTAG_Bool( TAG_Bool(false))) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMTypeGeneric___select_property, 277); nit_exit(1);}
-    }
-  }
-  variable1 = ATTR_genericity___MMTypeGeneric____props( self) /*MMTypeGeneric::_props*/;
-  variable1 = ((abstract_collection___Map_____bra_t)CALL(variable1,COLOR_abstract_collection___Map_____bra))(variable1,  variable0 /*g*/) /*Map::[]*/;
-  goto return_label33;
-  return_label33: while(false);
+  goto return_label20;
+  return_label20: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t genericity___MMTypeGeneric___to_s(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___to_s, 283};
+  struct trace_t trace = {NULL, LOCATE_genericity, 174, LOCATE_genericity___MMTypeGeneric___to_s};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -717,19 +505,19 @@ val_t genericity___MMTypeGeneric___to_s(val_t  self) {
   ((string___String___append_t)CALL(variable0,COLOR_abstract_collection___IndexedCollection___append))(variable0, variable6) /*String::append*/;
   variable7 = ATTR_genericity___MMTypeGeneric____params( self) /*MMTypeGeneric::_params*/;
   variable8 = NEW_string___String___with_native(BOX_NativeString(", "), TAG_Int(2)); /*new String*/
-  variable7 = ((string___Collection___join_t)CALL(variable7,COLOR_string___Collection___join))(variable7, variable8) /*Array::join*/;
+  variable7 = ((string___Collection___join_t)CALL(variable7,COLOR_string___Collection___join))(variable7, variable8) /*Collection::join*/;
   variable8 = variable7;
   ((string___String___append_t)CALL(variable0,COLOR_abstract_collection___IndexedCollection___append))(variable0, variable8) /*String::append*/;
   variable9 = NEW_string___String___with_native(BOX_NativeString("]"), TAG_Int(1)); /*new String*/
   variable10 = variable9;
   ((string___String___append_t)CALL(variable0,COLOR_abstract_collection___IndexedCollection___append))(variable0, variable10) /*String::append*/;
-  goto return_label34;
-  return_label34: while(false);
+  goto return_label26;
+  return_label26: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t genericity___MMTypeGeneric___is_subtype(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___is_subtype, 288};
+  struct trace_t trace = {NULL, LOCATE_genericity, 179, LOCATE_genericity___MMTypeGeneric___is_subtype};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -741,8 +529,8 @@ val_t genericity___MMTypeGeneric___is_subtype(val_t  self, val_t  param0) {
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 = ATTR_genericity___MMTypeGeneric____params( self) /*MMTypeGeneric::_params*/;
-  variable1 = ((array___AbstractArray___length_t)CALL(variable1,COLOR_abstract_collection___Collection___length))(variable1) /*Array::length*/;
-  variable2 = NEW_range___Range___without_last( TAG_Int(0), variable1); /*new Range[Int]*/
+  variable1 = ((array___AbstractArray___length_t)CALL(variable1,COLOR_abstract_collection___Collection___length))(variable1) /*AbstractArray::length*/;
+  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*/
@@ -755,16 +543,16 @@ val_t genericity___MMTypeGeneric___is_subtype(val_t  self, val_t  param0) {
     variable6 = variable5;
     if (UNTAG_Bool(variable6)) { /* and */
       variable6 = variable3;
-      variable6 = ATTR_array___AbstractArray____length(variable6) /*Array::_length*/;
+      variable6 = ATTR_array___AbstractArray____length(variable6) /*AbstractArray::_length*/;
       variable6 = TAG_Bool(UNTAG_Int( variable4 /*index*/)<UNTAG_Int(variable6));
     }
     variable5 = variable6;
-    if (!UNTAG_Bool(variable5)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+    if (!UNTAG_Bool(variable5)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 229); nit_exit(1);}
     variable5 = variable3;
     variable5 = ATTR_array___Array____items(variable5) /*Array::_items*/;
     variable5 = UNBOX_NativeArray(variable5)[UNTAG_Int( variable4 /*index*/)];
-    goto return_label37;
-    return_label37: while(false);
+    goto return_label29;
+    return_label29: while(false);
     variable3 = variable5;
     variable4 = ATTR_genericity___MMTypeGeneric____params( self) /*MMTypeGeneric::_params*/;
     variable5 =  variable2 /*i*/;
@@ -772,34 +560,34 @@ val_t genericity___MMTypeGeneric___is_subtype(val_t  self, val_t  param0) {
     variable7 = variable6;
     if (UNTAG_Bool(variable7)) { /* and */
       variable7 = variable4;
-      variable7 = ATTR_array___AbstractArray____length(variable7) /*Array::_length*/;
+      variable7 = ATTR_array___AbstractArray____length(variable7) /*AbstractArray::_length*/;
       variable7 = TAG_Bool(UNTAG_Int( variable5 /*index*/)<UNTAG_Int(variable7));
     }
     variable6 = variable7;
-    if (!UNTAG_Bool(variable6)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+    if (!UNTAG_Bool(variable6)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 229); nit_exit(1);}
     variable6 = variable4;
     variable6 = ATTR_array___Array____items(variable6) /*Array::_items*/;
     variable6 = UNBOX_NativeArray(variable6)[UNTAG_Int( variable5 /*index*/)];
-    goto return_label38;
-    return_label38: while(false);
+    goto return_label30;
+    return_label30: while(false);
     variable4 = variable6;
     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_label35;
+      goto return_label27;
     }
-    continue_36: while(0);
+    continue_28: while(0);
     ((abstract_collection___Iterator___next_t)CALL(variable1,COLOR_abstract_collection___Iterator___next))(variable1) /*Iterator::next*/;
   }
-  break_36: while(0);
+  break_28: while(0);
   variable1 =  TAG_Bool(true);
-  goto return_label35;
-  return_label35: while(false);
+  goto return_label27;
+  return_label27: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 void genericity___MMTypeGeneric___init(val_t  self, val_t  param0, val_t  param1, int* init_table) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeGeneric___init, 301};
+  struct trace_t trace = {NULL, LOCATE_genericity, 192, LOCATE_genericity___MMTypeGeneric___init};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
@@ -813,30 +601,30 @@ void genericity___MMTypeGeneric___init(val_t  self, val_t  param0, val_t  param1
   return;
 }
 val_t genericity___MMTypeFormalParameter___def_class(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___def_class, 310};
+  struct trace_t trace = {NULL, LOCATE_genericity, 201, LOCATE_genericity___MMTypeFormalParameter___def_class};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_genericity___MMTypeFormalParameter____def_class( self) /*MMTypeFormalParameter::_def_class*/;
 }
 val_t genericity___MMTypeFormalParameter___position(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___position, 313};
+  struct trace_t trace = {NULL, LOCATE_genericity, 204, LOCATE_genericity___MMTypeFormalParameter___position};
   trace.prev = tracehead; tracehead = &trace;
   tracehead = trace.prev;
   return ATTR_genericity___MMTypeFormalParameter____position( self) /*MMTypeFormalParameter::_position*/;
 }
 val_t genericity___MMTypeFormalParameter___module(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___module, 316};
+  struct trace_t trace = {NULL, LOCATE_genericity, 207, LOCATE_genericity___MMTypeFormalParameter___module};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 = ATTR_genericity___MMTypeFormalParameter____def_class( self) /*MMTypeFormalParameter::_def_class*/;
   variable0 = ((abstractmetamodel___MMLocalClass___module_t)CALL(variable0,COLOR_abstractmetamodel___MMLocalClass___module))(variable0) /*MMLocalClass::module*/;
-  goto return_label40;
-  return_label40: while(false);
+  goto return_label32;
+  return_label32: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t genericity___MMTypeFormalParameter___for_module(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___for_module, 318};
+  struct trace_t trace = {NULL, LOCATE_genericity, 209, LOCATE_genericity___MMTypeFormalParameter___for_module};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -845,7 +633,7 @@ val_t genericity___MMTypeFormalParameter___for_module(val_t  self, val_t  param0
   variable0 =  param0;
   variable1 =  self;
   variable2 = ((genericity___MMTypeFormalParameter___module_t)CALL( self,COLOR_static_type___MMType___module))( self) /*MMTypeFormalParameter::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 = 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_genericity___MMTypeFormalParameter____def_class( self) /*MMTypeFormalParameter::_def_class*/;
     variable2 = ((abstractmetamodel___MMLocalClass___global_t)CALL(variable2,COLOR_abstractmetamodel___MMLocalClass___global))(variable2) /*MMLocalClass::global*/;
@@ -854,41 +642,41 @@ val_t genericity___MMTypeFormalParameter___for_module(val_t  self, val_t  param0
     variable2 = ((genericity___MMLocalClass___get_formal_t)CALL(variable2,COLOR_genericity___MMLocalClass___get_formal))(variable2, variable3) /*MMLocalClass::get_formal*/;
     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_genericity___MMTypeFormalParameter___for_module, 324); 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_genericity___MMTypeFormalParameter___for_module, LOCATE_genericity, 215); nit_exit(1);}
   variable1 =  variable1 /*t*/;
-  goto return_label41;
-  return_label41: while(false);
+  goto return_label33;
+  return_label33: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t genericity___MMTypeFormalParameter___upcast_for(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___upcast_for, 328};
+  struct trace_t trace = {NULL, LOCATE_genericity, 219, LOCATE_genericity___MMTypeFormalParameter___upcast_for};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  self;
-  goto return_label42;
-  return_label42: while(false);
+  goto return_label34;
+  return_label34: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 void genericity___MMTypeFormalParameter___bound__eq(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___bound__eq, 330};
+  struct trace_t trace = {NULL, LOCATE_genericity, 221, LOCATE_genericity___MMTypeFormalParameter___bound__eq};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
-  variable1 = ATTR_type_formal___MMTypeFormal____bound( self) /*MMTypeFormalParameter::_bound*/;
-  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::==*/)))));
-  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMTypeFormalParameter___bound__eq, 332); nit_exit(1);}
-  ATTR_type_formal___MMTypeFormal____bound( self) /*MMTypeFormalParameter::_bound*/ =  variable0 /*t*/;
+  variable1 = ATTR_type_formal___MMTypeFormal____bound( self) /*MMTypeFormal::_bound*/;
+  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*/) /*Object::==*/)))));
+  if (!UNTAG_Bool(variable1)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_genericity___MMTypeFormalParameter___bound__eq, LOCATE_genericity, 223); nit_exit(1);}
+  ATTR_type_formal___MMTypeFormal____bound( self) /*MMTypeFormal::_bound*/ =  variable0 /*t*/;
   tracehead = trace.prev;
   return;
 }
 val_t genericity___MMTypeFormalParameter___adapt_to(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___adapt_to, 336};
+  struct trace_t trace = {NULL, LOCATE_genericity, 227, LOCATE_genericity___MMTypeFormalParameter___adapt_to};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -899,11 +687,13 @@ val_t genericity___MMTypeFormalParameter___adapt_to(val_t  self, val_t  param0)
   val_t variable7;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
+  variable1 = ((type_formal___MMType___direct_type_t)CALL( variable0 /*r*/,COLOR_type_formal___MMType___direct_type))( variable0 /*r*/) /*MMType::direct_type*/;
+  variable0 = variable1 /*r=*/;
   variable2 = ((genericity___MMTypeFormalParameter___def_class_t)CALL( self,COLOR_genericity___MMTypeFormalParameter___def_class))( self) /*MMTypeFormalParameter::def_class*/;
   variable2 = ((static_type___MMType___upcast_for_t)CALL( variable0 /*r*/,COLOR_static_type___MMType___upcast_for))( variable0 /*r*/, variable2) /*MMType::upcast_for*/;
   variable1 = variable2;
   variable2 = TAG_Bool(( variable1 /*old_r*/==NIT_NULL) || VAL_ISA( variable1 /*old_r*/, COLOR_MMTypeGeneric, ID_MMTypeGeneric)) /*cast MMTypeGeneric*/;
-  if (!UNTAG_Bool(variable2)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMTypeFormalParameter___adapt_to, 340); nit_exit(1);}
+  if (!UNTAG_Bool(variable2)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_genericity___MMTypeFormalParameter___adapt_to, LOCATE_genericity, 235); nit_exit(1);}
   variable3 = ((genericity___MMTypeGeneric___params_t)CALL( variable1 /*old_r*/,COLOR_genericity___MMTypeGeneric___params))( variable1 /*old_r*/) /*MMTypeGeneric::params*/;
   variable4 = ((genericity___MMTypeFormalParameter___position_t)CALL( self,COLOR_genericity___MMTypeFormalParameter___position))( self) /*MMTypeFormalParameter::position*/;
   variable5 = variable4;
@@ -911,28 +701,28 @@ val_t genericity___MMTypeFormalParameter___adapt_to(val_t  self, val_t  param0)
   variable7 = variable6;
   if (UNTAG_Bool(variable7)) { /* and */
     variable7 = variable3;
-    variable7 = ATTR_array___AbstractArray____length(variable7) /*Array::_length*/;
+    variable7 = ATTR_array___AbstractArray____length(variable7) /*AbstractArray::_length*/;
     variable7 = TAG_Bool(UNTAG_Int( variable5 /*index*/)<UNTAG_Int(variable7));
   }
   variable6 = variable7;
-  if (!UNTAG_Bool(variable6)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", " 'index' ", LOCATE_array___Array_____bra, 229); nit_exit(1);}
+  if (!UNTAG_Bool(variable6)) { fprintf(stderr, "Assert%s failed", " 'index' "); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 229); nit_exit(1);}
   variable6 = variable3;
   variable6 = ATTR_array___Array____items(variable6) /*Array::_items*/;
   variable6 = UNBOX_NativeArray(variable6)[UNTAG_Int( variable5 /*index*/)];
-  goto return_label45;
-  return_label45: while(false);
+  goto return_label37;
+  return_label37: while(false);
   variable3 = variable6;
   variable2 = variable3;
-  variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable2 /*reduct*/ ==  NIT_NULL /*null*/) || (( variable2 /*reduct*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable2 /*reduct*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable2 /*reduct*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable2 /*reduct*/,COLOR_kernel___Object_____eqeq))( variable2 /*reduct*/,  NIT_NULL /*null*/) /*MMType::==*/)))))));
-  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_array___Array_____bra, 342); nit_exit(1);}
+  variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable2 /*reduct*/ ==  NIT_NULL /*null*/) || (( variable2 /*reduct*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable2 /*reduct*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable2 /*reduct*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable2 /*reduct*/,COLOR_kernel___Object_____eqeq))( variable2 /*reduct*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_array___Array_____bra, LOCATE_genericity, 237); nit_exit(1);}
   variable1 =  variable2 /*reduct*/;
-  goto return_label44;
-  return_label44: while(false);
+  goto return_label36;
+  return_label36: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 void genericity___MMTypeFormalParameter___with_bound(val_t  self, val_t  param0, val_t  param1, val_t  param2, val_t  param3, int* init_table) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___with_bound, 346};
+  struct trace_t trace = {NULL, LOCATE_genericity, 241, LOCATE_genericity___MMTypeFormalParameter___with_bound};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -944,13 +734,13 @@ void genericity___MMTypeFormalParameter___with_bound(val_t  self, val_t  param0,
   variable3 =  param3;
   if (init_table[VAL2OBJ( self)->vft[INIT_TABLE_POS_MMTypeFormalParameter].i]) return;
   ((genericity___MMTypeFormalParameter___init_t)CALL( self,COLOR_genericity___MMTypeFormalParameter___init))( self,  variable0 /*n*/,  variable1 /*p*/,  variable2 /*intro*/, init_table /*YYY*/) /*MMTypeFormalParameter::init*/;
-  ATTR_type_formal___MMTypeFormal____bound( self) /*MMTypeFormalParameter::_bound*/ =  variable3 /*b*/;
+  ATTR_type_formal___MMTypeFormal____bound( self) /*MMTypeFormal::_bound*/ =  variable3 /*b*/;
   init_table[VAL2OBJ( self)->vft[INIT_TABLE_POS_MMTypeFormalParameter].i] = 1;
   tracehead = trace.prev;
   return;
 }
 void genericity___MMTypeFormalParameter___init(val_t  self, val_t  param0, val_t  param1, val_t  param2, int* init_table) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeFormalParameter___init, 352};
+  struct trace_t trace = {NULL, LOCATE_genericity, 247, LOCATE_genericity___MMTypeFormalParameter___init};
   val_t variable0;
   val_t variable1;
   val_t variable2;
@@ -960,9 +750,9 @@ void genericity___MMTypeFormalParameter___init(val_t  self, val_t  param0, val_t
   variable1 =  param1;
   variable2 =  param2;
   if (init_table[VAL2OBJ( self)->vft[INIT_TABLE_POS_MMTypeFormalParameter].i]) return;
-  variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*n*/ ==  NIT_NULL /*null*/) || (( variable0 /*n*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*n*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*n*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*n*/,COLOR_kernel___Object_____eqeq))( variable0 /*n*/,  NIT_NULL /*null*/) /*Symbol::==*/)))))));
-  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed (%s: %d)\n", "", LOCATE_genericity___MMTypeFormalParameter___init, 354); nit_exit(1);}
-  ATTR_type_formal___MMTypeFormal____name( self) /*MMTypeFormalParameter::_name*/ =  variable0 /*n*/;
+  variable3 = TAG_Bool(!UNTAG_Bool(TAG_Bool(( variable0 /*n*/ ==  NIT_NULL /*null*/) || (( variable0 /*n*/ != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL( variable0 /*n*/,COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN( variable0 /*n*/, NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL( variable0 /*n*/,COLOR_kernel___Object_____eqeq))( variable0 /*n*/,  NIT_NULL /*null*/) /*Object::==*/)))))));
+  if (!UNTAG_Bool(variable3)) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_genericity___MMTypeFormalParameter___init, LOCATE_genericity, 249); nit_exit(1);}
+  ATTR_type_formal___MMTypeFormal____name( self) /*MMTypeFormal::_name*/ =  variable0 /*n*/;
   ATTR_genericity___MMTypeFormalParameter____position( self) /*MMTypeFormalParameter::_position*/ =  variable1 /*p*/;
   ATTR_genericity___MMTypeFormalParameter____def_class( self) /*MMTypeFormalParameter::_def_class*/ =  variable2 /*intro*/;
   init_table[VAL2OBJ( self)->vft[INIT_TABLE_POS_MMTypeFormalParameter].i] = 1;
@@ -970,36 +760,36 @@ void genericity___MMTypeFormalParameter___init(val_t  self, val_t  param0, val_t
   return;
 }
 val_t genericity___MMTypeNone___is_generic(val_t  self) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeNone___is_generic, 362};
+  struct trace_t trace = {NULL, LOCATE_genericity, 257, LOCATE_genericity___MMTypeNone___is_generic};
   val_t variable0;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  TAG_Bool(false);
-  goto return_label48;
-  return_label48: while(false);
+  goto return_label40;
+  return_label40: while(false);
   tracehead = trace.prev;
   return variable0;
 }
 val_t genericity___MMTypeNone___for_module(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeNone___for_module, 363};
+  struct trace_t trace = {NULL, LOCATE_genericity, 258, LOCATE_genericity___MMTypeNone___for_module};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  self;
-  goto return_label49;
-  return_label49: while(false);
+  goto return_label41;
+  return_label41: while(false);
   tracehead = trace.prev;
   return variable1;
 }
 val_t genericity___MMTypeNone___adapt_to(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, LOCATE_genericity___MMTypeNone___adapt_to, 364};
+  struct trace_t trace = {NULL, LOCATE_genericity, 259, LOCATE_genericity___MMTypeNone___adapt_to};
   val_t variable0;
   val_t variable1;
   trace.prev = tracehead; tracehead = &trace;
   variable0 =  param0;
   variable1 =  self;
-  goto return_label50;
-  return_label50: while(false);
+  goto return_label42;
+  return_label42: while(false);
   tracehead = trace.prev;
   return variable1;
 }