X-Git-Url: http://nitlanguage.org

diff --git a/c_src/platform.sep.1.c b/c_src/platform.sep.1.c
index 22c1089..f977325 100644
--- a/c_src/platform.sep.1.c
+++ b/c_src/platform.sep.1.c
@@ -59,9 +59,9 @@ val* var27 /* : Array[Object] */;
 long var28 /* : Int */;
 val* var29 /* : NativeArray[Object] */;
 val* var30 /* : String */;
-val* var31 /* : ANodes[AAtArg] */;
-val* var33 /* : ANodes[AAtArg] */;
-val* var_args /* var args: ANodes[AAtArg] */;
+val* var31 /* : ANodes[AExpr] */;
+val* var33 /* : ANodes[AExpr] */;
+val* var_args /* var args: ANodes[AExpr] */;
 long var34 /* : Int */;
 long var35 /* : Int */;
 short int var36 /* : Bool */;
@@ -86,85 +86,87 @@ val* var54 /* : NativeArray[Object] */;
 val* var55 /* : String */;
 short int var56 /* : Bool */;
 val* var57 /* : AModuleName */;
-val* var58 /* : String */;
+val* var59 /* : AModuleName */;
+val* var60 /* : String */;
 val* var_platform_name /* var platform_name: nullable Object */;
-val* var59 /* : nullable Object */;
-val* var60 /* : nullable String */;
-val* var61 /* : null */;
-short int var62 /* : Bool */;
-short int var63 /* : Bool */;
-static val* varonce64;
-val* var65 /* : String */;
-char* var66 /* : NativeString */;
-long var67 /* : Int */;
-val* var68 /* : FlatString */;
-static val* varonce69;
-val* var70 /* : String */;
-char* var71 /* : NativeString */;
-long var72 /* : Int */;
-val* var73 /* : FlatString */;
-val* var74 /* : Array[Object] */;
-long var75 /* : Int */;
-val* var76 /* : NativeArray[Object] */;
-val* var77 /* : String */;
+val* var61 /* : nullable Object */;
+val* var62 /* : nullable String */;
+val* var63 /* : null */;
+short int var64 /* : Bool */;
+short int var65 /* : Bool */;
+static val* varonce66;
+val* var67 /* : String */;
+char* var68 /* : NativeString */;
+long var69 /* : Int */;
+val* var70 /* : FlatString */;
+static val* varonce71;
+val* var72 /* : String */;
+char* var73 /* : NativeString */;
+long var74 /* : Int */;
+val* var75 /* : FlatString */;
+val* var76 /* : Array[Object] */;
+long var77 /* : Int */;
+val* var78 /* : NativeArray[Object] */;
+val* var79 /* : String */;
 val* var_format_error /* var format_error: String */;
-val* var78 /* : nullable ANode */;
 val* var80 /* : nullable ANode */;
-short int var81 /* : Bool */;
-int cltype82;
-int idtype83;
-const char* var_class_name84;
+val* var82 /* : nullable ANode */;
+short int var83 /* : Bool */;
+int cltype84;
+int idtype85;
+const char* var_class_name86;
 val* var_nmodule /* var nmodule: AModule */;
-val* var85 /* : nullable MModule */;
 val* var87 /* : nullable MModule */;
+val* var89 /* : nullable MModule */;
 val* var_mmodule /* var mmodule: nullable MModule */;
-val* var88 /* : ToolContext */;
 val* var90 /* : ToolContext */;
-val* var91 /* : nullable Platform */;
+val* var92 /* : ToolContext */;
+val* var93 /* : nullable Platform */;
 val* var_platform /* var platform: nullable Platform */;
-val* var92 /* : null */;
-short int var93 /* : Bool */;
-short int var94 /* : Bool */;
-val* var95 /* : ToolContext */;
+val* var94 /* : null */;
+short int var95 /* : Bool */;
+short int var96 /* : Bool */;
 val* var97 /* : ToolContext */;
-val* var98 /* : Location */;
-static val* varonce99;
-val* var100 /* : String */;
-char* var101 /* : NativeString */;
-long var102 /* : Int */;
-val* var103 /* : FlatString */;
-static val* varonce104;
-val* var105 /* : String */;
-char* var106 /* : NativeString */;
-long var107 /* : Int */;
-val* var108 /* : FlatString */;
-val* var109 /* : Array[Object] */;
-long var110 /* : Int */;
-val* var111 /* : NativeArray[Object] */;
-val* var112 /* : String */;
-val* var113 /* : nullable Platform */;
+val* var99 /* : ToolContext */;
+val* var100 /* : Location */;
+val* var102 /* : Location */;
+static val* varonce103;
+val* var104 /* : String */;
+char* var105 /* : NativeString */;
+long var106 /* : Int */;
+val* var107 /* : FlatString */;
+static val* varonce108;
+val* var109 /* : String */;
+char* var110 /* : NativeString */;
+long var111 /* : Int */;
+val* var112 /* : FlatString */;
+val* var113 /* : Array[Object] */;
+long var114 /* : Int */;
+val* var115 /* : NativeArray[Object] */;
+val* var116 /* : String */;
+val* var117 /* : nullable Platform */;
 val* var_previous_target_platform /* var previous_target_platform: nullable Platform */;
-short int var114 /* : Bool */;
-val* var115 /* : null */;
-short int var116 /* : Bool */;
-short int var117 /* : Bool */;
-short int var_ /* var : Bool */;
 short int var118 /* : Bool */;
-short int var119 /* : Bool */;
-static val* varonce120;
-val* var121 /* : String */;
-char* var122 /* : NativeString */;
-long var123 /* : Int */;
-val* var124 /* : FlatString */;
-static val* varonce125;
-val* var126 /* : String */;
-char* var127 /* : NativeString */;
-long var128 /* : Int */;
-val* var129 /* : FlatString */;
-val* var130 /* : Array[Object] */;
-long var131 /* : Int */;
-val* var132 /* : NativeArray[Object] */;
-val* var133 /* : String */;
+val* var119 /* : null */;
+short int var120 /* : Bool */;
+short int var121 /* : Bool */;
+short int var_ /* var : Bool */;
+short int var122 /* : Bool */;
+short int var123 /* : Bool */;
+static val* varonce124;
+val* var125 /* : String */;
+char* var126 /* : NativeString */;
+long var127 /* : Int */;
+val* var128 /* : FlatString */;
+static val* varonce129;
+val* var130 /* : String */;
+char* var131 /* : NativeString */;
+long var132 /* : Int */;
+val* var133 /* : FlatString */;
+val* var134 /* : Array[Object] */;
+long var135 /* : Int */;
+val* var136 /* : NativeArray[Object] */;
+val* var137 /* : String */;
 var_nmoduledecl = p0;
 var_nat = p1;
 if (varonce) {
@@ -203,7 +205,7 @@ goto RET_LABEL;
 var13 = self->attrs[COLOR_phase__Phase___toolcontext].val; /* _toolcontext on <self:PlatformPhase> */
 if (unlikely(var13 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _toolcontext");
-PRINT_ERROR(" (%s:%d)\n", "src/phase.nit", 145);
+PRINT_ERROR(" (%s:%d)\n", "phase.nit", 162);
 show_backtrace(1);
 }
 var11 = var13;
@@ -267,7 +269,7 @@ goto RET_LABEL;
 var33 = var_nat->attrs[COLOR_parser_nodes__AAnnotation___n_args].val; /* _n_args on <var_nat:AAnnotation> */
 if (unlikely(var33 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_args");
-PRINT_ERROR(" (%s:%d)\n", "src/parser/parser_nodes.nit", 2426);
+PRINT_ERROR(" (%s:%d)\n", "parser/parser_nodes.nit", 2039);
 show_backtrace(1);
 }
 var31 = var33;
@@ -287,7 +289,7 @@ var38 = 1; /* easy <var35:Int> isa OTHER*/
 if (unlikely(!var38)) {
 var_class_name = type_kernel__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/kernel.nit", 327);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/kernel.nit", 373);
 show_backtrace(1);
 }
 var41 = var34 > var35;
@@ -339,64 +341,73 @@ var56 = parser_nodes__ANodes__is_empty(var_args);
 }
 if (var56){
 {
-var57 = parser_nodes__AModuledecl__n_name(var_nmoduledecl);
+{ /* Inline parser_nodes#AModuledecl#n_name (var_nmoduledecl) on <var_nmoduledecl:ANode(AModuledecl)> */
+var59 = var_nmoduledecl->attrs[COLOR_parser_nodes__AModuledecl___n_name].val; /* _n_name on <var_nmoduledecl:ANode(AModuledecl)> */
+if (unlikely(var59 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_name");
+PRINT_ERROR(" (%s:%d)\n", "parser/parser_nodes.nit", 869);
+show_backtrace(1);
+}
+var57 = var59;
+RET_LABEL58:(void)0;
+}
 }
 {
-var58 = modelize_property__Prod__collect_text(var57);
+var60 = parser_work__Prod__collect_text(var57);
 }
-var_platform_name = var58;
+var_platform_name = var60;
 } else {
 {
-var59 = abstract_collection__SequenceRead__first(var_args);
+var61 = abstract_collection__SequenceRead__first(var_args);
 }
 {
-var60 = annotation__AAtArg__as_string(var59);
+var62 = annotation__AExpr__as_string(var61);
 }
-var_platform_name = var60;
-var61 = NULL;
+var_platform_name = var62;
+var63 = NULL;
 if (var_platform_name == NULL) {
-var62 = 1; /* is null */
+var64 = 1; /* is null */
 } else {
-var62 = 0; /* arg is null but recv is not */
+var64 = 0; /* arg is null but recv is not */
 }
 if (0) {
-var63 = string__FlatString___61d_61d(var_platform_name, var61);
-var62 = var63;
+var65 = string__FlatString___61d_61d(var_platform_name, var63);
+var64 = var65;
 }
-if (var62){
-if (varonce64) {
-var65 = varonce64;
+if (var64){
+if (varonce66) {
+var67 = varonce66;
 } else {
-var66 = "Syntax error: \"";
-var67 = 15;
-var68 = string__NativeString__to_s_with_length(var66, var67);
-var65 = var68;
-varonce64 = var65;
-}
-if (varonce69) {
-var70 = varonce69;
+var68 = "Syntax error: \"";
+var69 = 15;
+var70 = string__NativeString__to_s_with_length(var68, var69);
+var67 = var70;
+varonce66 = var67;
+}
+if (varonce71) {
+var72 = varonce71;
 } else {
-var71 = "\" expects its argument to be the name of the target platform as a String literal.";
-var72 = 81;
-var73 = string__NativeString__to_s_with_length(var71, var72);
-var70 = var73;
-varonce69 = var70;
+var73 = "\" expects its argument to be the name of the target platform as a String literal.";
+var74 = 81;
+var75 = string__NativeString__to_s_with_length(var73, var74);
+var72 = var75;
+varonce71 = var72;
 }
-var74 = NEW_array__Array(&type_array__Arraykernel__Object);
-{ /* var74 = array_instance Array[Object] */
-var75 = 3;
-var76 = NEW_array__NativeArray(var75, &type_array__NativeArraykernel__Object);
-((struct instance_array__NativeArray*)var76)->values[0] = (val*) var65;
-((struct instance_array__NativeArray*)var76)->values[1] = (val*) var_annotation_name;
-((struct instance_array__NativeArray*)var76)->values[2] = (val*) var70;
+var76 = NEW_array__Array(&type_array__Arraykernel__Object);
+{ /* var76 = array_instance Array[Object] */
+var77 = 3;
+var78 = NEW_array__NativeArray(var77, &type_array__NativeArraykernel__Object);
+((struct instance_array__NativeArray*)var78)->values[0] = (val*) var67;
+((struct instance_array__NativeArray*)var78)->values[1] = (val*) var_annotation_name;
+((struct instance_array__NativeArray*)var78)->values[2] = (val*) var72;
 {
-((void (*)(val*, val*, long))(var74->class->vft[COLOR_array__Array__with_native]))(var74, var76, var75) /* with_native on <var74:Array[Object]>*/;
+((void (*)(val*, val*, long))(var76->class->vft[COLOR_array__Array__with_native]))(var76, var78, var77) /* with_native on <var76:Array[Object]>*/;
 }
 }
 {
-var77 = ((val* (*)(val*))(var74->class->vft[COLOR_string__Object__to_s]))(var74) /* to_s on <var74:Array[Object]>*/;
+var79 = ((val* (*)(val*))(var76->class->vft[COLOR_string__Object__to_s]))(var76) /* to_s on <var76:Array[Object]>*/;
 }
-var_format_error = var77;
+var_format_error = var79;
 {
 modelbuilder__ModelBuilder__error(var_modelbuilder, var_nat, var_format_error); /* Direct call modelbuilder#ModelBuilder#error on <var_modelbuilder:ModelBuilder>*/
 }
@@ -407,197 +418,206 @@ goto RET_LABEL;
 }
 {
 { /* Inline parser_nodes#ANode#parent (var_nmoduledecl) on <var_nmoduledecl:ANode(AModuledecl)> */
-var80 = var_nmoduledecl->attrs[COLOR_parser_nodes__ANode___parent].val; /* _parent on <var_nmoduledecl:ANode(AModuledecl)> */
-var78 = var80;
-RET_LABEL79:(void)0;
+var82 = var_nmoduledecl->attrs[COLOR_parser_nodes__ANode___parent].val; /* _parent on <var_nmoduledecl:ANode(AModuledecl)> */
+var80 = var82;
+RET_LABEL81:(void)0;
 }
 }
-/* <var78:nullable ANode> isa AModule */
-cltype82 = type_parser_nodes__AModule.color;
-idtype83 = type_parser_nodes__AModule.id;
-if(var78 == NULL) {
-var81 = 0;
+/* <var80:nullable ANode> isa AModule */
+cltype84 = type_parser_nodes__AModule.color;
+idtype85 = type_parser_nodes__AModule.id;
+if(var80 == NULL) {
+var83 = 0;
 } else {
-if(cltype82 >= var78->type->table_size) {
-var81 = 0;
+if(cltype84 >= var80->type->table_size) {
+var83 = 0;
 } else {
-var81 = var78->type->type_table[cltype82] == idtype83;
+var83 = var80->type->type_table[cltype84] == idtype85;
 }
 }
-if (unlikely(!var81)) {
-var_class_name84 = var78 == NULL ? "null" : var78->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "AModule", var_class_name84);
-PRINT_ERROR(" (%s:%d)\n", "src/platform.nit", 66);
+if (unlikely(!var83)) {
+var_class_name86 = var80 == NULL ? "null" : var80->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "AModule", var_class_name86);
+PRINT_ERROR(" (%s:%d)\n", "platform.nit", 67);
 show_backtrace(1);
 }
-var_nmodule = var78;
+var_nmodule = var80;
 {
 { /* Inline modelbuilder#AModule#mmodule (var_nmodule) on <var_nmodule:AModule> */
-var87 = var_nmodule->attrs[COLOR_modelbuilder__AModule___mmodule].val; /* _mmodule on <var_nmodule:AModule> */
-var85 = var87;
-RET_LABEL86:(void)0;
+var89 = var_nmodule->attrs[COLOR_modelbuilder__AModule___mmodule].val; /* _mmodule on <var_nmodule:AModule> */
+var87 = var89;
+RET_LABEL88:(void)0;
 }
 }
-var_mmodule = var85;
+var_mmodule = var87;
 {
 { /* Inline phase#Phase#toolcontext (self) on <self:PlatformPhase> */
-var90 = self->attrs[COLOR_phase__Phase___toolcontext].val; /* _toolcontext on <self:PlatformPhase> */
-if (unlikely(var90 == NULL)) {
+var92 = self->attrs[COLOR_phase__Phase___toolcontext].val; /* _toolcontext on <self:PlatformPhase> */
+if (unlikely(var92 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _toolcontext");
-PRINT_ERROR(" (%s:%d)\n", "src/phase.nit", 145);
+PRINT_ERROR(" (%s:%d)\n", "phase.nit", 162);
 show_backtrace(1);
 }
-var88 = var90;
-RET_LABEL89:(void)0;
+var90 = var92;
+RET_LABEL91:(void)0;
 }
 }
 {
-var91 = platform__ToolContext__platform_from_name(var88, var_platform_name);
+var93 = platform__ToolContext__platform_from_name(var90, var_platform_name);
 }
-var_platform = var91;
-var92 = NULL;
+var_platform = var93;
+var94 = NULL;
 if (var_platform == NULL) {
-var93 = 1; /* is null */
+var95 = 1; /* is null */
 } else {
-var93 = 0; /* arg is null but recv is not */
+var95 = 0; /* arg is null but recv is not */
 }
 if (0) {
-var94 = ((short int (*)(val*, val*))(var_platform->class->vft[COLOR_kernel__Object___61d_61d]))(var_platform, var92) /* == on <var_platform:nullable Platform>*/;
-var93 = var94;
+var96 = ((short int (*)(val*, val*))(var_platform->class->vft[COLOR_kernel__Object___61d_61d]))(var_platform, var94) /* == on <var_platform:nullable Platform>*/;
+var95 = var96;
 }
-if (var93){
+if (var95){
 {
 { /* Inline phase#Phase#toolcontext (self) on <self:PlatformPhase> */
-var97 = self->attrs[COLOR_phase__Phase___toolcontext].val; /* _toolcontext on <self:PlatformPhase> */
-if (unlikely(var97 == NULL)) {
+var99 = self->attrs[COLOR_phase__Phase___toolcontext].val; /* _toolcontext on <self:PlatformPhase> */
+if (unlikely(var99 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _toolcontext");
-PRINT_ERROR(" (%s:%d)\n", "src/phase.nit", 145);
+PRINT_ERROR(" (%s:%d)\n", "phase.nit", 162);
 show_backtrace(1);
 }
-var95 = var97;
-RET_LABEL96:(void)0;
+var97 = var99;
+RET_LABEL98:(void)0;
 }
 }
 {
-var98 = parser_nodes__ANode__location(var_nat);
+{ /* Inline parser_nodes#ANode#location (var_nat) on <var_nat:AAnnotation> */
+var102 = var_nat->attrs[COLOR_parser_nodes__ANode___location].val; /* _location on <var_nat:AAnnotation> */
+if (unlikely(var102 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _location");
+PRINT_ERROR(" (%s:%d)\n", "parser/parser_nodes.nit", 23);
+show_backtrace(1);
+}
+var100 = var102;
+RET_LABEL101:(void)0;
 }
-if (varonce99) {
-var100 = varonce99;
-} else {
-var101 = "Error: target platform \"";
-var102 = 24;
-var103 = string__NativeString__to_s_with_length(var101, var102);
-var100 = var103;
-varonce99 = var100;
 }
-if (varonce104) {
-var105 = varonce104;
+if (varonce103) {
+var104 = varonce103;
+} else {
+var105 = "Error: target platform \"";
+var106 = 24;
+var107 = string__NativeString__to_s_with_length(var105, var106);
+var104 = var107;
+varonce103 = var104;
+}
+if (varonce108) {
+var109 = varonce108;
 } else {
-var106 = "\" unknown";
-var107 = 9;
-var108 = string__NativeString__to_s_with_length(var106, var107);
-var105 = var108;
-varonce104 = var105;
+var110 = "\" unknown";
+var111 = 9;
+var112 = string__NativeString__to_s_with_length(var110, var111);
+var109 = var112;
+varonce108 = var109;
 }
-var109 = NEW_array__Array(&type_array__Arraykernel__Object);
-{ /* var109 = array_instance Array[Object] */
-var110 = 3;
-var111 = NEW_array__NativeArray(var110, &type_array__NativeArraykernel__Object);
-((struct instance_array__NativeArray*)var111)->values[0] = (val*) var100;
-((struct instance_array__NativeArray*)var111)->values[1] = (val*) var_platform_name;
-((struct instance_array__NativeArray*)var111)->values[2] = (val*) var105;
+var113 = NEW_array__Array(&type_array__Arraykernel__Object);
+{ /* var113 = array_instance Array[Object] */
+var114 = 3;
+var115 = NEW_array__NativeArray(var114, &type_array__NativeArraykernel__Object);
+((struct instance_array__NativeArray*)var115)->values[0] = (val*) var104;
+((struct instance_array__NativeArray*)var115)->values[1] = (val*) var_platform_name;
+((struct instance_array__NativeArray*)var115)->values[2] = (val*) var109;
 {
-((void (*)(val*, val*, long))(var109->class->vft[COLOR_array__Array__with_native]))(var109, var111, var110) /* with_native on <var109:Array[Object]>*/;
+((void (*)(val*, val*, long))(var113->class->vft[COLOR_array__Array__with_native]))(var113, var115, var114) /* with_native on <var113:Array[Object]>*/;
 }
 }
 {
-var112 = ((val* (*)(val*))(var109->class->vft[COLOR_string__Object__to_s]))(var109) /* to_s on <var109:Array[Object]>*/;
+var116 = ((val* (*)(val*))(var113->class->vft[COLOR_string__Object__to_s]))(var113) /* to_s on <var113:Array[Object]>*/;
 }
 {
-toolcontext__ToolContext__error(var95, var98, var112); /* Direct call toolcontext#ToolContext#error on <var95:ToolContext>*/
+toolcontext__ToolContext__error(var97, var100, var116); /* Direct call toolcontext#ToolContext#error on <var97:ToolContext>*/
 }
 goto RET_LABEL;
 } else {
 }
 if (var_mmodule == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", "src/platform.nit", 75);
+PRINT_ERROR(" (%s:%d)\n", "platform.nit", 76);
 show_backtrace(1);
 } else {
-var113 = platform__MModule__target_platform(var_mmodule);
+var117 = platform__MModule__target_platform(var_mmodule);
 }
-var_previous_target_platform = var113;
-var115 = NULL;
+var_previous_target_platform = var117;
+var119 = NULL;
 if (var_previous_target_platform == NULL) {
-var116 = 0; /* is null */
+var120 = 0; /* is null */
 } else {
-var116 = 1; /* arg is null and recv is not */
+var120 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var117 = ((short int (*)(val*, val*))(var_previous_target_platform->class->vft[COLOR_kernel__Object___33d_61d]))(var_previous_target_platform, var115) /* != on <var_previous_target_platform:nullable Platform>*/;
-var116 = var117;
+var121 = ((short int (*)(val*, val*))(var_previous_target_platform->class->vft[COLOR_kernel__Object___33d_61d]))(var_previous_target_platform, var119) /* != on <var_previous_target_platform:nullable Platform>*/;
+var120 = var121;
 }
-var_ = var116;
-if (var116){
+var_ = var120;
+if (var120){
 {
-var119 = ((short int (*)(val*, val*))(var_previous_target_platform->class->vft[COLOR_kernel__Object___33d_61d]))(var_previous_target_platform, var_platform) /* != on <var_previous_target_platform:nullable Platform(Platform)>*/;
-var118 = var119;
+var123 = ((short int (*)(val*, val*))(var_previous_target_platform->class->vft[COLOR_kernel__Object___33d_61d]))(var_previous_target_platform, var_platform) /* != on <var_previous_target_platform:nullable Platform(Platform)>*/;
+var122 = var123;
 }
-var114 = var118;
+var118 = var122;
 } else {
-var114 = var_;
+var118 = var_;
 }
-if (var114){
-if (varonce120) {
-var121 = varonce120;
+if (var118){
+if (varonce124) {
+var125 = varonce124;
 } else {
-var122 = "Syntax error: a target platform has already been defined as \"";
-var123 = 61;
-var124 = string__NativeString__to_s_with_length(var122, var123);
-var121 = var124;
-varonce120 = var121;
-}
-if (varonce125) {
-var126 = varonce125;
+var126 = "Syntax error: a target platform has already been defined as \"";
+var127 = 61;
+var128 = string__NativeString__to_s_with_length(var126, var127);
+var125 = var128;
+varonce124 = var125;
+}
+if (varonce129) {
+var130 = varonce129;
 } else {
-var127 = "\".";
-var128 = 2;
-var129 = string__NativeString__to_s_with_length(var127, var128);
-var126 = var129;
-varonce125 = var126;
+var131 = "\".";
+var132 = 2;
+var133 = string__NativeString__to_s_with_length(var131, var132);
+var130 = var133;
+varonce129 = var130;
 }
-var130 = NEW_array__Array(&type_array__Arraykernel__Object);
-{ /* var130 = array_instance Array[Object] */
-var131 = 3;
-var132 = NEW_array__NativeArray(var131, &type_array__NativeArraykernel__Object);
-((struct instance_array__NativeArray*)var132)->values[0] = (val*) var121;
-((struct instance_array__NativeArray*)var132)->values[1] = (val*) var_previous_target_platform;
-((struct instance_array__NativeArray*)var132)->values[2] = (val*) var126;
+var134 = NEW_array__Array(&type_array__Arraykernel__Object);
+{ /* var134 = array_instance Array[Object] */
+var135 = 3;
+var136 = NEW_array__NativeArray(var135, &type_array__NativeArraykernel__Object);
+((struct instance_array__NativeArray*)var136)->values[0] = (val*) var125;
+((struct instance_array__NativeArray*)var136)->values[1] = (val*) var_previous_target_platform;
+((struct instance_array__NativeArray*)var136)->values[2] = (val*) var130;
 {
-((void (*)(val*, val*, long))(var130->class->vft[COLOR_array__Array__with_native]))(var130, var132, var131) /* with_native on <var130:Array[Object]>*/;
+((void (*)(val*, val*, long))(var134->class->vft[COLOR_array__Array__with_native]))(var134, var136, var135) /* with_native on <var134:Array[Object]>*/;
 }
 }
 {
-var133 = ((val* (*)(val*))(var130->class->vft[COLOR_string__Object__to_s]))(var130) /* to_s on <var130:Array[Object]>*/;
+var137 = ((val* (*)(val*))(var134->class->vft[COLOR_string__Object__to_s]))(var134) /* to_s on <var134:Array[Object]>*/;
 }
 {
-modelbuilder__ModelBuilder__error(var_modelbuilder, var_nat, var133); /* Direct call modelbuilder#ModelBuilder#error on <var_modelbuilder:ModelBuilder>*/
+modelbuilder__ModelBuilder__error(var_modelbuilder, var_nat, var137); /* Direct call modelbuilder#ModelBuilder#error on <var_modelbuilder:ModelBuilder>*/
 }
 } else {
 }
 if (var_mmodule == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", "src/platform.nit", 80);
+PRINT_ERROR(" (%s:%d)\n", "platform.nit", 81);
 show_backtrace(1);
 } else {
 { /* Inline platform#MModule#local_target_platform= (var_mmodule,var_platform) on <var_mmodule:nullable MModule> */
 if (unlikely(var_mmodule == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", "src/platform.nit", 85);
+PRINT_ERROR(" (%s:%d)\n", "platform.nit", 86);
 show_backtrace(1);
 }
 var_mmodule->attrs[COLOR_platform__MModule___local_target_platform].val = var_platform; /* _local_target_platform on <var_mmodule:nullable MModule> */
-RET_LABEL134:(void)0;
+RET_LABEL138:(void)0;
 }
 }
 RET_LABEL:;
@@ -655,16 +675,18 @@ short int var6 /* : Bool */;
 val* var7 /* : POSetElement[MModule] */;
 val* var9 /* : POSetElement[MModule] */;
 val* var10 /* : Collection[Object] */;
+val* var_ /* var : Collection[MModule] */;
 val* var11 /* : Iterator[nullable Object] */;
-short int var12 /* : Bool */;
-val* var13 /* : nullable Object */;
+val* var_12 /* var : Iterator[MModule] */;
+short int var13 /* : Bool */;
+val* var14 /* : nullable Object */;
 val* var_mmodule /* var mmodule: MModule */;
-val* var14 /* : nullable Platform */;
-val* var16 /* : nullable Platform */;
-val* var17 /* : null */;
-short int var18 /* : Bool */;
+val* var15 /* : nullable Platform */;
+val* var17 /* : nullable Platform */;
+val* var18 /* : null */;
 short int var19 /* : Bool */;
-val* var20 /* : null */;
+short int var20 /* : Bool */;
+val* var22 /* : null */;
 {
 { /* Inline platform#MModule#local_target_platform (self) on <self:MModule> */
 var3 = self->attrs[COLOR_platform__MModule___local_target_platform].val; /* _local_target_platform on <self:MModule> */
@@ -693,7 +715,7 @@ goto RET_LABEL;
 var9 = self->attrs[COLOR_mmodule__MModule___in_importation].val; /* _in_importation on <self:MModule> */
 if (unlikely(var9 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _in_importation");
-PRINT_ERROR(" (%s:%d)\n", "src/model/mmodule.nit", 101);
+PRINT_ERROR(" (%s:%d)\n", "model/mmodule.nit", 93);
 show_backtrace(1);
 }
 var7 = var9;
@@ -703,49 +725,58 @@ RET_LABEL8:(void)0;
 {
 var10 = poset__POSetElement__greaters(var7);
 }
+var_ = var10;
 {
-var11 = ((val* (*)(val*))(var10->class->vft[COLOR_abstract_collection__Collection__iterator]))(var10) /* iterator on <var10:Collection[Object](Collection[MModule])>*/;
+var11 = ((val* (*)(val*))(var_->class->vft[COLOR_abstract_collection__Collection__iterator]))(var_) /* iterator on <var_:Collection[MModule]>*/;
 }
+var_12 = var11;
 for(;;) {
 {
-var12 = ((short int (*)(val*))(var11->class->vft[COLOR_abstract_collection__Iterator__is_ok]))(var11) /* is_ok on <var11:Iterator[nullable Object]>*/;
+var13 = ((short int (*)(val*))(var_12->class->vft[COLOR_abstract_collection__Iterator__is_ok]))(var_12) /* is_ok on <var_12:Iterator[MModule]>*/;
 }
-if(!var12) break;
+if (var13){
 {
-var13 = ((val* (*)(val*))(var11->class->vft[COLOR_abstract_collection__Iterator__item]))(var11) /* item on <var11:Iterator[nullable Object]>*/;
+var14 = ((val* (*)(val*))(var_12->class->vft[COLOR_abstract_collection__Iterator__item]))(var_12) /* item on <var_12:Iterator[MModule]>*/;
 }
-var_mmodule = var13;
+var_mmodule = var14;
 {
 { /* Inline platform#MModule#local_target_platform (var_mmodule) on <var_mmodule:MModule> */
-var16 = var_mmodule->attrs[COLOR_platform__MModule___local_target_platform].val; /* _local_target_platform on <var_mmodule:MModule> */
-var14 = var16;
-RET_LABEL15:(void)0;
+var17 = var_mmodule->attrs[COLOR_platform__MModule___local_target_platform].val; /* _local_target_platform on <var_mmodule:MModule> */
+var15 = var17;
+RET_LABEL16:(void)0;
 }
 }
-var_ltp = var14;
-var17 = NULL;
+var_ltp = var15;
+var18 = NULL;
 if (var_ltp == NULL) {
-var18 = 0; /* is null */
+var19 = 0; /* is null */
 } else {
-var18 = 1; /* arg is null and recv is not */
+var19 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var19 = ((short int (*)(val*, val*))(var_ltp->class->vft[COLOR_kernel__Object___33d_61d]))(var_ltp, var17) /* != on <var_ltp:nullable Platform>*/;
-var18 = var19;
+var20 = ((short int (*)(val*, val*))(var_ltp->class->vft[COLOR_kernel__Object___33d_61d]))(var_ltp, var18) /* != on <var_ltp:nullable Platform>*/;
+var19 = var20;
 }
-if (var18){
+if (var19){
 var = var_ltp;
 goto RET_LABEL;
 } else {
 }
-CONTINUE_label: (void)0;
 {
-((void (*)(val*))(var11->class->vft[COLOR_abstract_collection__Iterator__next]))(var11) /* next on <var11:Iterator[nullable Object]>*/;
+((void (*)(val*))(var_12->class->vft[COLOR_abstract_collection__Iterator__next]))(var_12) /* next on <var_12:Iterator[MModule]>*/;
+}
+} else {
+goto BREAK_label;
 }
 }
 BREAK_label: (void)0;
-var20 = NULL;
-var = var20;
+{
+{ /* Inline abstract_collection#Iterator#finish (var_12) on <var_12:Iterator[MModule]> */
+RET_LABEL21:(void)0;
+}
+}
+var22 = NULL;
+var = var22;
 goto RET_LABEL;
 RET_LABEL:;
 return var;