c_src: regenerate

[nit.git] / c_src / nit__parser.sep.6.c

diff --git a/c_src/parser.sep.6.c b/c_src/nit__parser.sep.6.c
similarity index 57%
rename from c_src/parser.sep.6.c
rename to c_src/nit__parser.sep.6.c
index f6cf4f5..0a9e897 100644 (file)
--- a/c_src/parser.sep.6.c
+++ b/c_src/nit__parser.sep.6.c
@@ -1,6 +1,635 @@
-#include "parser.sep.0.h"
+#include "nit__parser.sep.0.h"
+/* method parser#ReduceAction358#action for (self: ReduceAction358, Parser) */
+void nit__parser___nit__parser__ReduceAction358___nit__parser_work__ReduceAction__action(val* self, val* p0) {
+val* var_p /* var p: Parser */;
+val* var /* : null */;
+val* var_node_list /* var node_list: nullable Object */;
+val* var1 /* : nullable Object */;
+val* var_nodearraylist6 /* var nodearraylist6: nullable Object */;
+val* var2 /* : nullable Object */;
+val* var_nodearraylist5 /* var nodearraylist5: nullable Object */;
+val* var3 /* : nullable Object */;
+val* var_nodearraylist4 /* var nodearraylist4: nullable Object */;
+val* var4 /* : nullable Object */;
+val* var_nodearraylist3 /* var nodearraylist3: nullable Object */;
+val* var5 /* : nullable Object */;
+val* var_nodearraylist2 /* var nodearraylist2: nullable Object */;
+val* var6 /* : nullable Object */;
+val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
+val* var_toparnode2 /* var toparnode2: nullable Object */;
+short int var7 /* : Bool */;
+int cltype;
+int idtype;
+val* var_pexprnode3 /* var pexprnode3: nullable Object */;
+short int var8 /* : Bool */;
+int cltype9;
+int idtype10;
+val* var_tcparnode4 /* var tcparnode4: nullable Object */;
+short int var11 /* : Bool */;
+int cltype12;
+int idtype13;
+val* var_pannotationsnode5 /* var pannotationsnode5: nullable Object */;
+short int var14 /* : Bool */;
+int cltype15;
+int idtype16;
+val* var17 /* : AParExpr */;
+val* var_pexprnode1 /* var pexprnode1: nullable AParExpr */;
+long var18 /* : Int */;
+long var19 /* : Int */;
+var_p = p0;
+var = NULL;
+var_node_list = var;
+{
+var1 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist6 = var1;
+{
+var2 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist5 = var2;
+{
+var3 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist4 = var3;
+{
+var4 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist3 = var4;
+{
+var5 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist2 = var5;
+{
+var6 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist1 = var6;
+var_toparnode2 = var_nodearraylist1;
+/* <var_toparnode2:nullable Object> isa nullable TOpar */
+cltype = type_nullable__nit__TOpar.color;
+idtype = type_nullable__nit__TOpar.id;
+if(var_toparnode2 == NULL) {
+var7 = 1;
+} else {
+if(cltype >= var_toparnode2->type->table_size) {
+var7 = 0;
+} else {
+var7 = var_toparnode2->type->type_table[cltype] == idtype;
+}
+}
+if (unlikely(!var7)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9127);
+show_backtrace(1);
+}
+var_pexprnode3 = var_nodearraylist3;
+/* <var_pexprnode3:nullable Object> isa nullable AExpr */
+cltype9 = type_nullable__nit__AExpr.color;
+idtype10 = type_nullable__nit__AExpr.id;
+if(var_pexprnode3 == NULL) {
+var8 = 1;
+} else {
+if(cltype9 >= var_pexprnode3->type->table_size) {
+var8 = 0;
+} else {
+var8 = var_pexprnode3->type->type_table[cltype9] == idtype10;
+}
+}
+if (unlikely(!var8)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9129);
+show_backtrace(1);
+}
+var_tcparnode4 = var_nodearraylist5;
+/* <var_tcparnode4:nullable Object> isa nullable TCpar */
+cltype12 = type_nullable__nit__TCpar.color;
+idtype13 = type_nullable__nit__TCpar.id;
+if(var_tcparnode4 == NULL) {
+var11 = 1;
+} else {
+if(cltype12 >= var_tcparnode4->type->table_size) {
+var11 = 0;
+} else {
+var11 = var_tcparnode4->type->type_table[cltype12] == idtype13;
+}
+}
+if (unlikely(!var11)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9131);
+show_backtrace(1);
+}
+var_pannotationsnode5 = var_nodearraylist6;
+/* <var_pannotationsnode5:nullable Object> isa nullable AAnnotations */
+cltype15 = type_nullable__nit__AAnnotations.color;
+idtype16 = type_nullable__nit__AAnnotations.id;
+if(var_pannotationsnode5 == NULL) {
+var14 = 1;
+} else {
+if(cltype15 >= var_pannotationsnode5->type->table_size) {
+var14 = 0;
+} else {
+var14 = var_pannotationsnode5->type->type_table[cltype15] == idtype16;
+}
+}
+if (unlikely(!var14)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9133);
+show_backtrace(1);
+}
+var17 = NEW_nit__AParExpr(&type_nit__AParExpr);
+{
+nit__parser_prod___AParExpr___init_aparexpr(var17, var_toparnode2, var_pexprnode3, var_tcparnode4, var_pannotationsnode5); /* Direct call parser_prod#AParExpr#init_aparexpr on <var17:AParExpr>*/
+}
+var_pexprnode1 = var17;
+var_node_list = var_pexprnode1;
+var18 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction358> */
+{
+var19 = nit___nit__Parser___go_to(var_p, var18);
+}
+{
+nit___nit__Parser___push(var_p, var19, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+}
+RET_LABEL:;
+}
+/* method parser#ReduceAction360#action for (self: ReduceAction360, Parser) */
+void nit__parser___nit__parser__ReduceAction360___nit__parser_work__ReduceAction__action(val* self, val* p0) {
+val* var_p /* var p: Parser */;
+val* var /* : null */;
+val* var_node_list /* var node_list: nullable Object */;
+val* var1 /* : nullable Object */;
+val* var_nodearraylist2 /* var nodearraylist2: nullable Object */;
+val* var2 /* : nullable Object */;
+val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
+val* var3 /* : Array[Object] */;
+val* var_listnode4 /* var listnode4: Array[Object] */;
+val* var_pexprnode2 /* var pexprnode2: nullable Object */;
+short int var4 /* : Bool */;
+int cltype;
+int idtype;
+val* var_listnode3 /* var listnode3: nullable Object */;
+short int var5 /* : Bool */;
+int cltype6;
+int idtype7;
+val* var8 /* : null */;
+short int var9 /* : Bool */;
+short int var10 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var12 /* : Bool */;
+short int var13 /* : Bool */;
+val* var14 /* : Array[Object] */;
+val* var15 /* : AManyExpr */;
+val* var_pexprnode1 /* var pexprnode1: nullable AManyExpr */;
+long var16 /* : Int */;
+long var17 /* : Int */;
+var_p = p0;
+var = NULL;
+var_node_list = var;
+{
+var1 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist2 = var1;
+{
+var2 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist1 = var2;
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
+{
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
+}
+var_listnode4 = var3;
+var_pexprnode2 = var_nodearraylist1;
+/* <var_pexprnode2:nullable Object> isa nullable AExpr */
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
+if(var_pexprnode2 == NULL) {
+var4 = 1;
+} else {
+if(cltype >= var_pexprnode2->type->table_size) {
+var4 = 0;
+} else {
+var4 = var_pexprnode2->type->type_table[cltype] == idtype;
+}
+}
+if (unlikely(!var4)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9153);
+show_backtrace(1);
+}
+var_listnode3 = var_nodearraylist2;
+/* <var_listnode3:nullable Object> isa Array[Object] */
+cltype6 = type_standard__Array__standard__Object.color;
+idtype7 = type_standard__Array__standard__Object.id;
+if(var_listnode3 == NULL) {
+var5 = 0;
+} else {
+if(cltype6 >= var_listnode3->type->table_size) {
+var5 = 0;
+} else {
+var5 = var_listnode3->type->type_table[cltype6] == idtype7;
+}
+}
+if (unlikely(!var5)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9155);
+show_backtrace(1);
+}
+var8 = NULL;
+if (var_pexprnode2 == NULL) {
+var9 = 0; /* is null */
+} else {
+var9 = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_pexprnode2,var8) on <var_pexprnode2:nullable Object(nullable AExpr)> */
+var_other = var8;
+{
+var12 = ((short int (*)(val* self, val* p0))(var_pexprnode2->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_pexprnode2, var_other) /* == on <var_pexprnode2:nullable AExpr(AExpr)>*/;
+}
+var13 = !var12;
+var10 = var13;
+goto RET_LABEL11;
+RET_LABEL11:(void)0;
+}
+var9 = var10;
+}
+if (var9){
+{
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode4, var_pexprnode2); /* Direct call array#Array#add on <var_listnode4:Array[Object]>*/
+}
+} else {
+}
+{
+var14 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode4, var_listnode3);
+}
+var_listnode4 = var14;
+var15 = NEW_nit__AManyExpr(&type_nit__AManyExpr);
+{
+nit__parser_prod___AManyExpr___init_amanyexpr(var15, var_listnode4); /* Direct call parser_prod#AManyExpr#init_amanyexpr on <var15:AManyExpr>*/
+}
+var_pexprnode1 = var15;
+var_node_list = var_pexprnode1;
+var16 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction360> */
+{
+var17 = nit___nit__Parser___go_to(var_p, var16);
+}
+{
+nit___nit__Parser___push(var_p, var17, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+}
+RET_LABEL:;
+}
+/* method parser#ReduceAction361#action for (self: ReduceAction361, Parser) */
+void nit__parser___nit__parser__ReduceAction361___nit__parser_work__ReduceAction__action(val* self, val* p0) {
+val* var_p /* var p: Parser */;
+val* var /* : null */;
+val* var_node_list /* var node_list: nullable Object */;
+val* var1 /* : nullable Object */;
+val* var_nodearraylist3 /* var nodearraylist3: nullable Object */;
+val* var2 /* : nullable Object */;
+val* var_nodearraylist2 /* var nodearraylist2: nullable Object */;
+val* var3 /* : nullable Object */;
+val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
+val* var_pexprnode1 /* var pexprnode1: nullable Object */;
+long var4 /* : Int */;
+long var5 /* : Int */;
+var_p = p0;
+var = NULL;
+var_node_list = var;
+{
+var1 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist3 = var1;
+{
+var2 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist2 = var2;
+{
+var3 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist1 = var3;
+var_pexprnode1 = var_nodearraylist3;
+var_node_list = var_pexprnode1;
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction361> */
+{
+var5 = nit___nit__Parser___go_to(var_p, var4);
+}
+{
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+}
+RET_LABEL:;
+}
 /* method parser#ReduceAction362#action for (self: ReduceAction362, Parser) */
-void parser__ReduceAction362__action(val* self, val* p0) {
+void nit__parser___nit__parser__ReduceAction362___nit__parser_work__ReduceAction__action(val* self, val* p0) {
+val* var_p /* var p: Parser */;
+val* var /* : null */;
+val* var_node_list /* var node_list: nullable Object */;
+val* var1 /* : nullable Object */;
+val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
+val* var2 /* : Array[Object] */;
+val* var_listnode2 /* var listnode2: Array[Object] */;
+val* var_pexprnode1 /* var pexprnode1: nullable Object */;
+val* var3 /* : null */;
+short int var4 /* : Bool */;
+short int var5 /* : Bool */;
+long var6 /* : Int */;
+long var7 /* : Int */;
+var_p = p0;
+var = NULL;
+var_node_list = var;
+{
+var1 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist1 = var1;
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
+{
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
+}
+var_listnode2 = var2;
+var_pexprnode1 = var_nodearraylist1;
+var3 = NULL;
+if (var_pexprnode1 == NULL) {
+var4 = 0; /* is null */
+} else {
+var4 = 1; /* arg is null and recv is not */
+}
+if (0) {
+var5 = ((short int (*)(val* self, val* p0))(var_pexprnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexprnode1, var3) /* != on <var_pexprnode1:nullable Object>*/;
+var4 = var5;
+}
+if (var4){
+{
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pexprnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+}
+} else {
+}
+var_node_list = var_listnode2;
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction362> */
+{
+var7 = nit___nit__Parser___go_to(var_p, var6);
+}
+{
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+}
+RET_LABEL:;
+}
+/* method parser#ReduceAction363#action for (self: ReduceAction363, Parser) */
+void nit__parser___nit__parser__ReduceAction363___nit__parser_work__ReduceAction__action(val* self, val* p0) {
+val* var_p /* var p: Parser */;
+val* var /* : null */;
+val* var_node_list /* var node_list: nullable Object */;
+val* var1 /* : nullable Object */;
+val* var_nodearraylist2 /* var nodearraylist2: nullable Object */;
+val* var2 /* : nullable Object */;
+val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
+val* var3 /* : Array[Object] */;
+val* var_listnode3 /* var listnode3: Array[Object] */;
+val* var_pexprnode1 /* var pexprnode1: nullable Object */;
+val* var_listnode2 /* var listnode2: nullable Object */;
+short int var4 /* : Bool */;
+int cltype;
+int idtype;
+val* var5 /* : null */;
+short int var6 /* : Bool */;
+short int var7 /* : Bool */;
+val* var8 /* : Array[Object] */;
+long var9 /* : Int */;
+long var10 /* : Int */;
+var_p = p0;
+var = NULL;
+var_node_list = var;
+{
+var1 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist2 = var1;
+{
+var2 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist1 = var2;
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
+{
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
+}
+var_listnode3 = var3;
+var_pexprnode1 = var_nodearraylist1;
+var_listnode2 = var_nodearraylist2;
+/* <var_listnode2:nullable Object> isa Array[Object] */
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
+if(var_listnode2 == NULL) {
+var4 = 0;
+} else {
+if(cltype >= var_listnode2->type->table_size) {
+var4 = 0;
+} else {
+var4 = var_listnode2->type->type_table[cltype] == idtype;
+}
+}
+if (unlikely(!var4)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9205);
+show_backtrace(1);
+}
+var5 = NULL;
+if (var_pexprnode1 == NULL) {
+var6 = 0; /* is null */
+} else {
+var6 = 1; /* arg is null and recv is not */
+}
+if (0) {
+var7 = ((short int (*)(val* self, val* p0))(var_pexprnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexprnode1, var5) /* != on <var_pexprnode1:nullable Object>*/;
+var6 = var7;
+}
+if (var6){
+{
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pexprnode1); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+}
+} else {
+}
+{
+var8 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
+}
+var_listnode3 = var8;
+var_node_list = var_listnode3;
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction363> */
+{
+var10 = nit___nit__Parser___go_to(var_p, var9);
+}
+{
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+}
+RET_LABEL:;
+}
+/* method parser#ReduceAction365#action for (self: ReduceAction365, Parser) */
+void nit__parser___nit__parser__ReduceAction365___nit__parser_work__ReduceAction__action(val* self, val* p0) {
+val* var_p /* var p: Parser */;
+val* var /* : null */;
+val* var_node_list /* var node_list: nullable Object */;
+val* var1 /* : nullable Object */;
+val* var_nodearraylist2 /* var nodearraylist2: nullable Object */;
+val* var2 /* : nullable Object */;
+val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
+val* var_pexprnode1 /* var pexprnode1: nullable Object */;
+long var3 /* : Int */;
+long var4 /* : Int */;
+var_p = p0;
+var = NULL;
+var_node_list = var;
+{
+var1 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist2 = var1;
+{
+var2 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist1 = var2;
+var_pexprnode1 = var_nodearraylist1;
+var_node_list = var_pexprnode1;
+var3 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction365> */
+{
+var4 = nit___nit__Parser___go_to(var_p, var3);
+}
+{
+nit___nit__Parser___push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+}
+RET_LABEL:;
+}
+/* method parser#ReduceAction367#action for (self: ReduceAction367, Parser) */
+void nit__parser___nit__parser__ReduceAction367___nit__parser_work__ReduceAction__action(val* self, val* p0) {
+val* var_p /* var p: Parser */;
+val* var /* : null */;
+val* var_node_list /* var node_list: nullable Object */;
+val* var1 /* : nullable Object */;
+val* var_nodearraylist7 /* var nodearraylist7: nullable Object */;
+val* var2 /* : nullable Object */;
+val* var_nodearraylist6 /* var nodearraylist6: nullable Object */;
+val* var3 /* : nullable Object */;
+val* var_nodearraylist5 /* var nodearraylist5: nullable Object */;
+val* var4 /* : nullable Object */;
+val* var_nodearraylist4 /* var nodearraylist4: nullable Object */;
+val* var5 /* : nullable Object */;
+val* var_nodearraylist3 /* var nodearraylist3: nullable Object */;
+val* var6 /* : nullable Object */;
+val* var_nodearraylist2 /* var nodearraylist2: nullable Object */;
+val* var7 /* : nullable Object */;
+val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
+val* var_tkwifnode2 /* var tkwifnode2: nullable Object */;
+short int var8 /* : Bool */;
+int cltype;
+int idtype;
+val* var_pexprnode3 /* var pexprnode3: nullable Object */;
+short int var9 /* : Bool */;
+int cltype10;
+int idtype11;
+val* var_pexprnode4 /* var pexprnode4: nullable Object */;
+short int var12 /* : Bool */;
+int cltype13;
+int idtype14;
+val* var15 /* : AIfExpr */;
+val* var16 /* : null */;
+val* var_pexprnode1 /* var pexprnode1: nullable AIfExpr */;
+long var17 /* : Int */;
+long var18 /* : Int */;
+var_p = p0;
+var = NULL;
+var_node_list = var;
+{
+var1 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist7 = var1;
+{
+var2 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist6 = var2;
+{
+var3 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist5 = var3;
+{
+var4 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist4 = var4;
+{
+var5 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist3 = var5;
+{
+var6 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist2 = var6;
+{
+var7 = nit___nit__Parser___pop(var_p);
+}
+var_nodearraylist1 = var7;
+var_tkwifnode2 = var_nodearraylist1;
+/* <var_tkwifnode2:nullable Object> isa nullable TKwif */
+cltype = type_nullable__nit__TKwif.color;
+idtype = type_nullable__nit__TKwif.id;
+if(var_tkwifnode2 == NULL) {
+var8 = 1;
+} else {
+if(cltype >= var_tkwifnode2->type->table_size) {
+var8 = 0;
+} else {
+var8 = var_tkwifnode2->type->type_table[cltype] == idtype;
+}
+}
+if (unlikely(!var8)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9239);
+show_backtrace(1);
+}
+var_pexprnode3 = var_nodearraylist3;
+/* <var_pexprnode3:nullable Object> isa nullable AExpr */
+cltype10 = type_nullable__nit__AExpr.color;
+idtype11 = type_nullable__nit__AExpr.id;
+if(var_pexprnode3 == NULL) {
+var9 = 1;
+} else {
+if(cltype10 >= var_pexprnode3->type->table_size) {
+var9 = 0;
+} else {
+var9 = var_pexprnode3->type->type_table[cltype10] == idtype11;
+}
+}
+if (unlikely(!var9)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9241);
+show_backtrace(1);
+}
+var_pexprnode4 = var_nodearraylist7;
+/* <var_pexprnode4:nullable Object> isa nullable AExpr */
+cltype13 = type_nullable__nit__AExpr.color;
+idtype14 = type_nullable__nit__AExpr.id;
+if(var_pexprnode4 == NULL) {
+var12 = 1;
+} else {
+if(cltype13 >= var_pexprnode4->type->table_size) {
+var12 = 0;
+} else {
+var12 = var_pexprnode4->type->type_table[cltype13] == idtype14;
+}
+}
+if (unlikely(!var12)) {
+PRINT_ERROR("Runtime error: %s", "Assert failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9243);
+show_backtrace(1);
+}
+var15 = NEW_nit__AIfExpr(&type_nit__AIfExpr);
+var16 = NULL;
+{
+nit__parser_prod___AIfExpr___init_aifexpr(var15, var_tkwifnode2, var_pexprnode3, var_pexprnode4, var16); /* Direct call parser_prod#AIfExpr#init_aifexpr on <var15:AIfExpr>*/
+}
+var_pexprnode1 = var15;
+var_node_list = var_pexprnode1;
+var17 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction367> */
+{
+var18 = nit___nit__Parser___go_to(var_p, var17);
+}
+{
+nit___nit__Parser___push(var_p, var18, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+}
+RET_LABEL:;
+}
+/* method parser#ReduceAction368#action for (self: ReduceAction368, Parser) */
+void nit__parser___nit__parser__ReduceAction368___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -27,39 +656,38 @@ short int var12 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var14 /* : Bool */;
 short int var15 /* : Bool */;
-short int var16 /* : Bool */;
 val* var_pannotationsnode5 /* var pannotationsnode5: nullable Object */;
-short int var17 /* : Bool */;
-int cltype18;
-int idtype19;
-val* var20 /* : ASuperstringExpr */;
+short int var16 /* : Bool */;
+int cltype17;
+int idtype18;
+val* var19 /* : ASuperstringExpr */;
 val* var_pexprnode1 /* var pexprnode1: nullable ASuperstringExpr */;
+long var20 /* : Int */;
 long var21 /* : Int */;
-long var22 /* : Int */;
 var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
-var4 = NEW_array__Array(&type_array__Arraykernel__Object);
+var4 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var4->class->vft[COLOR_kernel__Object__init]))(var4) /* init on <var4:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var4); /* Direct call array#Array#init on <var4:Array[Object]>*/
 }
 var_listnode4 = var4;
 var_listnode2 = var_nodearraylist1;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var5 = 0;
 } else {
@@ -71,13 +699,13 @@ var5 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9180);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9264);
 show_backtrace(1);
 }
 var_pexprnode3 = var_nodearraylist2;
 /* <var_pexprnode3:nullable Object> isa nullable AExpr */
-cltype7 = type_nullable_parser_nodes__AExpr.color;
-idtype8 = type_nullable_parser_nodes__AExpr.id;
+cltype7 = type_nullable__nit__AExpr.color;
+idtype8 = type_nullable__nit__AExpr.id;
 if(var_pexprnode3 == NULL) {
 var6 = 1;
 } else {
@@ -89,11 +717,11 @@ var6 = var_pexprnode3->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9182);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9266);
 show_backtrace(1);
 }
 {
-var9 = parser_work__ReduceAction__concat(self, var_listnode4, var_listnode2);
+var9 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode4, var_listnode2);
 }
 var_listnode4 = var9;
 var10 = NULL;
@@ -106,11 +734,10 @@ if (0) {
 { /* Inline kernel#Object#!= (var_pexprnode3,var10) on <var_pexprnode3:nullable Object(nullable AExpr)> */
 var_other = var10;
 {
-var15 = ((short int (*)(val*, val*))(var_pexprnode3->class->vft[COLOR_kernel__Object___61d_61d]))(var_pexprnode3, var_other) /* == on <var_pexprnode3:nullable AExpr(AExpr)>*/;
-var14 = var15;
+var14 = ((short int (*)(val* self, val* p0))(var_pexprnode3->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_pexprnode3, var_other) /* == on <var_pexprnode3:nullable AExpr(AExpr)>*/;
 }
-var16 = !var14;
-var12 = var16;
+var15 = !var14;
+var12 = var15;
 goto RET_LABEL13;
 RET_LABEL13:(void)0;
 }
@@ -118,50 +745,45 @@ var11 = var12;
 }
 if (var11){
 {
-array__Array__add(var_listnode4, var_pexprnode3); /* Direct call array#Array#add on <var_listnode4:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode4, var_pexprnode3); /* Direct call array#Array#add on <var_listnode4:Array[Object]>*/
 }
 } else {
 }
 var_pannotationsnode5 = var_nodearraylist3;
 /* <var_pannotationsnode5:nullable Object> isa nullable AAnnotations */
-cltype18 = type_nullable_parser_nodes__AAnnotations.color;
-idtype19 = type_nullable_parser_nodes__AAnnotations.id;
+cltype17 = type_nullable__nit__AAnnotations.color;
+idtype18 = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode5 == NULL) {
-var17 = 1;
+var16 = 1;
 } else {
-if(cltype18 >= var_pannotationsnode5->type->table_size) {
-var17 = 0;
+if(cltype17 >= var_pannotationsnode5->type->table_size) {
+var16 = 0;
 } else {
-var17 = var_pannotationsnode5->type->type_table[cltype18] == idtype19;
+var16 = var_pannotationsnode5->type->type_table[cltype17] == idtype18;
 }
 }
-if (unlikely(!var17)) {
+if (unlikely(!var16)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9188);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9272);
 show_backtrace(1);
 }
-var20 = NEW_parser_nodes__ASuperstringExpr(&type_parser_nodes__ASuperstringExpr);
+var19 = NEW_nit__ASuperstringExpr(&type_nit__ASuperstringExpr);
 {
-parser_prod__ASuperstringExpr__init_asuperstringexpr(var20, var_listnode4, var_pannotationsnode5); /* Direct call parser_prod#ASuperstringExpr#init_asuperstringexpr on <var20:ASuperstringExpr>*/
+nit__parser_prod___ASuperstringExpr___init_asuperstringexpr(var19, var_listnode4, var_pannotationsnode5); /* Direct call parser_prod#ASuperstringExpr#init_asuperstringexpr on <var19:ASuperstringExpr>*/
 }
-var_pexprnode1 = var20;
+var_pexprnode1 = var19;
 var_node_list = var_pexprnode1;
-var21 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction362> */
+var20 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction368> */
 {
-var22 = parser_work__Parser__go_to(var_p, var21);
+var21 = nit___nit__Parser___go_to(var_p, var20);
 }
 {
-parser_work__Parser__push(var_p, var22, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var21, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction362#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction362__action(val* self, val* p0) {
-parser__ReduceAction362__action(self, p0); /* Direct call parser#ReduceAction362#action on <self:Object(ReduceAction362)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction363#action for (self: ReduceAction363, Parser) */
-void parser__ReduceAction363__action(val* self, val* p0) {
+/* method parser#ReduceAction369#action for (self: ReduceAction369, Parser) */
+void nit__parser___nit__parser__ReduceAction369___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -195,43 +817,42 @@ short int var17 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var19 /* : Bool */;
 short int var20 /* : Bool */;
-short int var21 /* : Bool */;
 val* var_pannotationsnode6 /* var pannotationsnode6: nullable Object */;
-short int var22 /* : Bool */;
-int cltype23;
-int idtype24;
-val* var25 /* : ASuperstringExpr */;
+short int var21 /* : Bool */;
+int cltype22;
+int idtype23;
+val* var24 /* : ASuperstringExpr */;
 val* var_pexprnode1 /* var pexprnode1: nullable ASuperstringExpr */;
+long var25 /* : Int */;
 long var26 /* : Int */;
-long var27 /* : Int */;
 var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode5 = var5;
 var_listnode2 = var_nodearraylist1;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var6 = 0;
 } else {
@@ -243,13 +864,13 @@ var6 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9208);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9292);
 show_backtrace(1);
 }
 var_listnode3 = var_nodearraylist2;
 /* <var_listnode3:nullable Object> isa Array[Object] */
-cltype8 = type_array__Arraykernel__Object.color;
-idtype9 = type_array__Arraykernel__Object.id;
+cltype8 = type_standard__Array__standard__Object.color;
+idtype9 = type_standard__Array__standard__Object.id;
 if(var_listnode3 == NULL) {
 var7 = 0;
 } else {
@@ -261,13 +882,13 @@ var7 = var_listnode3->type->type_table[cltype8] == idtype9;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9210);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9294);
 show_backtrace(1);
 }
 var_pexprnode4 = var_nodearraylist3;
 /* <var_pexprnode4:nullable Object> isa nullable AExpr */
-cltype11 = type_nullable_parser_nodes__AExpr.color;
-idtype12 = type_nullable_parser_nodes__AExpr.id;
+cltype11 = type_nullable__nit__AExpr.color;
+idtype12 = type_nullable__nit__AExpr.id;
 if(var_pexprnode4 == NULL) {
 var10 = 1;
 } else {
@@ -279,15 +900,15 @@ var10 = var_pexprnode4->type->type_table[cltype11] == idtype12;
 }
 if (unlikely(!var10)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9212);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9296);
 show_backtrace(1);
 }
 {
-var13 = parser_work__ReduceAction__concat(self, var_listnode5, var_listnode2);
+var13 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode5, var_listnode2);
 }
 var_listnode5 = var13;
 {
-var14 = parser_work__ReduceAction__concat(self, var_listnode5, var_listnode3);
+var14 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode5, var_listnode3);
 }
 var_listnode5 = var14;
 var15 = NULL;
@@ -300,11 +921,10 @@ if (0) {
 { /* Inline kernel#Object#!= (var_pexprnode4,var15) on <var_pexprnode4:nullable Object(nullable AExpr)> */
 var_other = var15;
 {
-var20 = ((short int (*)(val*, val*))(var_pexprnode4->class->vft[COLOR_kernel__Object___61d_61d]))(var_pexprnode4, var_other) /* == on <var_pexprnode4:nullable AExpr(AExpr)>*/;
-var19 = var20;
+var19 = ((short int (*)(val* self, val* p0))(var_pexprnode4->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_pexprnode4, var_other) /* == on <var_pexprnode4:nullable AExpr(AExpr)>*/;
 }
-var21 = !var19;
-var17 = var21;
+var20 = !var19;
+var17 = var20;
 goto RET_LABEL18;
 RET_LABEL18:(void)0;
 }
@@ -312,50 +932,45 @@ var16 = var17;
 }
 if (var16){
 {
-array__Array__add(var_listnode5, var_pexprnode4); /* Direct call array#Array#add on <var_listnode5:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode5, var_pexprnode4); /* Direct call array#Array#add on <var_listnode5:Array[Object]>*/
 }
 } else {
 }
 var_pannotationsnode6 = var_nodearraylist4;
 /* <var_pannotationsnode6:nullable Object> isa nullable AAnnotations */
-cltype23 = type_nullable_parser_nodes__AAnnotations.color;
-idtype24 = type_nullable_parser_nodes__AAnnotations.id;
+cltype22 = type_nullable__nit__AAnnotations.color;
+idtype23 = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode6 == NULL) {
-var22 = 1;
+var21 = 1;
 } else {
-if(cltype23 >= var_pannotationsnode6->type->table_size) {
-var22 = 0;
+if(cltype22 >= var_pannotationsnode6->type->table_size) {
+var21 = 0;
 } else {
-var22 = var_pannotationsnode6->type->type_table[cltype23] == idtype24;
+var21 = var_pannotationsnode6->type->type_table[cltype22] == idtype23;
 }
 }
-if (unlikely(!var22)) {
+if (unlikely(!var21)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9219);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9303);
 show_backtrace(1);
 }
-var25 = NEW_parser_nodes__ASuperstringExpr(&type_parser_nodes__ASuperstringExpr);
+var24 = NEW_nit__ASuperstringExpr(&type_nit__ASuperstringExpr);
 {
-parser_prod__ASuperstringExpr__init_asuperstringexpr(var25, var_listnode5, var_pannotationsnode6); /* Direct call parser_prod#ASuperstringExpr#init_asuperstringexpr on <var25:ASuperstringExpr>*/
+nit__parser_prod___ASuperstringExpr___init_asuperstringexpr(var24, var_listnode5, var_pannotationsnode6); /* Direct call parser_prod#ASuperstringExpr#init_asuperstringexpr on <var24:ASuperstringExpr>*/
 }
-var_pexprnode1 = var25;
+var_pexprnode1 = var24;
 var_node_list = var_pexprnode1;
-var26 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction363> */
+var25 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction369> */
 {
-var27 = parser_work__Parser__go_to(var_p, var26);
+var26 = nit___nit__Parser___go_to(var_p, var25);
 }
 {
-parser_work__Parser__push(var_p, var27, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var26, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction363#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction363__action(val* self, val* p0) {
-parser__ReduceAction363__action(self, p0); /* Direct call parser#ReduceAction363#action on <self:Object(ReduceAction363)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction364#action for (self: ReduceAction364, Parser) */
-void parser__ReduceAction364__action(val* self, val* p0) {
+/* method parser#ReduceAction370#action for (self: ReduceAction370, Parser) */
+void nit__parser___nit__parser__ReduceAction370___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -383,24 +998,24 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode3 = var5;
 var_pexprnode1 = var_nodearraylist1;
@@ -412,12 +1027,12 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pexprnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexprnode1, var6) /* != on <var_pexprnode1:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pexprnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexprnode1, var6) /* != on <var_pexprnode1:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pexprnode1); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pexprnode1); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
@@ -428,32 +1043,27 @@ var10 = 0; /* is null */
 var10 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var11 = ((short int (*)(val*, val*))(var_pexprnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexprnode2, var9) /* != on <var_pexprnode2:nullable Object>*/;
+var11 = ((short int (*)(val* self, val* p0))(var_pexprnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexprnode2, var9) /* != on <var_pexprnode2:nullable Object>*/;
 var10 = var11;
 }
 if (var10){
 {
-array__Array__add(var_listnode3, var_pexprnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pexprnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var12 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction364> */
+var12 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction370> */
 {
-var13 = parser_work__Parser__go_to(var_p, var12);
+var13 = nit___nit__Parser___go_to(var_p, var12);
 }
 {
-parser_work__Parser__push(var_p, var13, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var13, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction364#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction364__action(val* self, val* p0) {
-parser__ReduceAction364__action(self, p0); /* Direct call parser#ReduceAction364#action on <self:Object(ReduceAction364)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction365#action for (self: ReduceAction365, Parser) */
-void parser__ReduceAction365__action(val* self, val* p0) {
+/* method parser#ReduceAction371#action for (self: ReduceAction371, Parser) */
+void nit__parser___nit__parser__ReduceAction371___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -473,16 +1083,16 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode2 = var3;
 var_pexprnode1 = var_nodearraylist1;
@@ -493,32 +1103,27 @@ var5 = 0; /* is null */
 var5 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var6 = ((short int (*)(val*, val*))(var_pexprnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexprnode1, var4) /* != on <var_pexprnode1:nullable Object>*/;
+var6 = ((short int (*)(val* self, val* p0))(var_pexprnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexprnode1, var4) /* != on <var_pexprnode1:nullable Object>*/;
 var5 = var6;
 }
 if (var5){
 {
-array__Array__add(var_listnode2, var_pexprnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pexprnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var7 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction365> */
+var7 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction371> */
 {
-var8 = parser_work__Parser__go_to(var_p, var7);
+var8 = nit___nit__Parser___go_to(var_p, var7);
 }
 {
-parser_work__Parser__push(var_p, var8, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var8, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction365#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction365__action(val* self, val* p0) {
-parser__ReduceAction365__action(self, p0); /* Direct call parser#ReduceAction365#action on <self:Object(ReduceAction365)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction366#action for (self: ReduceAction366, Parser) */
-void parser__ReduceAction366__action(val* self, val* p0) {
+/* method parser#ReduceAction372#action for (self: ReduceAction372, Parser) */
+void nit__parser___nit__parser__ReduceAction372___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -536,13 +1141,13 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_tstartstringnode2 = var_nodearraylist1;
 /* <var_tstartstringnode2:nullable Object> isa nullable TStartString */
-cltype = type_nullable_parser_nodes__TStartString.color;
-idtype = type_nullable_parser_nodes__TStartString.id;
+cltype = type_nullable__nit__TStartString.color;
+idtype = type_nullable__nit__TStartString.id;
 if(var_tstartstringnode2 == NULL) {
 var2 = 1;
 } else {
@@ -554,31 +1159,26 @@ var2 = var_tstartstringnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9273);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9357);
 show_backtrace(1);
 }
-var3 = NEW_parser_nodes__AStartStringExpr(&type_parser_nodes__AStartStringExpr);
+var3 = NEW_nit__AStartStringExpr(&type_nit__AStartStringExpr);
 {
-parser_prod__AStartStringExpr__init_astartstringexpr(var3, var_tstartstringnode2); /* Direct call parser_prod#AStartStringExpr#init_astartstringexpr on <var3:AStartStringExpr>*/
+nit__parser_prod___AStartStringExpr___init_astartstringexpr(var3, var_tstartstringnode2); /* Direct call parser_prod#AStartStringExpr#init_astartstringexpr on <var3:AStartStringExpr>*/
 }
 var_pexprnode1 = var3;
 var_node_list = var_pexprnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction366> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction372> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction366#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction366__action(val* self, val* p0) {
-parser__ReduceAction366__action(self, p0); /* Direct call parser#ReduceAction366#action on <self:Object(ReduceAction366)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction369#action for (self: ReduceAction369, Parser) */
-void parser__ReduceAction369__action(val* self, val* p0) {
+/* method parser#ReduceAction375#action for (self: ReduceAction375, Parser) */
+void nit__parser___nit__parser__ReduceAction375___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -596,13 +1196,13 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_tmidstringnode2 = var_nodearraylist1;
 /* <var_tmidstringnode2:nullable Object> isa nullable TMidString */
-cltype = type_nullable_parser_nodes__TMidString.color;
-idtype = type_nullable_parser_nodes__TMidString.id;
+cltype = type_nullable__nit__TMidString.color;
+idtype = type_nullable__nit__TMidString.id;
 if(var_tmidstringnode2 == NULL) {
 var2 = 1;
 } else {
@@ -614,31 +1214,26 @@ var2 = var_tmidstringnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9288);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9372);
 show_backtrace(1);
 }
-var3 = NEW_parser_nodes__AMidStringExpr(&type_parser_nodes__AMidStringExpr);
+var3 = NEW_nit__AMidStringExpr(&type_nit__AMidStringExpr);
 {
-parser_prod__AMidStringExpr__init_amidstringexpr(var3, var_tmidstringnode2); /* Direct call parser_prod#AMidStringExpr#init_amidstringexpr on <var3:AMidStringExpr>*/
+nit__parser_prod___AMidStringExpr___init_amidstringexpr(var3, var_tmidstringnode2); /* Direct call parser_prod#AMidStringExpr#init_amidstringexpr on <var3:AMidStringExpr>*/
 }
 var_pexprnode1 = var3;
 var_node_list = var_pexprnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction369> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction375> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction369#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction369__action(val* self, val* p0) {
-parser__ReduceAction369__action(self, p0); /* Direct call parser#ReduceAction369#action on <self:Object(ReduceAction369)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction370#action for (self: ReduceAction370, Parser) */
-void parser__ReduceAction370__action(val* self, val* p0) {
+/* method parser#ReduceAction376#action for (self: ReduceAction376, Parser) */
+void nit__parser___nit__parser__ReduceAction376___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -656,13 +1251,13 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_tendstringnode2 = var_nodearraylist1;
 /* <var_tendstringnode2:nullable Object> isa nullable TEndString */
-cltype = type_nullable_parser_nodes__TEndString.color;
-idtype = type_nullable_parser_nodes__TEndString.id;
+cltype = type_nullable__nit__TEndString.color;
+idtype = type_nullable__nit__TEndString.id;
 if(var_tendstringnode2 == NULL) {
 var2 = 1;
 } else {
@@ -674,31 +1269,26 @@ var2 = var_tendstringnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9303);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9387);
 show_backtrace(1);
 }
-var3 = NEW_parser_nodes__AEndStringExpr(&type_parser_nodes__AEndStringExpr);
+var3 = NEW_nit__AEndStringExpr(&type_nit__AEndStringExpr);
 {
-parser_prod__AEndStringExpr__init_aendstringexpr(var3, var_tendstringnode2); /* Direct call parser_prod#AEndStringExpr#init_aendstringexpr on <var3:AEndStringExpr>*/
+nit__parser_prod___AEndStringExpr___init_aendstringexpr(var3, var_tendstringnode2); /* Direct call parser_prod#AEndStringExpr#init_aendstringexpr on <var3:AEndStringExpr>*/
 }
 var_pexprnode1 = var3;
 var_node_list = var_pexprnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction370> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction376> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction370#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction370__action(val* self, val* p0) {
-parser__ReduceAction370__action(self, p0); /* Direct call parser#ReduceAction370#action on <self:Object(ReduceAction370)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction371#action for (self: ReduceAction371, Parser) */
-void parser__ReduceAction371__action(val* self, val* p0) {
+/* method parser#ReduceAction377#action for (self: ReduceAction377, Parser) */
+void nit__parser___nit__parser__ReduceAction377___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -722,33 +1312,32 @@ short int var10 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var12 /* : Bool */;
 short int var13 /* : Bool */;
-short int var14 /* : Bool */;
-val* var15 /* : AAnnotations */;
+val* var14 /* : AAnnotations */;
+val* var15 /* : null */;
 val* var16 /* : null */;
-val* var17 /* : null */;
 val* var_pannotationsnode1 /* var pannotationsnode1: nullable AAnnotations */;
+long var17 /* : Int */;
 long var18 /* : Int */;
-long var19 /* : Int */;
 var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode5 = var3;
 var_tatnode2 = var_nodearraylist1;
 /* <var_tatnode2:nullable Object> isa nullable TAt */
-cltype = type_nullable_parser_nodes__TAt.color;
-idtype = type_nullable_parser_nodes__TAt.id;
+cltype = type_nullable__nit__TAt.color;
+idtype = type_nullable__nit__TAt.id;
 if(var_tatnode2 == NULL) {
 var4 = 1;
 } else {
@@ -760,13 +1349,13 @@ var4 = var_tatnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9320);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9404);
 show_backtrace(1);
 }
 var_pannotationnode4 = var_nodearraylist2;
 /* <var_pannotationnode4:nullable Object> isa nullable AAnnotation */
-cltype6 = type_nullable_parser_nodes__AAnnotation.color;
-idtype7 = type_nullable_parser_nodes__AAnnotation.id;
+cltype6 = type_nullable__nit__AAnnotation.color;
+idtype7 = type_nullable__nit__AAnnotation.id;
 if(var_pannotationnode4 == NULL) {
 var5 = 1;
 } else {
@@ -778,7 +1367,7 @@ var5 = var_pannotationnode4->type->type_table[cltype6] == idtype7;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9322);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9406);
 show_backtrace(1);
 }
 var8 = NULL;
@@ -791,11 +1380,10 @@ if (0) {
 { /* Inline kernel#Object#!= (var_pannotationnode4,var8) on <var_pannotationnode4:nullable Object(nullable AAnnotation)> */
 var_other = var8;
 {
-var13 = ((short int (*)(val*, val*))(var_pannotationnode4->class->vft[COLOR_kernel__Object___61d_61d]))(var_pannotationnode4, var_other) /* == on <var_pannotationnode4:nullable AAnnotation(AAnnotation)>*/;
-var12 = var13;
+var12 = ((short int (*)(val* self, val* p0))(var_pannotationnode4->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_pannotationnode4, var_other) /* == on <var_pannotationnode4:nullable AAnnotation(AAnnotation)>*/;
 }
-var14 = !var12;
-var10 = var14;
+var13 = !var12;
+var10 = var13;
 goto RET_LABEL11;
 RET_LABEL11:(void)0;
 }
@@ -803,34 +1391,29 @@ var9 = var10;
 }
 if (var9){
 {
-array__Array__add(var_listnode5, var_pannotationnode4); /* Direct call array#Array#add on <var_listnode5:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode5, var_pannotationnode4); /* Direct call array#Array#add on <var_listnode5:Array[Object]>*/
 }
 } else {
 }
-var15 = NEW_parser_nodes__AAnnotations(&type_parser_nodes__AAnnotations);
+var14 = NEW_nit__AAnnotations(&type_nit__AAnnotations);
+var15 = NULL;
 var16 = NULL;
-var17 = NULL;
 {
-parser_prod__AAnnotations__init_aannotations(var15, var_tatnode2, var16, var_listnode5, var17); /* Direct call parser_prod#AAnnotations#init_aannotations on <var15:AAnnotations>*/
+nit__parser_prod___AAnnotations___init_aannotations(var14, var_tatnode2, var15, var_listnode5, var16); /* Direct call parser_prod#AAnnotations#init_aannotations on <var14:AAnnotations>*/
 }
-var_pannotationsnode1 = var15;
+var_pannotationsnode1 = var14;
 var_node_list = var_pannotationsnode1;
-var18 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction371> */
+var17 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction377> */
 {
-var19 = parser_work__Parser__go_to(var_p, var18);
+var18 = nit___nit__Parser___go_to(var_p, var17);
 }
 {
-parser_work__Parser__push(var_p, var19, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var18, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction371#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction371__action(val* self, val* p0) {
-parser__ReduceAction371__action(self, p0); /* Direct call parser#ReduceAction371#action on <self:Object(ReduceAction371)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction372#action for (self: ReduceAction372, Parser) */
-void parser__ReduceAction372__action(val* self, val* p0) {
+/* method parser#ReduceAction378#action for (self: ReduceAction378, Parser) */
+void nit__parser___nit__parser__ReduceAction378___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -873,38 +1456,38 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist6 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var5;
 {
-var6 = parser_work__Parser__pop(var_p);
+var6 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var6;
-var7 = NEW_array__Array(&type_array__Arraykernel__Object);
+var7 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var7->class->vft[COLOR_kernel__Object__init]))(var7) /* init on <var7:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var7); /* Direct call array#Array#init on <var7:Array[Object]>*/
 }
 var_listnode5 = var7;
 var_tatnode2 = var_nodearraylist1;
 /* <var_tatnode2:nullable Object> isa nullable TAt */
-cltype = type_nullable_parser_nodes__TAt.color;
-idtype = type_nullable_parser_nodes__TAt.id;
+cltype = type_nullable__nit__TAt.color;
+idtype = type_nullable__nit__TAt.id;
 if(var_tatnode2 == NULL) {
 var8 = 1;
 } else {
@@ -916,13 +1499,13 @@ var8 = var_tatnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var8)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9349);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9433);
 show_backtrace(1);
 }
 var_toparnode3 = var_nodearraylist2;
 /* <var_toparnode3:nullable Object> isa nullable TOpar */
-cltype10 = type_nullable_parser_nodes__TOpar.color;
-idtype11 = type_nullable_parser_nodes__TOpar.id;
+cltype10 = type_nullable__nit__TOpar.color;
+idtype11 = type_nullable__nit__TOpar.id;
 if(var_toparnode3 == NULL) {
 var9 = 1;
 } else {
@@ -934,13 +1517,13 @@ var9 = var_toparnode3->type->type_table[cltype10] == idtype11;
 }
 if (unlikely(!var9)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9351);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9435);
 show_backtrace(1);
 }
 var_listnode4 = var_nodearraylist4;
 /* <var_listnode4:nullable Object> isa Array[Object] */
-cltype13 = type_array__Arraykernel__Object.color;
-idtype14 = type_array__Arraykernel__Object.id;
+cltype13 = type_standard__Array__standard__Object.color;
+idtype14 = type_standard__Array__standard__Object.id;
 if(var_listnode4 == NULL) {
 var12 = 0;
 } else {
@@ -952,17 +1535,17 @@ var12 = var_listnode4->type->type_table[cltype13] == idtype14;
 }
 if (unlikely(!var12)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9353);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9437);
 show_backtrace(1);
 }
 {
-var15 = parser_work__ReduceAction__concat(self, var_listnode5, var_listnode4);
+var15 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode5, var_listnode4);
 }
 var_listnode5 = var15;
 var_tcparnode6 = var_nodearraylist6;
 /* <var_tcparnode6:nullable Object> isa nullable TCpar */
-cltype17 = type_nullable_parser_nodes__TCpar.color;
-idtype18 = type_nullable_parser_nodes__TCpar.id;
+cltype17 = type_nullable__nit__TCpar.color;
+idtype18 = type_nullable__nit__TCpar.id;
 if(var_tcparnode6 == NULL) {
 var16 = 1;
 } else {
@@ -974,31 +1557,26 @@ var16 = var_tcparnode6->type->type_table[cltype17] == idtype18;
 }
 if (unlikely(!var16)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9356);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9440);
 show_backtrace(1);
 }
-var19 = NEW_parser_nodes__AAnnotations(&type_parser_nodes__AAnnotations);
+var19 = NEW_nit__AAnnotations(&type_nit__AAnnotations);
 {
-parser_prod__AAnnotations__init_aannotations(var19, var_tatnode2, var_toparnode3, var_listnode5, var_tcparnode6); /* Direct call parser_prod#AAnnotations#init_aannotations on <var19:AAnnotations>*/
+nit__parser_prod___AAnnotations___init_aannotations(var19, var_tatnode2, var_toparnode3, var_listnode5, var_tcparnode6); /* Direct call parser_prod#AAnnotations#init_aannotations on <var19:AAnnotations>*/
 }
 var_pannotationsnode1 = var19;
 var_node_list = var_pannotationsnode1;
-var20 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction372> */
+var20 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction378> */
 {
-var21 = parser_work__Parser__go_to(var_p, var20);
+var21 = nit___nit__Parser___go_to(var_p, var20);
 }
 {
-parser_work__Parser__push(var_p, var21, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var21, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction372#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction372__action(val* self, val* p0) {
-parser__ReduceAction372__action(self, p0); /* Direct call parser#ReduceAction372#action on <self:Object(ReduceAction372)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction373#action for (self: ReduceAction373, Parser) */
-void parser__ReduceAction373__action(val* self, val* p0) {
+/* method parser#ReduceAction379#action for (self: ReduceAction379, Parser) */
+void nit__parser___nit__parser__ReduceAction379___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1011,27 +1589,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_pannotationsnode1 = var_nodearraylist1;
 var_node_list = var_pannotationsnode1;
-var2 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction373> */
+var2 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction379> */
 {
-var3 = parser_work__Parser__go_to(var_p, var2);
+var3 = nit___nit__Parser___go_to(var_p, var2);
 }
 {
-parser_work__Parser__push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction373#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction373__action(val* self, val* p0) {
-parser__ReduceAction373__action(self, p0); /* Direct call parser#ReduceAction373#action on <self:Object(ReduceAction373)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction375#action for (self: ReduceAction375, Parser) */
-void parser__ReduceAction375__action(val* self, val* p0) {
+/* method parser#ReduceAction381#action for (self: ReduceAction381, Parser) */
+void nit__parser___nit__parser__ReduceAction381___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1072,30 +1645,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode7 = var5;
 var_tkwredefnode3 = var_nodearraylist1;
 /* <var_tkwredefnode3:nullable Object> isa nullable TKwredef */
-cltype = type_nullable_parser_nodes__TKwredef.color;
-idtype = type_nullable_parser_nodes__TKwredef.id;
+cltype = type_nullable__nit__TKwredef.color;
+idtype = type_nullable__nit__TKwredef.id;
 if(var_tkwredefnode3 == NULL) {
 var6 = 1;
 } else {
@@ -1107,13 +1680,13 @@ var6 = var_tkwredefnode3->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9389);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9473);
 show_backtrace(1);
 }
 var_pvisibilitynode4 = var_nodearraylist2;
 /* <var_pvisibilitynode4:nullable Object> isa nullable AVisibility */
-cltype8 = type_nullable_parser_nodes__AVisibility.color;
-idtype9 = type_nullable_parser_nodes__AVisibility.id;
+cltype8 = type_nullable__nit__AVisibility.color;
+idtype9 = type_nullable__nit__AVisibility.id;
 if(var_pvisibilitynode4 == NULL) {
 var7 = 1;
 } else {
@@ -1125,13 +1698,13 @@ var7 = var_pvisibilitynode4->type->type_table[cltype8] == idtype9;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9391);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9475);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist3;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype11 = type_nullable_parser_nodes__AAtid.color;
-idtype12 = type_nullable_parser_nodes__AAtid.id;
+cltype11 = type_nullable__nit__AAtid.color;
+idtype12 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var10 = 1;
 } else {
@@ -1143,13 +1716,13 @@ var10 = var_patidnode5->type->type_table[cltype11] == idtype12;
 }
 if (unlikely(!var10)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9393);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9477);
 show_backtrace(1);
 }
 var_pannotationsnode9 = var_nodearraylist4;
 /* <var_pannotationsnode9:nullable Object> isa nullable AAnnotations */
-cltype14 = type_nullable_parser_nodes__AAnnotations.color;
-idtype15 = type_nullable_parser_nodes__AAnnotations.id;
+cltype14 = type_nullable__nit__AAnnotations.color;
+idtype15 = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode9 == NULL) {
 var13 = 1;
 } else {
@@ -1161,34 +1734,29 @@ var13 = var_pannotationsnode9->type->type_table[cltype14] == idtype15;
 }
 if (unlikely(!var13)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9395);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9479);
 show_backtrace(1);
 }
-var16 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var16 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var17 = NULL;
 var18 = NULL;
 var19 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var16, var17, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var18, var_listnode7, var19, var_pannotationsnode9); /* Direct call parser_prod#AAnnotation#init_aannotation on <var16:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var16, var17, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var18, var_listnode7, var19, var_pannotationsnode9); /* Direct call parser_prod#AAnnotation#init_aannotation on <var16:AAnnotation>*/
 }
 var_pannotationnode1 = var16;
 var_node_list = var_pannotationnode1;
-var20 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction375> */
+var20 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction381> */
 {
-var21 = parser_work__Parser__go_to(var_p, var20);
+var21 = nit___nit__Parser___go_to(var_p, var20);
 }
 {
-parser_work__Parser__push(var_p, var21, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var21, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction375#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction375__action(val* self, val* p0) {
-parser__ReduceAction375__action(self, p0); /* Direct call parser#ReduceAction375#action on <self:Object(ReduceAction375)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction376#action for (self: ReduceAction376, Parser) */
-void parser__ReduceAction376__action(val* self, val* p0) {
+/* method parser#ReduceAction382#action for (self: ReduceAction382, Parser) */
+void nit__parser___nit__parser__ReduceAction382___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1250,50 +1818,50 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist9 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist8 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist7 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist6 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var5;
 {
-var6 = parser_work__Parser__pop(var_p);
+var6 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var6;
 {
-var7 = parser_work__Parser__pop(var_p);
+var7 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var7;
 {
-var8 = parser_work__Parser__pop(var_p);
+var8 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var8;
 {
-var9 = parser_work__Parser__pop(var_p);
+var9 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var9;
-var10 = NEW_array__Array(&type_array__Arraykernel__Object);
+var10 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var10->class->vft[COLOR_kernel__Object__init]))(var10) /* init on <var10:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var10); /* Direct call array#Array#init on <var10:Array[Object]>*/
 }
 var_listnode8 = var10;
 var_tkwredefnode3 = var_nodearraylist1;
 /* <var_tkwredefnode3:nullable Object> isa nullable TKwredef */
-cltype = type_nullable_parser_nodes__TKwredef.color;
-idtype = type_nullable_parser_nodes__TKwredef.id;
+cltype = type_nullable__nit__TKwredef.color;
+idtype = type_nullable__nit__TKwredef.id;
 if(var_tkwredefnode3 == NULL) {
 var11 = 1;
 } else {
@@ -1305,13 +1873,13 @@ var11 = var_tkwredefnode3->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var11)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9426);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9510);
 show_backtrace(1);
 }
 var_pvisibilitynode4 = var_nodearraylist2;
 /* <var_pvisibilitynode4:nullable Object> isa nullable AVisibility */
-cltype13 = type_nullable_parser_nodes__AVisibility.color;
-idtype14 = type_nullable_parser_nodes__AVisibility.id;
+cltype13 = type_nullable__nit__AVisibility.color;
+idtype14 = type_nullable__nit__AVisibility.id;
 if(var_pvisibilitynode4 == NULL) {
 var12 = 1;
 } else {
@@ -1323,13 +1891,13 @@ var12 = var_pvisibilitynode4->type->type_table[cltype13] == idtype14;
 }
 if (unlikely(!var12)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9428);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9512);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist3;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype16 = type_nullable_parser_nodes__AAtid.color;
-idtype17 = type_nullable_parser_nodes__AAtid.id;
+cltype16 = type_nullable__nit__AAtid.color;
+idtype17 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var15 = 1;
 } else {
@@ -1341,13 +1909,13 @@ var15 = var_patidnode5->type->type_table[cltype16] == idtype17;
 }
 if (unlikely(!var15)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9430);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9514);
 show_backtrace(1);
 }
 var_toparnode6 = var_nodearraylist4;
 /* <var_toparnode6:nullable Object> isa nullable TOpar */
-cltype19 = type_nullable_parser_nodes__TOpar.color;
-idtype20 = type_nullable_parser_nodes__TOpar.id;
+cltype19 = type_nullable__nit__TOpar.color;
+idtype20 = type_nullable__nit__TOpar.id;
 if(var_toparnode6 == NULL) {
 var18 = 1;
 } else {
@@ -1359,13 +1927,13 @@ var18 = var_toparnode6->type->type_table[cltype19] == idtype20;
 }
 if (unlikely(!var18)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9432);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9516);
 show_backtrace(1);
 }
 var_listnode7 = var_nodearraylist6;
 /* <var_listnode7:nullable Object> isa Array[Object] */
-cltype22 = type_array__Arraykernel__Object.color;
-idtype23 = type_array__Arraykernel__Object.id;
+cltype22 = type_standard__Array__standard__Object.color;
+idtype23 = type_standard__Array__standard__Object.id;
 if(var_listnode7 == NULL) {
 var21 = 0;
 } else {
@@ -1377,17 +1945,17 @@ var21 = var_listnode7->type->type_table[cltype22] == idtype23;
 }
 if (unlikely(!var21)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9434);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9518);
 show_backtrace(1);
 }
 {
-var24 = parser_work__ReduceAction__concat(self, var_listnode8, var_listnode7);
+var24 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode8, var_listnode7);
 }
 var_listnode8 = var24;
 var_tcparnode9 = var_nodearraylist8;
 /* <var_tcparnode9:nullable Object> isa nullable TCpar */
-cltype26 = type_nullable_parser_nodes__TCpar.color;
-idtype27 = type_nullable_parser_nodes__TCpar.id;
+cltype26 = type_nullable__nit__TCpar.color;
+idtype27 = type_nullable__nit__TCpar.id;
 if(var_tcparnode9 == NULL) {
 var25 = 1;
 } else {
@@ -1399,13 +1967,13 @@ var25 = var_tcparnode9->type->type_table[cltype26] == idtype27;
 }
 if (unlikely(!var25)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9437);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9521);
 show_backtrace(1);
 }
 var_pannotationsnode10 = var_nodearraylist9;
 /* <var_pannotationsnode10:nullable Object> isa nullable AAnnotations */
-cltype29 = type_nullable_parser_nodes__AAnnotations.color;
-idtype30 = type_nullable_parser_nodes__AAnnotations.id;
+cltype29 = type_nullable__nit__AAnnotations.color;
+idtype30 = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode10 == NULL) {
 var28 = 1;
 } else {
@@ -1417,32 +1985,27 @@ var28 = var_pannotationsnode10->type->type_table[cltype29] == idtype30;
 }
 if (unlikely(!var28)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9439);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9523);
 show_backtrace(1);
 }
-var31 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var31 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var32 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var31, var32, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var_pannotationsnode10); /* Direct call parser_prod#AAnnotation#init_aannotation on <var31:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var31, var32, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var_pannotationsnode10); /* Direct call parser_prod#AAnnotation#init_aannotation on <var31:AAnnotation>*/
 }
 var_pannotationnode1 = var31;
 var_node_list = var_pannotationnode1;
-var33 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction376> */
+var33 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction382> */
 {
-var34 = parser_work__Parser__go_to(var_p, var33);
+var34 = nit___nit__Parser___go_to(var_p, var33);
 }
 {
-parser_work__Parser__push(var_p, var34, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var34, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction376#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction376__action(val* self, val* p0) {
-parser__ReduceAction376__action(self, p0); /* Direct call parser#ReduceAction376#action on <self:Object(ReduceAction376)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction377#action for (self: ReduceAction377, Parser) */
-void parser__ReduceAction377__action(val* self, val* p0) {
+/* method parser#ReduceAction383#action for (self: ReduceAction383, Parser) */
+void nit__parser___nit__parser__ReduceAction383___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1466,18 +2029,18 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode5 = var2;
 var_listnode4 = var_nodearraylist1;
 /* <var_listnode4:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode4 == NULL) {
 var3 = 0;
 } else {
@@ -1489,38 +2052,33 @@ var3 = var_listnode4->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9462);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9546);
 show_backtrace(1);
 }
 {
-var4 = parser_work__ReduceAction__concat(self, var_listnode5, var_listnode4);
+var4 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode5, var_listnode4);
 }
 var_listnode5 = var4;
-var5 = NEW_parser_nodes__AAnnotations(&type_parser_nodes__AAnnotations);
+var5 = NEW_nit__AAnnotations(&type_nit__AAnnotations);
 var6 = NULL;
 var7 = NULL;
 var8 = NULL;
 {
-parser_prod__AAnnotations__init_aannotations(var5, var6, var7, var_listnode5, var8); /* Direct call parser_prod#AAnnotations#init_aannotations on <var5:AAnnotations>*/
+nit__parser_prod___AAnnotations___init_aannotations(var5, var6, var7, var_listnode5, var8); /* Direct call parser_prod#AAnnotations#init_aannotations on <var5:AAnnotations>*/
 }
 var_pannotationsnode1 = var5;
 var_node_list = var_pannotationsnode1;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction377> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction383> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction377#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction377__action(val* self, val* p0) {
-parser__ReduceAction377__action(self, p0); /* Direct call parser#ReduceAction377#action on <self:Object(ReduceAction377)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction378#action for (self: ReduceAction378, Parser) */
-void parser__ReduceAction378__action(val* self, val* p0) {
+/* method parser#ReduceAction384#action for (self: ReduceAction384, Parser) */
+void nit__parser___nit__parser__ReduceAction384___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1538,12 +2096,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_pannotationnode1 = var_nodearraylist1;
@@ -1554,32 +2112,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_pannotationnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pannotationnode1, var3) /* != on <var_pannotationnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_pannotationnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pannotationnode1, var3) /* != on <var_pannotationnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_pannotationnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pannotationnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction378> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction384> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction378#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction378__action(val* self, val* p0) {
-parser__ReduceAction378__action(self, p0); /* Direct call parser#ReduceAction378#action on <self:Object(ReduceAction378)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction379#action for (self: ReduceAction379, Parser) */
-void parser__ReduceAction379__action(val* self, val* p0) {
+/* method parser#ReduceAction385#action for (self: ReduceAction385, Parser) */
+void nit__parser___nit__parser__ReduceAction385___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1604,23 +2157,23 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_pannotationnode1 = var_nodearraylist1;
 var_listnode2 = var_nodearraylist2;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var4 = 0;
 } else {
@@ -1632,7 +2185,7 @@ var4 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9499);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9583);
 show_backtrace(1);
 }
 var5 = NULL;
@@ -1642,36 +2195,31 @@ var6 = 0; /* is null */
 var6 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var7 = ((short int (*)(val*, val*))(var_pannotationnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pannotationnode1, var5) /* != on <var_pannotationnode1:nullable Object>*/;
+var7 = ((short int (*)(val* self, val* p0))(var_pannotationnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pannotationnode1, var5) /* != on <var_pannotationnode1:nullable Object>*/;
 var6 = var7;
 }
 if (var6){
 {
-array__Array__add(var_listnode3, var_pannotationnode1); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pannotationnode1); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 {
-var8 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+var8 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
 }
 var_listnode3 = var8;
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction379> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction385> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction379#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction379__action(val* self, val* p0) {
-parser__ReduceAction379__action(self, p0); /* Direct call parser#ReduceAction379#action on <self:Object(ReduceAction379)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction382#action for (self: ReduceAction382, Parser) */
-void parser__ReduceAction382__action(val* self, val* p0) {
+/* method parser#ReduceAction388#action for (self: ReduceAction388, Parser) */
+void nit__parser___nit__parser__ReduceAction388___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1707,43 +2255,42 @@ short int var18 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var20 /* : Bool */;
 short int var21 /* : Bool */;
-short int var22 /* : Bool */;
-val* var23 /* : AAnnotation */;
+val* var22 /* : AAnnotation */;
+val* var23 /* : null */;
 val* var24 /* : null */;
 val* var25 /* : null */;
 val* var26 /* : null */;
-val* var27 /* : null */;
 val* var_pannotationnode1 /* var pannotationnode1: nullable AAnnotation */;
+long var27 /* : Int */;
 long var28 /* : Int */;
-long var29 /* : Int */;
 var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode8 = var5;
 var_tkwredefnode3 = var_nodearraylist1;
 /* <var_tkwredefnode3:nullable Object> isa nullable TKwredef */
-cltype = type_nullable_parser_nodes__TKwredef.color;
-idtype = type_nullable_parser_nodes__TKwredef.id;
+cltype = type_nullable__nit__TKwredef.color;
+idtype = type_nullable__nit__TKwredef.id;
 if(var_tkwredefnode3 == NULL) {
 var6 = 1;
 } else {
@@ -1755,13 +2302,13 @@ var6 = var_tkwredefnode3->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9519);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9603);
 show_backtrace(1);
 }
 var_pvisibilitynode4 = var_nodearraylist2;
 /* <var_pvisibilitynode4:nullable Object> isa nullable AVisibility */
-cltype8 = type_nullable_parser_nodes__AVisibility.color;
-idtype9 = type_nullable_parser_nodes__AVisibility.id;
+cltype8 = type_nullable__nit__AVisibility.color;
+idtype9 = type_nullable__nit__AVisibility.id;
 if(var_pvisibilitynode4 == NULL) {
 var7 = 1;
 } else {
@@ -1773,13 +2320,13 @@ var7 = var_pvisibilitynode4->type->type_table[cltype8] == idtype9;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9521);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9605);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist3;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype11 = type_nullable_parser_nodes__AAtid.color;
-idtype12 = type_nullable_parser_nodes__AAtid.id;
+cltype11 = type_nullable__nit__AAtid.color;
+idtype12 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var10 = 1;
 } else {
@@ -1791,13 +2338,13 @@ var10 = var_patidnode5->type->type_table[cltype11] == idtype12;
 }
 if (unlikely(!var10)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9523);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9607);
 show_backtrace(1);
 }
 var_pexprnode7 = var_nodearraylist4;
 /* <var_pexprnode7:nullable Object> isa nullable AExpr */
-cltype14 = type_nullable_parser_nodes__AExpr.color;
-idtype15 = type_nullable_parser_nodes__AExpr.id;
+cltype14 = type_nullable__nit__AExpr.color;
+idtype15 = type_nullable__nit__AExpr.id;
 if(var_pexprnode7 == NULL) {
 var13 = 1;
 } else {
@@ -1809,7 +2356,7 @@ var13 = var_pexprnode7->type->type_table[cltype14] == idtype15;
 }
 if (unlikely(!var13)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9525);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9609);
 show_backtrace(1);
 }
 var16 = NULL;
@@ -1822,11 +2369,10 @@ if (0) {
 { /* Inline kernel#Object#!= (var_pexprnode7,var16) on <var_pexprnode7:nullable Object(nullable AExpr)> */
 var_other = var16;
 {
-var21 = ((short int (*)(val*, val*))(var_pexprnode7->class->vft[COLOR_kernel__Object___61d_61d]))(var_pexprnode7, var_other) /* == on <var_pexprnode7:nullable AExpr(AExpr)>*/;
-var20 = var21;
+var20 = ((short int (*)(val* self, val* p0))(var_pexprnode7->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_pexprnode7, var_other) /* == on <var_pexprnode7:nullable AExpr(AExpr)>*/;
 }
-var22 = !var20;
-var18 = var22;
+var21 = !var20;
+var18 = var21;
 goto RET_LABEL19;
 RET_LABEL19:(void)0;
 }
@@ -1834,36 +2380,31 @@ var17 = var18;
 }
 if (var17){
 {
-array__Array__add(var_listnode8, var_pexprnode7); /* Direct call array#Array#add on <var_listnode8:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode8, var_pexprnode7); /* Direct call array#Array#add on <var_listnode8:Array[Object]>*/
 }
 } else {
 }
-var23 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var22 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
+var23 = NULL;
 var24 = NULL;
 var25 = NULL;
 var26 = NULL;
-var27 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var23, var24, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var25, var_listnode8, var26, var27); /* Direct call parser_prod#AAnnotation#init_aannotation on <var23:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var22, var23, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var24, var_listnode8, var25, var26); /* Direct call parser_prod#AAnnotation#init_aannotation on <var22:AAnnotation>*/
 }
-var_pannotationnode1 = var23;
+var_pannotationnode1 = var22;
 var_node_list = var_pannotationnode1;
-var28 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction382> */
+var27 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction388> */
 {
-var29 = parser_work__Parser__go_to(var_p, var28);
+var28 = nit___nit__Parser___go_to(var_p, var27);
 }
 {
-parser_work__Parser__push(var_p, var29, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var28, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction382#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction382__action(val* self, val* p0) {
-parser__ReduceAction382__action(self, p0); /* Direct call parser#ReduceAction382#action on <self:Object(ReduceAction382)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction384#action for (self: ReduceAction384, Parser) */
-void parser__ReduceAction384__action(val* self, val* p0) {
+/* method parser#ReduceAction390#action for (self: ReduceAction390, Parser) */
+void nit__parser___nit__parser__ReduceAction390___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1880,35 +2421,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_pannotationnode1 = var_nodearraylist3;
 var_node_list = var_pannotationnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction384> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction390> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction384#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction384__action(val* self, val* p0) {
-parser__ReduceAction384__action(self, p0); /* Direct call parser#ReduceAction384#action on <self:Object(ReduceAction384)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction386#action for (self: ReduceAction386, Parser) */
-void parser__ReduceAction386__action(val* self, val* p0) {
+/* method parser#ReduceAction392#action for (self: ReduceAction392, Parser) */
+void nit__parser___nit__parser__ReduceAction392___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -1951,34 +2487,34 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var5;
-var6 = NEW_array__Array(&type_array__Arraykernel__Object);
+var6 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var6->class->vft[COLOR_kernel__Object__init]))(var6) /* init on <var6:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var6); /* Direct call array#Array#init on <var6:Array[Object]>*/
 }
 var_listnode7 = var6;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var7 = 1;
 } else {
@@ -1990,13 +2526,13 @@ var7 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9568);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9652);
 show_backtrace(1);
 }
 var_tkwredefnode3 = var_nodearraylist2;
 /* <var_tkwredefnode3:nullable Object> isa nullable TKwredef */
-cltype9 = type_nullable_parser_nodes__TKwredef.color;
-idtype10 = type_nullable_parser_nodes__TKwredef.id;
+cltype9 = type_nullable__nit__TKwredef.color;
+idtype10 = type_nullable__nit__TKwredef.id;
 if(var_tkwredefnode3 == NULL) {
 var8 = 1;
 } else {
@@ -2008,13 +2544,13 @@ var8 = var_tkwredefnode3->type->type_table[cltype9] == idtype10;
 }
 if (unlikely(!var8)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9570);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9654);
 show_backtrace(1);
 }
 var_pvisibilitynode4 = var_nodearraylist3;
 /* <var_pvisibilitynode4:nullable Object> isa nullable AVisibility */
-cltype12 = type_nullable_parser_nodes__AVisibility.color;
-idtype13 = type_nullable_parser_nodes__AVisibility.id;
+cltype12 = type_nullable__nit__AVisibility.color;
+idtype13 = type_nullable__nit__AVisibility.id;
 if(var_pvisibilitynode4 == NULL) {
 var11 = 1;
 } else {
@@ -2026,13 +2562,13 @@ var11 = var_pvisibilitynode4->type->type_table[cltype12] == idtype13;
 }
 if (unlikely(!var11)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9572);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9656);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist4;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype15 = type_nullable_parser_nodes__AAtid.color;
-idtype16 = type_nullable_parser_nodes__AAtid.id;
+cltype15 = type_nullable__nit__AAtid.color;
+idtype16 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var14 = 1;
 } else {
@@ -2044,34 +2580,29 @@ var14 = var_patidnode5->type->type_table[cltype15] == idtype16;
 }
 if (unlikely(!var14)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9574);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9658);
 show_backtrace(1);
 }
-var17 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var17 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var18 = NULL;
 var19 = NULL;
 var20 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var17, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var18, var_listnode7, var19, var20); /* Direct call parser_prod#AAnnotation#init_aannotation on <var17:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var17, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var18, var_listnode7, var19, var20); /* Direct call parser_prod#AAnnotation#init_aannotation on <var17:AAnnotation>*/
 }
 var_pannotationnode1 = var17;
 var_node_list = var_pannotationnode1;
-var21 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction386> */
+var21 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction392> */
 {
-var22 = parser_work__Parser__go_to(var_p, var21);
+var22 = nit___nit__Parser___go_to(var_p, var21);
 }
 {
-parser_work__Parser__push(var_p, var22, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var22, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction386#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction386__action(val* self, val* p0) {
-parser__ReduceAction386__action(self, p0); /* Direct call parser#ReduceAction386#action on <self:Object(ReduceAction386)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction387#action for (self: ReduceAction387, Parser) */
-void parser__ReduceAction387__action(val* self, val* p0) {
+/* method parser#ReduceAction393#action for (self: ReduceAction393, Parser) */
+void nit__parser___nit__parser__ReduceAction393___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -2119,38 +2650,38 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist6 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var5;
 {
-var6 = parser_work__Parser__pop(var_p);
+var6 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var6;
-var7 = NEW_array__Array(&type_array__Arraykernel__Object);
+var7 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var7->class->vft[COLOR_kernel__Object__init]))(var7) /* init on <var7:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var7); /* Direct call array#Array#init on <var7:Array[Object]>*/
 }
 var_listnode7 = var7;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var8 = 1;
 } else {
@@ -2162,13 +2693,13 @@ var8 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var8)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9602);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9686);
 show_backtrace(1);
 }
 var_tkwredefnode3 = var_nodearraylist2;
 /* <var_tkwredefnode3:nullable Object> isa nullable TKwredef */
-cltype10 = type_nullable_parser_nodes__TKwredef.color;
-idtype11 = type_nullable_parser_nodes__TKwredef.id;
+cltype10 = type_nullable__nit__TKwredef.color;
+idtype11 = type_nullable__nit__TKwredef.id;
 if(var_tkwredefnode3 == NULL) {
 var9 = 1;
 } else {
@@ -2180,13 +2711,13 @@ var9 = var_tkwredefnode3->type->type_table[cltype10] == idtype11;
 }
 if (unlikely(!var9)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9604);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9688);
 show_backtrace(1);
 }
 var_pvisibilitynode4 = var_nodearraylist3;
 /* <var_pvisibilitynode4:nullable Object> isa nullable AVisibility */
-cltype13 = type_nullable_parser_nodes__AVisibility.color;
-idtype14 = type_nullable_parser_nodes__AVisibility.id;
+cltype13 = type_nullable__nit__AVisibility.color;
+idtype14 = type_nullable__nit__AVisibility.id;
 if(var_pvisibilitynode4 == NULL) {
 var12 = 1;
 } else {
@@ -2198,13 +2729,13 @@ var12 = var_pvisibilitynode4->type->type_table[cltype13] == idtype14;
 }
 if (unlikely(!var12)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9606);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9690);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist4;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype16 = type_nullable_parser_nodes__AAtid.color;
-idtype17 = type_nullable_parser_nodes__AAtid.id;
+cltype16 = type_nullable__nit__AAtid.color;
+idtype17 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var15 = 1;
 } else {
@@ -2216,13 +2747,13 @@ var15 = var_patidnode5->type->type_table[cltype16] == idtype17;
 }
 if (unlikely(!var15)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9608);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9692);
 show_backtrace(1);
 }
 var_pannotationsnode9 = var_nodearraylist5;
 /* <var_pannotationsnode9:nullable Object> isa nullable AAnnotations */
-cltype19 = type_nullable_parser_nodes__AAnnotations.color;
-idtype20 = type_nullable_parser_nodes__AAnnotations.id;
+cltype19 = type_nullable__nit__AAnnotations.color;
+idtype20 = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode9 == NULL) {
 var18 = 1;
 } else {
@@ -2234,33 +2765,28 @@ var18 = var_pannotationsnode9->type->type_table[cltype19] == idtype20;
 }
 if (unlikely(!var18)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9610);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9694);
 show_backtrace(1);
 }
-var21 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var21 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var22 = NULL;
 var23 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var21, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var22, var_listnode7, var23, var_pannotationsnode9); /* Direct call parser_prod#AAnnotation#init_aannotation on <var21:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var21, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var22, var_listnode7, var23, var_pannotationsnode9); /* Direct call parser_prod#AAnnotation#init_aannotation on <var21:AAnnotation>*/
 }
 var_pannotationnode1 = var21;
 var_node_list = var_pannotationnode1;
-var24 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction387> */
+var24 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction393> */
 {
-var25 = parser_work__Parser__go_to(var_p, var24);
+var25 = nit___nit__Parser___go_to(var_p, var24);
 }
 {
-parser_work__Parser__push(var_p, var25, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var25, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction387#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction387__action(val* self, val* p0) {
-parser__ReduceAction387__action(self, p0); /* Direct call parser#ReduceAction387#action on <self:Object(ReduceAction387)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction388#action for (self: ReduceAction388, Parser) */
-void parser__ReduceAction388__action(val* self, val* p0) {
+/* method parser#ReduceAction394#action for (self: ReduceAction394, Parser) */
+void nit__parser___nit__parser__ReduceAction394___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -2322,50 +2848,50 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist9 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist8 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist7 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist6 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var5;
 {
-var6 = parser_work__Parser__pop(var_p);
+var6 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var6;
 {
-var7 = parser_work__Parser__pop(var_p);
+var7 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var7;
 {
-var8 = parser_work__Parser__pop(var_p);
+var8 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var8;
 {
-var9 = parser_work__Parser__pop(var_p);
+var9 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var9;
-var10 = NEW_array__Array(&type_array__Arraykernel__Object);
+var10 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var10->class->vft[COLOR_kernel__Object__init]))(var10) /* init on <var10:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var10); /* Direct call array#Array#init on <var10:Array[Object]>*/
 }
 var_listnode8 = var10;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var11 = 1;
 } else {
@@ -2377,13 +2903,13 @@ var11 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var11)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9641);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9725);
 show_backtrace(1);
 }
 var_tkwredefnode3 = var_nodearraylist2;
 /* <var_tkwredefnode3:nullable Object> isa nullable TKwredef */
-cltype13 = type_nullable_parser_nodes__TKwredef.color;
-idtype14 = type_nullable_parser_nodes__TKwredef.id;
+cltype13 = type_nullable__nit__TKwredef.color;
+idtype14 = type_nullable__nit__TKwredef.id;
 if(var_tkwredefnode3 == NULL) {
 var12 = 1;
 } else {
@@ -2395,13 +2921,13 @@ var12 = var_tkwredefnode3->type->type_table[cltype13] == idtype14;
 }
 if (unlikely(!var12)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9643);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9727);
 show_backtrace(1);
 }
 var_pvisibilitynode4 = var_nodearraylist3;
 /* <var_pvisibilitynode4:nullable Object> isa nullable AVisibility */
-cltype16 = type_nullable_parser_nodes__AVisibility.color;
-idtype17 = type_nullable_parser_nodes__AVisibility.id;
+cltype16 = type_nullable__nit__AVisibility.color;
+idtype17 = type_nullable__nit__AVisibility.id;
 if(var_pvisibilitynode4 == NULL) {
 var15 = 1;
 } else {
@@ -2413,13 +2939,13 @@ var15 = var_pvisibilitynode4->type->type_table[cltype16] == idtype17;
 }
 if (unlikely(!var15)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9645);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9729);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist4;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype19 = type_nullable_parser_nodes__AAtid.color;
-idtype20 = type_nullable_parser_nodes__AAtid.id;
+cltype19 = type_nullable__nit__AAtid.color;
+idtype20 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var18 = 1;
 } else {
@@ -2431,13 +2957,13 @@ var18 = var_patidnode5->type->type_table[cltype19] == idtype20;
 }
 if (unlikely(!var18)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9647);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9731);
 show_backtrace(1);
 }
 var_toparnode6 = var_nodearraylist5;
 /* <var_toparnode6:nullable Object> isa nullable TOpar */
-cltype22 = type_nullable_parser_nodes__TOpar.color;
-idtype23 = type_nullable_parser_nodes__TOpar.id;
+cltype22 = type_nullable__nit__TOpar.color;
+idtype23 = type_nullable__nit__TOpar.id;
 if(var_toparnode6 == NULL) {
 var21 = 1;
 } else {
@@ -2449,13 +2975,13 @@ var21 = var_toparnode6->type->type_table[cltype22] == idtype23;
 }
 if (unlikely(!var21)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9649);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9733);
 show_backtrace(1);
 }
 var_listnode7 = var_nodearraylist7;
 /* <var_listnode7:nullable Object> isa Array[Object] */
-cltype25 = type_array__Arraykernel__Object.color;
-idtype26 = type_array__Arraykernel__Object.id;
+cltype25 = type_standard__Array__standard__Object.color;
+idtype26 = type_standard__Array__standard__Object.id;
 if(var_listnode7 == NULL) {
 var24 = 0;
 } else {
@@ -2467,17 +2993,17 @@ var24 = var_listnode7->type->type_table[cltype25] == idtype26;
 }
 if (unlikely(!var24)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9651);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9735);
 show_backtrace(1);
 }
 {
-var27 = parser_work__ReduceAction__concat(self, var_listnode8, var_listnode7);
+var27 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode8, var_listnode7);
 }
 var_listnode8 = var27;
 var_tcparnode9 = var_nodearraylist8;
 /* <var_tcparnode9:nullable Object> isa nullable TCpar */
-cltype29 = type_nullable_parser_nodes__TCpar.color;
-idtype30 = type_nullable_parser_nodes__TCpar.id;
+cltype29 = type_nullable__nit__TCpar.color;
+idtype30 = type_nullable__nit__TCpar.id;
 if(var_tcparnode9 == NULL) {
 var28 = 1;
 } else {
@@ -2489,32 +3015,27 @@ var28 = var_tcparnode9->type->type_table[cltype29] == idtype30;
 }
 if (unlikely(!var28)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9654);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9738);
 show_backtrace(1);
 }
-var31 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var31 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var32 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var31, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var32); /* Direct call parser_prod#AAnnotation#init_aannotation on <var31:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var31, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var32); /* Direct call parser_prod#AAnnotation#init_aannotation on <var31:AAnnotation>*/
 }
 var_pannotationnode1 = var31;
 var_node_list = var_pannotationnode1;
-var33 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction388> */
+var33 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction394> */
 {
-var34 = parser_work__Parser__go_to(var_p, var33);
+var34 = nit___nit__Parser___go_to(var_p, var33);
 }
 {
-parser_work__Parser__push(var_p, var34, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var34, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction388#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction388__action(val* self, val* p0) {
-parser__ReduceAction388__action(self, p0); /* Direct call parser#ReduceAction388#action on <self:Object(ReduceAction388)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction389#action for (self: ReduceAction389, Parser) */
-void parser__ReduceAction389__action(val* self, val* p0) {
+/* method parser#ReduceAction395#action for (self: ReduceAction395, Parser) */
+void nit__parser___nit__parser__ReduceAction395___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -2581,54 +3102,54 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist10 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist9 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist8 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist7 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist6 = var5;
 {
-var6 = parser_work__Parser__pop(var_p);
+var6 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var6;
 {
-var7 = parser_work__Parser__pop(var_p);
+var7 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var7;
 {
-var8 = parser_work__Parser__pop(var_p);
+var8 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var8;
 {
-var9 = parser_work__Parser__pop(var_p);
+var9 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var9;
 {
-var10 = parser_work__Parser__pop(var_p);
+var10 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var10;
-var11 = NEW_array__Array(&type_array__Arraykernel__Object);
+var11 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var11->class->vft[COLOR_kernel__Object__init]))(var11) /* init on <var11:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var11); /* Direct call array#Array#init on <var11:Array[Object]>*/
 }
 var_listnode8 = var11;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var12 = 1;
 } else {
@@ -2640,13 +3161,13 @@ var12 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var12)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9686);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9770);
 show_backtrace(1);
 }
 var_tkwredefnode3 = var_nodearraylist2;
 /* <var_tkwredefnode3:nullable Object> isa nullable TKwredef */
-cltype14 = type_nullable_parser_nodes__TKwredef.color;
-idtype15 = type_nullable_parser_nodes__TKwredef.id;
+cltype14 = type_nullable__nit__TKwredef.color;
+idtype15 = type_nullable__nit__TKwredef.id;
 if(var_tkwredefnode3 == NULL) {
 var13 = 1;
 } else {
@@ -2658,13 +3179,13 @@ var13 = var_tkwredefnode3->type->type_table[cltype14] == idtype15;
 }
 if (unlikely(!var13)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9688);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9772);
 show_backtrace(1);
 }
 var_pvisibilitynode4 = var_nodearraylist3;
 /* <var_pvisibilitynode4:nullable Object> isa nullable AVisibility */
-cltype17 = type_nullable_parser_nodes__AVisibility.color;
-idtype18 = type_nullable_parser_nodes__AVisibility.id;
+cltype17 = type_nullable__nit__AVisibility.color;
+idtype18 = type_nullable__nit__AVisibility.id;
 if(var_pvisibilitynode4 == NULL) {
 var16 = 1;
 } else {
@@ -2676,13 +3197,13 @@ var16 = var_pvisibilitynode4->type->type_table[cltype17] == idtype18;
 }
 if (unlikely(!var16)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9690);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9774);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist4;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype20 = type_nullable_parser_nodes__AAtid.color;
-idtype21 = type_nullable_parser_nodes__AAtid.id;
+cltype20 = type_nullable__nit__AAtid.color;
+idtype21 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var19 = 1;
 } else {
@@ -2694,13 +3215,13 @@ var19 = var_patidnode5->type->type_table[cltype20] == idtype21;
 }
 if (unlikely(!var19)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9692);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9776);
 show_backtrace(1);
 }
 var_toparnode6 = var_nodearraylist5;
 /* <var_toparnode6:nullable Object> isa nullable TOpar */
-cltype23 = type_nullable_parser_nodes__TOpar.color;
-idtype24 = type_nullable_parser_nodes__TOpar.id;
+cltype23 = type_nullable__nit__TOpar.color;
+idtype24 = type_nullable__nit__TOpar.id;
 if(var_toparnode6 == NULL) {
 var22 = 1;
 } else {
@@ -2712,13 +3233,13 @@ var22 = var_toparnode6->type->type_table[cltype23] == idtype24;
 }
 if (unlikely(!var22)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9694);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9778);
 show_backtrace(1);
 }
 var_listnode7 = var_nodearraylist7;
 /* <var_listnode7:nullable Object> isa Array[Object] */
-cltype26 = type_array__Arraykernel__Object.color;
-idtype27 = type_array__Arraykernel__Object.id;
+cltype26 = type_standard__Array__standard__Object.color;
+idtype27 = type_standard__Array__standard__Object.id;
 if(var_listnode7 == NULL) {
 var25 = 0;
 } else {
@@ -2730,17 +3251,17 @@ var25 = var_listnode7->type->type_table[cltype26] == idtype27;
 }
 if (unlikely(!var25)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9696);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9780);
 show_backtrace(1);
 }
 {
-var28 = parser_work__ReduceAction__concat(self, var_listnode8, var_listnode7);
+var28 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode8, var_listnode7);
 }
 var_listnode8 = var28;
 var_tcparnode9 = var_nodearraylist8;
 /* <var_tcparnode9:nullable Object> isa nullable TCpar */
-cltype30 = type_nullable_parser_nodes__TCpar.color;
-idtype31 = type_nullable_parser_nodes__TCpar.id;
+cltype30 = type_nullable__nit__TCpar.color;
+idtype31 = type_nullable__nit__TCpar.id;
 if(var_tcparnode9 == NULL) {
 var29 = 1;
 } else {
@@ -2752,13 +3273,13 @@ var29 = var_tcparnode9->type->type_table[cltype30] == idtype31;
 }
 if (unlikely(!var29)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9699);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9783);
 show_backtrace(1);
 }
 var_pannotationsnode10 = var_nodearraylist9;
 /* <var_pannotationsnode10:nullable Object> isa nullable AAnnotations */
-cltype33 = type_nullable_parser_nodes__AAnnotations.color;
-idtype34 = type_nullable_parser_nodes__AAnnotations.id;
+cltype33 = type_nullable__nit__AAnnotations.color;
+idtype34 = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode10 == NULL) {
 var32 = 1;
 } else {
@@ -2770,31 +3291,26 @@ var32 = var_pannotationsnode10->type->type_table[cltype33] == idtype34;
 }
 if (unlikely(!var32)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9701);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9785);
 show_backtrace(1);
 }
-var35 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var35 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 {
-parser_prod__AAnnotation__init_aannotation(var35, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var_pannotationsnode10); /* Direct call parser_prod#AAnnotation#init_aannotation on <var35:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var35, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var_pannotationsnode10); /* Direct call parser_prod#AAnnotation#init_aannotation on <var35:AAnnotation>*/
 }
 var_pannotationnode1 = var35;
 var_node_list = var_pannotationnode1;
-var36 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction389> */
+var36 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction395> */
 {
-var37 = parser_work__Parser__go_to(var_p, var36);
+var37 = nit___nit__Parser___go_to(var_p, var36);
 }
 {
-parser_work__Parser__push(var_p, var37, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var37, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction389#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction389__action(val* self, val* p0) {
-parser__ReduceAction389__action(self, p0); /* Direct call parser#ReduceAction389#action on <self:Object(ReduceAction389)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction390#action for (self: ReduceAction390, Parser) */
-void parser__ReduceAction390__action(val* self, val* p0) {
+/* method parser#ReduceAction396#action for (self: ReduceAction396, Parser) */
+void nit__parser___nit__parser__ReduceAction396___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -2844,38 +3360,38 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist6 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var5;
 {
-var6 = parser_work__Parser__pop(var_p);
+var6 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var6;
-var7 = NEW_array__Array(&type_array__Arraykernel__Object);
+var7 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var7->class->vft[COLOR_kernel__Object__init]))(var7) /* init on <var7:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var7); /* Direct call array#Array#init on <var7:Array[Object]>*/
 }
 var_listnode8 = var7;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var8 = 1;
 } else {
@@ -2887,13 +3403,13 @@ var8 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var8)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9729);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9813);
 show_backtrace(1);
 }
 var_tkwredefnode3 = var_nodearraylist2;
 /* <var_tkwredefnode3:nullable Object> isa nullable TKwredef */
-cltype10 = type_nullable_parser_nodes__TKwredef.color;
-idtype11 = type_nullable_parser_nodes__TKwredef.id;
+cltype10 = type_nullable__nit__TKwredef.color;
+idtype11 = type_nullable__nit__TKwredef.id;
 if(var_tkwredefnode3 == NULL) {
 var9 = 1;
 } else {
@@ -2905,13 +3421,13 @@ var9 = var_tkwredefnode3->type->type_table[cltype10] == idtype11;
 }
 if (unlikely(!var9)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9731);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9815);
 show_backtrace(1);
 }
 var_pvisibilitynode4 = var_nodearraylist3;
 /* <var_pvisibilitynode4:nullable Object> isa nullable AVisibility */
-cltype13 = type_nullable_parser_nodes__AVisibility.color;
-idtype14 = type_nullable_parser_nodes__AVisibility.id;
+cltype13 = type_nullable__nit__AVisibility.color;
+idtype14 = type_nullable__nit__AVisibility.id;
 if(var_pvisibilitynode4 == NULL) {
 var12 = 1;
 } else {
@@ -2923,13 +3439,13 @@ var12 = var_pvisibilitynode4->type->type_table[cltype13] == idtype14;
 }
 if (unlikely(!var12)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9733);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9817);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist4;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype16 = type_nullable_parser_nodes__AAtid.color;
-idtype17 = type_nullable_parser_nodes__AAtid.id;
+cltype16 = type_nullable__nit__AAtid.color;
+idtype17 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var15 = 1;
 } else {
@@ -2941,13 +3457,13 @@ var15 = var_patidnode5->type->type_table[cltype16] == idtype17;
 }
 if (unlikely(!var15)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9735);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9819);
 show_backtrace(1);
 }
 var_listnode7 = var_nodearraylist5;
 /* <var_listnode7:nullable Object> isa Array[Object] */
-cltype19 = type_array__Arraykernel__Object.color;
-idtype20 = type_array__Arraykernel__Object.id;
+cltype19 = type_standard__Array__standard__Object.color;
+idtype20 = type_standard__Array__standard__Object.id;
 if(var_listnode7 == NULL) {
 var18 = 0;
 } else {
@@ -2959,38 +3475,33 @@ var18 = var_listnode7->type->type_table[cltype19] == idtype20;
 }
 if (unlikely(!var18)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9737);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9821);
 show_backtrace(1);
 }
 {
-var21 = parser_work__ReduceAction__concat(self, var_listnode8, var_listnode7);
+var21 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode8, var_listnode7);
 }
 var_listnode8 = var21;
-var22 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var22 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var23 = NULL;
 var24 = NULL;
 var25 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var22, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var23, var_listnode8, var24, var25); /* Direct call parser_prod#AAnnotation#init_aannotation on <var22:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var22, var_pdocnode2, var_tkwredefnode3, var_pvisibilitynode4, var_patidnode5, var23, var_listnode8, var24, var25); /* Direct call parser_prod#AAnnotation#init_aannotation on <var22:AAnnotation>*/
 }
 var_pannotationnode1 = var22;
 var_node_list = var_pannotationnode1;
-var26 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction390> */
+var26 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction396> */
 {
-var27 = parser_work__Parser__go_to(var_p, var26);
+var27 = nit___nit__Parser___go_to(var_p, var26);
 }
 {
-parser_work__Parser__push(var_p, var27, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var27, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction390#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction390__action(val* self, val* p0) {
-parser__ReduceAction390__action(self, p0); /* Direct call parser#ReduceAction390#action on <self:Object(ReduceAction390)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction391#action for (self: ReduceAction391, Parser) */
-void parser__ReduceAction391__action(val* self, val* p0) {
+/* method parser#ReduceAction397#action for (self: ReduceAction397, Parser) */
+void nit__parser___nit__parser__ReduceAction397___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -3023,26 +3534,26 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
-var4 = NEW_array__Array(&type_array__Arraykernel__Object);
+var4 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var4->class->vft[COLOR_kernel__Object__init]))(var4) /* init on <var4:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var4); /* Direct call array#Array#init on <var4:Array[Object]>*/
 }
 var_listnode7 = var4;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var5 = 1;
 } else {
@@ -3054,13 +3565,13 @@ var5 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9763);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9847);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist2;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype7 = type_nullable_parser_nodes__AAtid.color;
-idtype8 = type_nullable_parser_nodes__AAtid.id;
+cltype7 = type_nullable__nit__AAtid.color;
+idtype8 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var6 = 1;
 } else {
@@ -3072,36 +3583,31 @@ var6 = var_patidnode5->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9765);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9849);
 show_backtrace(1);
 }
-var9 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var9 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var10 = NULL;
 var11 = NULL;
 var12 = NULL;
 var13 = NULL;
 var14 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var9, var_pdocnode2, var10, var11, var_patidnode5, var12, var_listnode7, var13, var14); /* Direct call parser_prod#AAnnotation#init_aannotation on <var9:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var9, var_pdocnode2, var10, var11, var_patidnode5, var12, var_listnode7, var13, var14); /* Direct call parser_prod#AAnnotation#init_aannotation on <var9:AAnnotation>*/
 }
 var_pannotationnode1 = var9;
 var_node_list = var_pannotationnode1;
-var15 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction391> */
+var15 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction397> */
 {
-var16 = parser_work__Parser__go_to(var_p, var15);
+var16 = nit___nit__Parser___go_to(var_p, var15);
 }
 {
-parser_work__Parser__push(var_p, var16, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var16, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction391#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction391__action(val* self, val* p0) {
-parser__ReduceAction391__action(self, p0); /* Direct call parser#ReduceAction391#action on <self:Object(ReduceAction391)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction392#action for (self: ReduceAction392, Parser) */
-void parser__ReduceAction392__action(val* self, val* p0) {
+/* method parser#ReduceAction398#action for (self: ReduceAction398, Parser) */
+void nit__parser___nit__parser__ReduceAction398___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -3139,30 +3645,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode7 = var5;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var6 = 1;
 } else {
@@ -3174,13 +3680,13 @@ var6 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9791);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9875);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist2;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype8 = type_nullable_parser_nodes__AAtid.color;
-idtype9 = type_nullable_parser_nodes__AAtid.id;
+cltype8 = type_nullable__nit__AAtid.color;
+idtype9 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var7 = 1;
 } else {
@@ -3192,13 +3698,13 @@ var7 = var_patidnode5->type->type_table[cltype8] == idtype9;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9793);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9877);
 show_backtrace(1);
 }
 var_pannotationsnode9 = var_nodearraylist3;
 /* <var_pannotationsnode9:nullable Object> isa nullable AAnnotations */
-cltype11 = type_nullable_parser_nodes__AAnnotations.color;
-idtype12 = type_nullable_parser_nodes__AAnnotations.id;
+cltype11 = type_nullable__nit__AAnnotations.color;
+idtype12 = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode9 == NULL) {
 var10 = 1;
 } else {
@@ -3210,35 +3716,30 @@ var10 = var_pannotationsnode9->type->type_table[cltype11] == idtype12;
 }
 if (unlikely(!var10)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9795);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9879);
 show_backtrace(1);
 }
-var13 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var13 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var14 = NULL;
 var15 = NULL;
 var16 = NULL;
 var17 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var13, var_pdocnode2, var14, var15, var_patidnode5, var16, var_listnode7, var17, var_pannotationsnode9); /* Direct call parser_prod#AAnnotation#init_aannotation on <var13:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var13, var_pdocnode2, var14, var15, var_patidnode5, var16, var_listnode7, var17, var_pannotationsnode9); /* Direct call parser_prod#AAnnotation#init_aannotation on <var13:AAnnotation>*/
 }
 var_pannotationnode1 = var13;
 var_node_list = var_pannotationnode1;
-var18 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction392> */
+var18 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction398> */
 {
-var19 = parser_work__Parser__go_to(var_p, var18);
+var19 = nit___nit__Parser___go_to(var_p, var18);
 }
 {
-parser_work__Parser__push(var_p, var19, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var19, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction392#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction392__action(val* self, val* p0) {
-parser__ReduceAction392__action(self, p0); /* Direct call parser#ReduceAction392#action on <self:Object(ReduceAction392)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction393#action for (self: ReduceAction393, Parser) */
-void parser__ReduceAction393__action(val* self, val* p0) {
+/* method parser#ReduceAction399#action for (self: ReduceAction399, Parser) */
+void nit__parser___nit__parser__ReduceAction399___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -3290,42 +3791,42 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist7 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist6 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var5;
 {
-var6 = parser_work__Parser__pop(var_p);
+var6 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var6;
 {
-var7 = parser_work__Parser__pop(var_p);
+var7 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var7;
-var8 = NEW_array__Array(&type_array__Arraykernel__Object);
+var8 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var8->class->vft[COLOR_kernel__Object__init]))(var8) /* init on <var8:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var8); /* Direct call array#Array#init on <var8:Array[Object]>*/
 }
 var_listnode8 = var8;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var9 = 1;
 } else {
@@ -3337,13 +3838,13 @@ var9 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var9)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9824);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9908);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist2;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype11 = type_nullable_parser_nodes__AAtid.color;
-idtype12 = type_nullable_parser_nodes__AAtid.id;
+cltype11 = type_nullable__nit__AAtid.color;
+idtype12 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var10 = 1;
 } else {
@@ -3355,13 +3856,13 @@ var10 = var_patidnode5->type->type_table[cltype11] == idtype12;
 }
 if (unlikely(!var10)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9826);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9910);
 show_backtrace(1);
 }
 var_toparnode6 = var_nodearraylist3;
 /* <var_toparnode6:nullable Object> isa nullable TOpar */
-cltype14 = type_nullable_parser_nodes__TOpar.color;
-idtype15 = type_nullable_parser_nodes__TOpar.id;
+cltype14 = type_nullable__nit__TOpar.color;
+idtype15 = type_nullable__nit__TOpar.id;
 if(var_toparnode6 == NULL) {
 var13 = 1;
 } else {
@@ -3373,13 +3874,13 @@ var13 = var_toparnode6->type->type_table[cltype14] == idtype15;
 }
 if (unlikely(!var13)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9828);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9912);
 show_backtrace(1);
 }
 var_listnode7 = var_nodearraylist5;
 /* <var_listnode7:nullable Object> isa Array[Object] */
-cltype17 = type_array__Arraykernel__Object.color;
-idtype18 = type_array__Arraykernel__Object.id;
+cltype17 = type_standard__Array__standard__Object.color;
+idtype18 = type_standard__Array__standard__Object.id;
 if(var_listnode7 == NULL) {
 var16 = 0;
 } else {
@@ -3391,17 +3892,17 @@ var16 = var_listnode7->type->type_table[cltype17] == idtype18;
 }
 if (unlikely(!var16)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9830);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9914);
 show_backtrace(1);
 }
 {
-var19 = parser_work__ReduceAction__concat(self, var_listnode8, var_listnode7);
+var19 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode8, var_listnode7);
 }
 var_listnode8 = var19;
 var_tcparnode9 = var_nodearraylist6;
 /* <var_tcparnode9:nullable Object> isa nullable TCpar */
-cltype21 = type_nullable_parser_nodes__TCpar.color;
-idtype22 = type_nullable_parser_nodes__TCpar.id;
+cltype21 = type_nullable__nit__TCpar.color;
+idtype22 = type_nullable__nit__TCpar.id;
 if(var_tcparnode9 == NULL) {
 var20 = 1;
 } else {
@@ -3413,34 +3914,29 @@ var20 = var_tcparnode9->type->type_table[cltype21] == idtype22;
 }
 if (unlikely(!var20)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9833);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9917);
 show_backtrace(1);
 }
-var23 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var23 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var24 = NULL;
 var25 = NULL;
 var26 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var23, var_pdocnode2, var24, var25, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var26); /* Direct call parser_prod#AAnnotation#init_aannotation on <var23:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var23, var_pdocnode2, var24, var25, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var26); /* Direct call parser_prod#AAnnotation#init_aannotation on <var23:AAnnotation>*/
 }
 var_pannotationnode1 = var23;
 var_node_list = var_pannotationnode1;
-var27 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction393> */
+var27 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction399> */
 {
-var28 = parser_work__Parser__go_to(var_p, var27);
+var28 = nit___nit__Parser___go_to(var_p, var27);
 }
 {
-parser_work__Parser__push(var_p, var28, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var28, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction393#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction393__action(val* self, val* p0) {
-parser__ReduceAction393__action(self, p0); /* Direct call parser#ReduceAction393#action on <self:Object(ReduceAction393)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction394#action for (self: ReduceAction394, Parser) */
-void parser__ReduceAction394__action(val* self, val* p0) {
+/* method parser#ReduceAction400#action for (self: ReduceAction400, Parser) */
+void nit__parser___nit__parser__ReduceAction400___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -3497,46 +3993,46 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist8 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist7 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist6 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var5;
 {
-var6 = parser_work__Parser__pop(var_p);
+var6 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var6;
 {
-var7 = parser_work__Parser__pop(var_p);
+var7 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var7;
 {
-var8 = parser_work__Parser__pop(var_p);
+var8 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var8;
-var9 = NEW_array__Array(&type_array__Arraykernel__Object);
+var9 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var9->class->vft[COLOR_kernel__Object__init]))(var9) /* init on <var9:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var9); /* Direct call array#Array#init on <var9:Array[Object]>*/
 }
 var_listnode8 = var9;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var10 = 1;
 } else {
@@ -3548,13 +4044,13 @@ var10 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var10)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9863);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9947);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist2;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype12 = type_nullable_parser_nodes__AAtid.color;
-idtype13 = type_nullable_parser_nodes__AAtid.id;
+cltype12 = type_nullable__nit__AAtid.color;
+idtype13 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var11 = 1;
 } else {
@@ -3566,13 +4062,13 @@ var11 = var_patidnode5->type->type_table[cltype12] == idtype13;
 }
 if (unlikely(!var11)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9865);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9949);
 show_backtrace(1);
 }
 var_toparnode6 = var_nodearraylist3;
 /* <var_toparnode6:nullable Object> isa nullable TOpar */
-cltype15 = type_nullable_parser_nodes__TOpar.color;
-idtype16 = type_nullable_parser_nodes__TOpar.id;
+cltype15 = type_nullable__nit__TOpar.color;
+idtype16 = type_nullable__nit__TOpar.id;
 if(var_toparnode6 == NULL) {
 var14 = 1;
 } else {
@@ -3584,13 +4080,13 @@ var14 = var_toparnode6->type->type_table[cltype15] == idtype16;
 }
 if (unlikely(!var14)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9867);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9951);
 show_backtrace(1);
 }
 var_listnode7 = var_nodearraylist5;
 /* <var_listnode7:nullable Object> isa Array[Object] */
-cltype18 = type_array__Arraykernel__Object.color;
-idtype19 = type_array__Arraykernel__Object.id;
+cltype18 = type_standard__Array__standard__Object.color;
+idtype19 = type_standard__Array__standard__Object.id;
 if(var_listnode7 == NULL) {
 var17 = 0;
 } else {
@@ -3602,17 +4098,17 @@ var17 = var_listnode7->type->type_table[cltype18] == idtype19;
 }
 if (unlikely(!var17)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9869);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9953);
 show_backtrace(1);
 }
 {
-var20 = parser_work__ReduceAction__concat(self, var_listnode8, var_listnode7);
+var20 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode8, var_listnode7);
 }
 var_listnode8 = var20;
 var_tcparnode9 = var_nodearraylist6;
 /* <var_tcparnode9:nullable Object> isa nullable TCpar */
-cltype22 = type_nullable_parser_nodes__TCpar.color;
-idtype23 = type_nullable_parser_nodes__TCpar.id;
+cltype22 = type_nullable__nit__TCpar.color;
+idtype23 = type_nullable__nit__TCpar.id;
 if(var_tcparnode9 == NULL) {
 var21 = 1;
 } else {
@@ -3624,13 +4120,13 @@ var21 = var_tcparnode9->type->type_table[cltype22] == idtype23;
 }
 if (unlikely(!var21)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9872);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9956);
 show_backtrace(1);
 }
 var_pannotationsnode10 = var_nodearraylist7;
 /* <var_pannotationsnode10:nullable Object> isa nullable AAnnotations */
-cltype25 = type_nullable_parser_nodes__AAnnotations.color;
-idtype26 = type_nullable_parser_nodes__AAnnotations.id;
+cltype25 = type_nullable__nit__AAnnotations.color;
+idtype26 = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode10 == NULL) {
 var24 = 1;
 } else {
@@ -3642,33 +4138,28 @@ var24 = var_pannotationsnode10->type->type_table[cltype25] == idtype26;
 }
 if (unlikely(!var24)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9874);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9958);
 show_backtrace(1);
 }
-var27 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var27 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var28 = NULL;
 var29 = NULL;
 {
-parser_prod__AAnnotation__init_aannotation(var27, var_pdocnode2, var28, var29, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var_pannotationsnode10); /* Direct call parser_prod#AAnnotation#init_aannotation on <var27:AAnnotation>*/
+nit__parser_prod___AAnnotation___init_aannotation(var27, var_pdocnode2, var28, var29, var_patidnode5, var_toparnode6, var_listnode8, var_tcparnode9, var_pannotationsnode10); /* Direct call parser_prod#AAnnotation#init_aannotation on <var27:AAnnotation>*/
 }
 var_pannotationnode1 = var27;
 var_node_list = var_pannotationnode1;
-var30 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction394> */
+var30 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction400> */
 {
-var31 = parser_work__Parser__go_to(var_p, var30);
+var31 = nit___nit__Parser___go_to(var_p, var30);
 }
 {
-parser_work__Parser__push(var_p, var31, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var31, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction394#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction394__action(val* self, val* p0) {
-parser__ReduceAction394__action(self, p0); /* Direct call parser#ReduceAction394#action on <self:Object(ReduceAction394)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction395#action for (self: ReduceAction395, Parser) */
-void parser__ReduceAction395__action(val* self, val* p0) {
+/* method parser#ReduceAction401#action for (self: ReduceAction401, Parser) */
+void nit__parser___nit__parser__ReduceAction401___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -3708,30 +4199,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode8 = var5;
 var_pdocnode2 = var_nodearraylist1;
 /* <var_pdocnode2:nullable Object> isa nullable ADoc */
-cltype = type_nullable_parser_nodes__ADoc.color;
-idtype = type_nullable_parser_nodes__ADoc.id;
+cltype = type_nullable__nit__ADoc.color;
+idtype = type_nullable__nit__ADoc.id;
 if(var_pdocnode2 == NULL) {
 var6 = 1;
 } else {
@@ -3743,13 +4234,13 @@ var6 = var_pdocnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9900);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9984);
 show_backtrace(1);
 }
 var_patidnode5 = var_nodearraylist2;
 /* <var_patidnode5:nullable Object> isa nullable AAtid */
-cltype8 = type_nullable_parser_nodes__AAtid.color;
-idtype9 = type_nullable_parser_nodes__AAtid.id;
+cltype8 = type_nullable__nit__AAtid.color;
+idtype9 = type_nullable__nit__AAtid.id;
 if(var_patidnode5 == NULL) {
 var7 = 1;
 } else {
@@ -3761,13 +4252,13 @@ var7 = var_patidnode5->type->type_table[cltype8] == idtype9;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9902);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9986);
 show_backtrace(1);
 }
 var_listnode7 = var_nodearraylist3;
 /* <var_listnode7:nullable Object> isa Array[Object] */
-cltype11 = type_array__Arraykernel__Object.color;
-idtype12 = type_array__Arraykernel__Object.id;
+cltype11 = type_standard__Array__standard__Object.color;
+idtype12 = type_standard__Array__standard__Object.id;
 if(var_listnode7 == NULL) {
 var10 = 0;
 } else {
@@ -3779,191 +4270,35 @@ var10 = var_listnode7->type->type_table[cltype11] == idtype12;
 }
 if (unlikely(!var10)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9904);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 9988);
 show_backtrace(1);
 }
 {
-var13 = parser_work__ReduceAction__concat(self, var_listnode8, var_listnode7);
+var13 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode8, var_listnode7);
 }
 var_listnode8 = var13;
-var14 = NEW_parser_nodes__AAnnotation(&type_parser_nodes__AAnnotation);
+var14 = NEW_nit__AAnnotation(&type_nit__AAnnotation);
 var15 = NULL;
-var16 = NULL;
-var17 = NULL;
-var18 = NULL;
-var19 = NULL;
-{
-parser_prod__AAnnotation__init_aannotation(var14, var_pdocnode2, var15, var16, var_patidnode5, var17, var_listnode8, var18, var19); /* Direct call parser_prod#AAnnotation#init_aannotation on <var14:AAnnotation>*/
-}
-var_pannotationnode1 = var14;
-var_node_list = var_pannotationnode1;
-var20 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction395> */
-{
-var21 = parser_work__Parser__go_to(var_p, var20);
-}
-{
-parser_work__Parser__push(var_p, var21, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
-}
-/* method parser#ReduceAction395#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction395__action(val* self, val* p0) {
-parser__ReduceAction395__action(self, p0); /* Direct call parser#ReduceAction395#action on <self:Object(ReduceAction395)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction396#action for (self: ReduceAction396, Parser) */
-void parser__ReduceAction396__action(val* self, val* p0) {
-val* var_p /* var p: Parser */;
-val* var /* : null */;
-val* var_node_list /* var node_list: nullable Object */;
-val* var1 /* : nullable Object */;
-val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
-val* var2 /* : Array[Object] */;
-val* var_listnode2 /* var listnode2: Array[Object] */;
-val* var_pexprnode1 /* var pexprnode1: nullable Object */;
-val* var3 /* : null */;
-short int var4 /* : Bool */;
-short int var5 /* : Bool */;
-long var6 /* : Int */;
-long var7 /* : Int */;
-var_p = p0;
-var = NULL;
-var_node_list = var;
-{
-var1 = parser_work__Parser__pop(var_p);
-}
-var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
-{
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
-}
-var_listnode2 = var2;
-var_pexprnode1 = var_nodearraylist1;
-var3 = NULL;
-if (var_pexprnode1 == NULL) {
-var4 = 0; /* is null */
-} else {
-var4 = 1; /* arg is null and recv is not */
-}
-if (0) {
-var5 = ((short int (*)(val*, val*))(var_pexprnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexprnode1, var3) /* != on <var_pexprnode1:nullable Object>*/;
-var4 = var5;
-}
-if (var4){
-{
-array__Array__add(var_listnode2, var_pexprnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
-}
-} else {
-}
-var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction396> */
-{
-var7 = parser_work__Parser__go_to(var_p, var6);
-}
-{
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
-}
-/* method parser#ReduceAction396#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction396__action(val* self, val* p0) {
-parser__ReduceAction396__action(self, p0); /* Direct call parser#ReduceAction396#action on <self:Object(ReduceAction396)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction397#action for (self: ReduceAction397, Parser) */
-void parser__ReduceAction397__action(val* self, val* p0) {
-val* var_p /* var p: Parser */;
-val* var /* : null */;
-val* var_node_list /* var node_list: nullable Object */;
-val* var1 /* : nullable Object */;
-val* var_nodearraylist2 /* var nodearraylist2: nullable Object */;
-val* var2 /* : nullable Object */;
-val* var_nodearraylist1 /* var nodearraylist1: nullable Object */;
-val* var3 /* : Array[Object] */;
-val* var_listnode3 /* var listnode3: Array[Object] */;
-val* var_pexprnode1 /* var pexprnode1: nullable Object */;
-val* var_listnode2 /* var listnode2: nullable Object */;
-short int var4 /* : Bool */;
-int cltype;
-int idtype;
-val* var5 /* : null */;
-short int var6 /* : Bool */;
-short int var7 /* : Bool */;
-val* var8 /* : Array[Object] */;
-long var9 /* : Int */;
-long var10 /* : Int */;
-var_p = p0;
-var = NULL;
-var_node_list = var;
-{
-var1 = parser_work__Parser__pop(var_p);
-}
-var_nodearraylist2 = var1;
-{
-var2 = parser_work__Parser__pop(var_p);
-}
-var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
-{
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
-}
-var_listnode3 = var3;
-var_pexprnode1 = var_nodearraylist1;
-var_listnode2 = var_nodearraylist2;
-/* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
-if(var_listnode2 == NULL) {
-var4 = 0;
-} else {
-if(cltype >= var_listnode2->type->table_size) {
-var4 = 0;
-} else {
-var4 = var_listnode2->type->type_table[cltype] == idtype;
-}
-}
-if (unlikely(!var4)) {
-PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9945);
-show_backtrace(1);
-}
-var5 = NULL;
-if (var_pexprnode1 == NULL) {
-var6 = 0; /* is null */
-} else {
-var6 = 1; /* arg is null and recv is not */
-}
-if (0) {
-var7 = ((short int (*)(val*, val*))(var_pexprnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexprnode1, var5) /* != on <var_pexprnode1:nullable Object>*/;
-var6 = var7;
-}
-if (var6){
-{
-array__Array__add(var_listnode3, var_pexprnode1); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
-}
-} else {
-}
+var16 = NULL;
+var17 = NULL;
+var18 = NULL;
+var19 = NULL;
 {
-var8 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+nit__parser_prod___AAnnotation___init_aannotation(var14, var_pdocnode2, var15, var16, var_patidnode5, var17, var_listnode8, var18, var19); /* Direct call parser_prod#AAnnotation#init_aannotation on <var14:AAnnotation>*/
 }
-var_listnode3 = var8;
-var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction397> */
+var_pannotationnode1 = var14;
+var_node_list = var_pannotationnode1;
+var20 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction401> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var21 = nit___nit__Parser___go_to(var_p, var20);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var21, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction397#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction397__action(val* self, val* p0) {
-parser__ReduceAction397__action(self, p0); /* Direct call parser#ReduceAction397#action on <self:Object(ReduceAction397)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction399#action for (self: ReduceAction399, Parser) */
-void parser__ReduceAction399__action(val* self, val* p0) {
+/* method parser#ReduceAction405#action for (self: ReduceAction405, Parser) */
+void nit__parser___nit__parser__ReduceAction405___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -3981,13 +4316,13 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_ptypenode2 = var_nodearraylist1;
 /* <var_ptypenode2:nullable Object> isa nullable AType */
-cltype = type_nullable_parser_nodes__AType.color;
-idtype = type_nullable_parser_nodes__AType.id;
+cltype = type_nullable__nit__AType.color;
+idtype = type_nullable__nit__AType.id;
 if(var_ptypenode2 == NULL) {
 var2 = 1;
 } else {
@@ -3999,31 +4334,26 @@ var2 = var_ptypenode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9961);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10011);
 show_backtrace(1);
 }
-var3 = NEW_parser_nodes__ATypeExpr(&type_parser_nodes__ATypeExpr);
+var3 = NEW_nit__ATypeExpr(&type_nit__ATypeExpr);
 {
-parser_prod__ATypeExpr__init_atypeexpr(var3, var_ptypenode2); /* Direct call parser_prod#ATypeExpr#init_atypeexpr on <var3:ATypeExpr>*/
+nit__parser_prod___ATypeExpr___init_atypeexpr(var3, var_ptypenode2); /* Direct call parser_prod#ATypeExpr#init_atypeexpr on <var3:ATypeExpr>*/
 }
 var_pexprnode1 = var3;
 var_node_list = var_pexprnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction399> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction405> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction399#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction399__action(val* self, val* p0) {
-parser__ReduceAction399__action(self, p0); /* Direct call parser#ReduceAction399#action on <self:Object(ReduceAction399)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction402#action for (self: ReduceAction402, Parser) */
-void parser__ReduceAction402__action(val* self, val* p0) {
+/* method parser#ReduceAction408#action for (self: ReduceAction408, Parser) */
+void nit__parser___nit__parser__ReduceAction408___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4051,25 +4381,25 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var5 = 1;
 } else {
@@ -4081,13 +4411,13 @@ var5 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9979);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10029);
 show_backtrace(1);
 }
 var_pmethidnode3 = var_nodearraylist4;
 /* <var_pmethidnode3:nullable Object> isa nullable AMethid */
-cltype7 = type_nullable_parser_nodes__AMethid.color;
-idtype8 = type_nullable_parser_nodes__AMethid.id;
+cltype7 = type_nullable__nit__AMethid.color;
+idtype8 = type_nullable__nit__AMethid.id;
 if(var_pmethidnode3 == NULL) {
 var6 = 1;
 } else {
@@ -4099,31 +4429,26 @@ var6 = var_pmethidnode3->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9981);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10031);
 show_backtrace(1);
 }
-var9 = NEW_parser_nodes__AMethidExpr(&type_parser_nodes__AMethidExpr);
+var9 = NEW_nit__AMethidExpr(&type_nit__AMethidExpr);
 {
-parser_prod__AMethidExpr__init_amethidexpr(var9, var_pexprnode2, var_pmethidnode3); /* Direct call parser_prod#AMethidExpr#init_amethidexpr on <var9:AMethidExpr>*/
+nit__parser_prod___AMethidExpr___init_amethidexpr(var9, var_pexprnode2, var_pmethidnode3); /* Direct call parser_prod#AMethidExpr#init_amethidexpr on <var9:AMethidExpr>*/
 }
 var_pexprnode1 = var9;
 var_node_list = var_pexprnode1;
-var10 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction402> */
+var10 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction408> */
 {
-var11 = parser_work__Parser__go_to(var_p, var10);
+var11 = nit___nit__Parser___go_to(var_p, var10);
 }
 {
-parser_work__Parser__push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction402#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction402__action(val* self, val* p0) {
-parser__ReduceAction402__action(self, p0); /* Direct call parser#ReduceAction402#action on <self:Object(ReduceAction402)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction403#action for (self: ReduceAction403, Parser) */
-void parser__ReduceAction403__action(val* self, val* p0) {
+/* method parser#ReduceAction409#action for (self: ReduceAction409, Parser) */
+void nit__parser___nit__parser__ReduceAction409___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4143,10 +4468,10 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_parser_nodes__AImplicitSelfExpr(&type_parser_nodes__AImplicitSelfExpr);
+var2 = NEW_nit__AImplicitSelfExpr(&type_nit__AImplicitSelfExpr);
 {
 { /* Inline parser_prod#AImplicitSelfExpr#init_aimplicitselfexpr (var2) on <var2:AImplicitSelfExpr> */
 RET_LABEL3:(void)0;
@@ -4155,8 +4480,8 @@ RET_LABEL3:(void)0;
 var_pexprnode2 = var2;
 var_pmethidnode3 = var_nodearraylist1;
 /* <var_pmethidnode3:nullable Object> isa nullable AMethid */
-cltype = type_nullable_parser_nodes__AMethid.color;
-idtype = type_nullable_parser_nodes__AMethid.id;
+cltype = type_nullable__nit__AMethid.color;
+idtype = type_nullable__nit__AMethid.id;
 if(var_pmethidnode3 == NULL) {
 var4 = 1;
 } else {
@@ -4168,31 +4493,26 @@ var4 = var_pmethidnode3->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 9998);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10048);
 show_backtrace(1);
 }
-var5 = NEW_parser_nodes__AMethidExpr(&type_parser_nodes__AMethidExpr);
+var5 = NEW_nit__AMethidExpr(&type_nit__AMethidExpr);
 {
-parser_prod__AMethidExpr__init_amethidexpr(var5, var_pexprnode2, var_pmethidnode3); /* Direct call parser_prod#AMethidExpr#init_amethidexpr on <var5:AMethidExpr>*/
+nit__parser_prod___AMethidExpr___init_amethidexpr(var5, var_pexprnode2, var_pmethidnode3); /* Direct call parser_prod#AMethidExpr#init_amethidexpr on <var5:AMethidExpr>*/
 }
 var_pexprnode1 = var5;
 var_node_list = var_pexprnode1;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction403> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction409> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction403#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction403__action(val* self, val* p0) {
-parser__ReduceAction403__action(self, p0); /* Direct call parser#ReduceAction403#action on <self:Object(ReduceAction403)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction404#action for (self: ReduceAction404, Parser) */
-void parser__ReduceAction404__action(val* self, val* p0) {
+/* method parser#ReduceAction410#action for (self: ReduceAction410, Parser) */
+void nit__parser___nit__parser__ReduceAction410___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4210,13 +4530,13 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_pannotationsnode2 = var_nodearraylist1;
 /* <var_pannotationsnode2:nullable Object> isa nullable AAnnotations */
-cltype = type_nullable_parser_nodes__AAnnotations.color;
-idtype = type_nullable_parser_nodes__AAnnotations.id;
+cltype = type_nullable__nit__AAnnotations.color;
+idtype = type_nullable__nit__AAnnotations.id;
 if(var_pannotationsnode2 == NULL) {
 var2 = 1;
 } else {
@@ -4228,31 +4548,26 @@ var2 = var_pannotationsnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10014);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10064);
 show_backtrace(1);
 }
-var3 = NEW_parser_nodes__AAtExpr(&type_parser_nodes__AAtExpr);
+var3 = NEW_nit__AAtExpr(&type_nit__AAtExpr);
 {
-parser_prod__AAtExpr__init_aatexpr(var3, var_pannotationsnode2); /* Direct call parser_prod#AAtExpr#init_aatexpr on <var3:AAtExpr>*/
+nit__parser_prod___AAtExpr___init_aatexpr(var3, var_pannotationsnode2); /* Direct call parser_prod#AAtExpr#init_aatexpr on <var3:AAtExpr>*/
 }
 var_pexprnode1 = var3;
 var_node_list = var_pexprnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction404> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction410> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction404#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction404__action(val* self, val* p0) {
-parser__ReduceAction404__action(self, p0); /* Direct call parser#ReduceAction404#action on <self:Object(ReduceAction404)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction405#action for (self: ReduceAction405, Parser) */
-void parser__ReduceAction405__action(val* self, val* p0) {
+/* method parser#ReduceAction411#action for (self: ReduceAction411, Parser) */
+void nit__parser___nit__parser__ReduceAction411___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4270,13 +4585,13 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_tidnode2 = var_nodearraylist1;
 /* <var_tidnode2:nullable Object> isa nullable TId */
-cltype = type_nullable_parser_nodes__TId.color;
-idtype = type_nullable_parser_nodes__TId.id;
+cltype = type_nullable__nit__TId.color;
+idtype = type_nullable__nit__TId.id;
 if(var_tidnode2 == NULL) {
 var2 = 1;
 } else {
@@ -4288,31 +4603,26 @@ var2 = var_tidnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10029);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10079);
 show_backtrace(1);
 }
-var3 = NEW_parser_nodes__AIdAtid(&type_parser_nodes__AIdAtid);
+var3 = NEW_nit__AIdAtid(&type_nit__AIdAtid);
 {
-parser_prod__AIdAtid__init_aidatid(var3, var_tidnode2); /* Direct call parser_prod#AIdAtid#init_aidatid on <var3:AIdAtid>*/
+nit__parser_prod___AIdAtid___init_aidatid(var3, var_tidnode2); /* Direct call parser_prod#AIdAtid#init_aidatid on <var3:AIdAtid>*/
 }
 var_patidnode1 = var3;
 var_node_list = var_patidnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction405> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction411> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction405#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction405__action(val* self, val* p0) {
-parser__ReduceAction405__action(self, p0); /* Direct call parser#ReduceAction405#action on <self:Object(ReduceAction405)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction406#action for (self: ReduceAction406, Parser) */
-void parser__ReduceAction406__action(val* self, val* p0) {
+/* method parser#ReduceAction412#action for (self: ReduceAction412, Parser) */
+void nit__parser___nit__parser__ReduceAction412___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4330,13 +4640,13 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_tkwexternnode2 = var_nodearraylist1;
 /* <var_tkwexternnode2:nullable Object> isa nullable TKwextern */
-cltype = type_nullable_parser_nodes__TKwextern.color;
-idtype = type_nullable_parser_nodes__TKwextern.id;
+cltype = type_nullable__nit__TKwextern.color;
+idtype = type_nullable__nit__TKwextern.id;
 if(var_tkwexternnode2 == NULL) {
 var2 = 1;
 } else {
@@ -4348,31 +4658,26 @@ var2 = var_tkwexternnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10044);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10094);
 show_backtrace(1);
 }
-var3 = NEW_parser_nodes__AKwexternAtid(&type_parser_nodes__AKwexternAtid);
+var3 = NEW_nit__AKwexternAtid(&type_nit__AKwexternAtid);
 {
-parser_prod__AKwexternAtid__init_akwexternatid(var3, var_tkwexternnode2); /* Direct call parser_prod#AKwexternAtid#init_akwexternatid on <var3:AKwexternAtid>*/
+nit__parser_prod___AKwexternAtid___init_akwexternatid(var3, var_tkwexternnode2); /* Direct call parser_prod#AKwexternAtid#init_akwexternatid on <var3:AKwexternAtid>*/
 }
 var_patidnode1 = var3;
 var_node_list = var_patidnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction406> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction412> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction406#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction406__action(val* self, val* p0) {
-parser__ReduceAction406__action(self, p0); /* Direct call parser#ReduceAction406#action on <self:Object(ReduceAction406)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction407#action for (self: ReduceAction407, Parser) */
-void parser__ReduceAction407__action(val* self, val* p0) {
+/* method parser#ReduceAction413#action for (self: ReduceAction413, Parser) */
+void nit__parser___nit__parser__ReduceAction413___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4390,13 +4695,13 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_tkwabstractnode2 = var_nodearraylist1;
 /* <var_tkwabstractnode2:nullable Object> isa nullable TKwabstract */
-cltype = type_nullable_parser_nodes__TKwabstract.color;
-idtype = type_nullable_parser_nodes__TKwabstract.id;
+cltype = type_nullable__nit__TKwabstract.color;
+idtype = type_nullable__nit__TKwabstract.id;
 if(var_tkwabstractnode2 == NULL) {
 var2 = 1;
 } else {
@@ -4408,31 +4713,26 @@ var2 = var_tkwabstractnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var2)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10059);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10109);
 show_backtrace(1);
 }
-var3 = NEW_parser_nodes__AKwabstractAtid(&type_parser_nodes__AKwabstractAtid);
+var3 = NEW_nit__AKwabstractAtid(&type_nit__AKwabstractAtid);
 {
-parser_prod__AKwabstractAtid__init_akwabstractatid(var3, var_tkwabstractnode2); /* Direct call parser_prod#AKwabstractAtid#init_akwabstractatid on <var3:AKwabstractAtid>*/
+nit__parser_prod___AKwabstractAtid___init_akwabstractatid(var3, var_tkwabstractnode2); /* Direct call parser_prod#AKwabstractAtid#init_akwabstractatid on <var3:AKwabstractAtid>*/
 }
 var_patidnode1 = var3;
 var_node_list = var_patidnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction407> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction413> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction407#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction407__action(val* self, val* p0) {
-parser__ReduceAction407__action(self, p0); /* Direct call parser#ReduceAction407#action on <self:Object(ReduceAction407)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction408#action for (self: ReduceAction408, Parser) */
-void parser__ReduceAction408__action(val* self, val* p0) {
+/* method parser#ReduceAction414#action for (self: ReduceAction414, Parser) */
+void nit__parser___nit__parser__ReduceAction414___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4467,30 +4767,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode4 = var5;
 var_toparnode2 = var_nodearraylist1;
 /* <var_toparnode2:nullable Object> isa nullable TOpar */
-cltype = type_nullable_parser_nodes__TOpar.color;
-idtype = type_nullable_parser_nodes__TOpar.id;
+cltype = type_nullable__nit__TOpar.color;
+idtype = type_nullable__nit__TOpar.id;
 if(var_toparnode2 == NULL) {
 var6 = 1;
 } else {
@@ -4502,13 +4802,13 @@ var6 = var_toparnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10078);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10128);
 show_backtrace(1);
 }
 var_listnode3 = var_nodearraylist3;
 /* <var_listnode3:nullable Object> isa Array[Object] */
-cltype8 = type_array__Arraykernel__Object.color;
-idtype9 = type_array__Arraykernel__Object.id;
+cltype8 = type_standard__Array__standard__Object.color;
+idtype9 = type_standard__Array__standard__Object.id;
 if(var_listnode3 == NULL) {
 var7 = 0;
 } else {
@@ -4520,17 +4820,17 @@ var7 = var_listnode3->type->type_table[cltype8] == idtype9;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10080);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10130);
 show_backtrace(1);
 }
 {
-var10 = parser_work__ReduceAction__concat(self, var_listnode4, var_listnode3);
+var10 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode4, var_listnode3);
 }
 var_listnode4 = var10;
 var_tcparnode5 = var_nodearraylist4;
 /* <var_tcparnode5:nullable Object> isa nullable TCpar */
-cltype12 = type_nullable_parser_nodes__TCpar.color;
-idtype13 = type_nullable_parser_nodes__TCpar.id;
+cltype12 = type_nullable__nit__TCpar.color;
+idtype13 = type_nullable__nit__TCpar.id;
 if(var_tcparnode5 == NULL) {
 var11 = 1;
 } else {
@@ -4542,31 +4842,26 @@ var11 = var_tcparnode5->type->type_table[cltype12] == idtype13;
 }
 if (unlikely(!var11)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10083);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10133);
 show_backtrace(1);
 }
-var14 = NEW_parser_nodes__AParExprs(&type_parser_nodes__AParExprs);
+var14 = NEW_nit__AParExprs(&type_nit__AParExprs);
 {
-parser_prod__AParExprs__init_aparexprs(var14, var_toparnode2, var_listnode4, var_tcparnode5); /* Direct call parser_prod#AParExprs#init_aparexprs on <var14:AParExprs>*/
+nit__parser_prod___AParExprs___init_aparexprs(var14, var_toparnode2, var_listnode4, var_tcparnode5); /* Direct call parser_prod#AParExprs#init_aparexprs on <var14:AParExprs>*/
 }
 var_pexprsnode1 = var14;
 var_node_list = var_pexprsnode1;
-var15 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction408> */
+var15 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction414> */
 {
-var16 = parser_work__Parser__go_to(var_p, var15);
+var16 = nit___nit__Parser___go_to(var_p, var15);
 }
 {
-parser_work__Parser__push(var_p, var16, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var16, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction408#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction408__action(val* self, val* p0) {
-parser__ReduceAction408__action(self, p0); /* Direct call parser#ReduceAction408#action on <self:Object(ReduceAction408)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction409#action for (self: ReduceAction409, Parser) */
-void parser__ReduceAction409__action(val* self, val* p0) {
+/* method parser#ReduceAction415#action for (self: ReduceAction415, Parser) */
+void nit__parser___nit__parser__ReduceAction415___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4594,26 +4889,26 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
-var4 = NEW_array__Array(&type_array__Arraykernel__Object);
+var4 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var4->class->vft[COLOR_kernel__Object__init]))(var4) /* init on <var4:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var4); /* Direct call array#Array#init on <var4:Array[Object]>*/
 }
 var_listnode3 = var4;
 var_toparnode2 = var_nodearraylist1;
 /* <var_toparnode2:nullable Object> isa nullable TOpar */
-cltype = type_nullable_parser_nodes__TOpar.color;
-idtype = type_nullable_parser_nodes__TOpar.id;
+cltype = type_nullable__nit__TOpar.color;
+idtype = type_nullable__nit__TOpar.id;
 if(var_toparnode2 == NULL) {
 var5 = 1;
 } else {
@@ -4625,13 +4920,13 @@ var5 = var_toparnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10103);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10153);
 show_backtrace(1);
 }
 var_tcparnode4 = var_nodearraylist3;
 /* <var_tcparnode4:nullable Object> isa nullable TCpar */
-cltype7 = type_nullable_parser_nodes__TCpar.color;
-idtype8 = type_nullable_parser_nodes__TCpar.id;
+cltype7 = type_nullable__nit__TCpar.color;
+idtype8 = type_nullable__nit__TCpar.id;
 if(var_tcparnode4 == NULL) {
 var6 = 1;
 } else {
@@ -4643,31 +4938,26 @@ var6 = var_tcparnode4->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10105);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10155);
 show_backtrace(1);
 }
-var9 = NEW_parser_nodes__AParExprs(&type_parser_nodes__AParExprs);
+var9 = NEW_nit__AParExprs(&type_nit__AParExprs);
 {
-parser_prod__AParExprs__init_aparexprs(var9, var_toparnode2, var_listnode3, var_tcparnode4); /* Direct call parser_prod#AParExprs#init_aparexprs on <var9:AParExprs>*/
+nit__parser_prod___AParExprs___init_aparexprs(var9, var_toparnode2, var_listnode3, var_tcparnode4); /* Direct call parser_prod#AParExprs#init_aparexprs on <var9:AParExprs>*/
 }
 var_pexprsnode1 = var9;
 var_node_list = var_pexprsnode1;
-var10 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction409> */
+var10 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction415> */
 {
-var11 = parser_work__Parser__go_to(var_p, var10);
+var11 = nit___nit__Parser___go_to(var_p, var10);
 }
 {
-parser_work__Parser__push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction409#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction409__action(val* self, val* p0) {
-parser__ReduceAction409__action(self, p0); /* Direct call parser#ReduceAction409#action on <self:Object(ReduceAction409)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction411#action for (self: ReduceAction411, Parser) */
-void parser__ReduceAction411__action(val* self, val* p0) {
+/* method parser#ReduceAction417#action for (self: ReduceAction417, Parser) */
+void nit__parser___nit__parser__ReduceAction417___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4685,27 +4975,26 @@ short int var6 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var8 /* : Bool */;
 short int var9 /* : Bool */;
-short int var10 /* : Bool */;
-val* var11 /* : AListExprs */;
+val* var10 /* : AListExprs */;
 val* var_pexprsnode1 /* var pexprsnode1: nullable AListExprs */;
+long var11 /* : Int */;
 long var12 /* : Int */;
-long var13 /* : Int */;
 var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode3 = var2;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var3 = 1;
 } else {
@@ -4717,7 +5006,7 @@ var3 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10123);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10173);
 show_backtrace(1);
 }
 var4 = NULL;
@@ -4730,11 +5019,10 @@ if (0) {
 { /* Inline kernel#Object#!= (var_pexprnode2,var4) on <var_pexprnode2:nullable Object(nullable AExpr)> */
 var_other = var4;
 {
-var9 = ((short int (*)(val*, val*))(var_pexprnode2->class->vft[COLOR_kernel__Object___61d_61d]))(var_pexprnode2, var_other) /* == on <var_pexprnode2:nullable AExpr(AExpr)>*/;
-var8 = var9;
+var8 = ((short int (*)(val* self, val* p0))(var_pexprnode2->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_pexprnode2, var_other) /* == on <var_pexprnode2:nullable AExpr(AExpr)>*/;
 }
-var10 = !var8;
-var6 = var10;
+var9 = !var8;
+var6 = var9;
 goto RET_LABEL7;
 RET_LABEL7:(void)0;
 }
@@ -4742,32 +5030,27 @@ var5 = var6;
 }
 if (var5){
 {
-array__Array__add(var_listnode3, var_pexprnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pexprnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
-var11 = NEW_parser_nodes__AListExprs(&type_parser_nodes__AListExprs);
+var10 = NEW_nit__AListExprs(&type_nit__AListExprs);
 {
-parser_prod__AListExprs__init_alistexprs(var11, var_listnode3); /* Direct call parser_prod#AListExprs#init_alistexprs on <var11:AListExprs>*/
+nit__parser_prod___AListExprs___init_alistexprs(var10, var_listnode3); /* Direct call parser_prod#AListExprs#init_alistexprs on <var10:AListExprs>*/
 }
-var_pexprsnode1 = var11;
+var_pexprsnode1 = var10;
 var_node_list = var_pexprsnode1;
-var12 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction411> */
+var11 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction417> */
 {
-var13 = parser_work__Parser__go_to(var_p, var12);
+var12 = nit___nit__Parser___go_to(var_p, var11);
 }
 {
-parser_work__Parser__push(var_p, var13, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var12, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction411#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction411__action(val* self, val* p0) {
-parser__ReduceAction411__action(self, p0); /* Direct call parser#ReduceAction411#action on <self:Object(ReduceAction411)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction413#action for (self: ReduceAction413, Parser) */
-void parser__ReduceAction413__action(val* self, val* p0) {
+/* method parser#ReduceAction419#action for (self: ReduceAction419, Parser) */
+void nit__parser___nit__parser__ReduceAction419___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4780,33 +5063,28 @@ long var4 /* : Int */;
 var_p = p0;
 var = NULL;
 var_node_list = var;
-var1 = NEW_array__Array(&type_array__Arraykernel__Object);
+var1 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var1->class->vft[COLOR_kernel__Object__init]))(var1) /* init on <var1:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var1); /* Direct call array#Array#init on <var1:Array[Object]>*/
 }
 var_listnode2 = var1;
-var2 = NEW_parser_nodes__AListExprs(&type_parser_nodes__AListExprs);
+var2 = NEW_nit__AListExprs(&type_nit__AListExprs);
 {
-parser_prod__AListExprs__init_alistexprs(var2, var_listnode2); /* Direct call parser_prod#AListExprs#init_alistexprs on <var2:AListExprs>*/
+nit__parser_prod___AListExprs___init_alistexprs(var2, var_listnode2); /* Direct call parser_prod#AListExprs#init_alistexprs on <var2:AListExprs>*/
 }
 var_pexprsnode1 = var2;
 var_node_list = var_pexprsnode1;
-var3 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction413> */
+var3 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction419> */
 {
-var4 = parser_work__Parser__go_to(var_p, var3);
+var4 = nit___nit__Parser___go_to(var_p, var3);
 }
 {
-parser_work__Parser__push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction413#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction413__action(val* self, val* p0) {
-parser__ReduceAction413__action(self, p0); /* Direct call parser#ReduceAction413#action on <self:Object(ReduceAction413)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction414#action for (self: ReduceAction414, Parser) */
-void parser__ReduceAction414__action(val* self, val* p0) {
+/* method parser#ReduceAction420#action for (self: ReduceAction420, Parser) */
+void nit__parser___nit__parser__ReduceAction420___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4841,30 +5119,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode4 = var5;
 var_tobranode2 = var_nodearraylist1;
 /* <var_tobranode2:nullable Object> isa nullable TObra */
-cltype = type_nullable_parser_nodes__TObra.color;
-idtype = type_nullable_parser_nodes__TObra.id;
+cltype = type_nullable__nit__TObra.color;
+idtype = type_nullable__nit__TObra.id;
 if(var_tobranode2 == NULL) {
 var6 = 1;
 } else {
@@ -4876,13 +5154,13 @@ var6 = var_tobranode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10158);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10208);
 show_backtrace(1);
 }
 var_listnode3 = var_nodearraylist3;
 /* <var_listnode3:nullable Object> isa Array[Object] */
-cltype8 = type_array__Arraykernel__Object.color;
-idtype9 = type_array__Arraykernel__Object.id;
+cltype8 = type_standard__Array__standard__Object.color;
+idtype9 = type_standard__Array__standard__Object.id;
 if(var_listnode3 == NULL) {
 var7 = 0;
 } else {
@@ -4894,17 +5172,17 @@ var7 = var_listnode3->type->type_table[cltype8] == idtype9;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10160);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10210);
 show_backtrace(1);
 }
 {
-var10 = parser_work__ReduceAction__concat(self, var_listnode4, var_listnode3);
+var10 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode4, var_listnode3);
 }
 var_listnode4 = var10;
 var_tcbranode5 = var_nodearraylist4;
 /* <var_tcbranode5:nullable Object> isa nullable TCbra */
-cltype12 = type_nullable_parser_nodes__TCbra.color;
-idtype13 = type_nullable_parser_nodes__TCbra.id;
+cltype12 = type_nullable__nit__TCbra.color;
+idtype13 = type_nullable__nit__TCbra.id;
 if(var_tcbranode5 == NULL) {
 var11 = 1;
 } else {
@@ -4916,31 +5194,26 @@ var11 = var_tcbranode5->type->type_table[cltype12] == idtype13;
 }
 if (unlikely(!var11)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10163);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10213);
 show_backtrace(1);
 }
-var14 = NEW_parser_nodes__ABraExprs(&type_parser_nodes__ABraExprs);
+var14 = NEW_nit__ABraExprs(&type_nit__ABraExprs);
 {
-parser_prod__ABraExprs__init_abraexprs(var14, var_tobranode2, var_listnode4, var_tcbranode5); /* Direct call parser_prod#ABraExprs#init_abraexprs on <var14:ABraExprs>*/
+nit__parser_prod___ABraExprs___init_abraexprs(var14, var_tobranode2, var_listnode4, var_tcbranode5); /* Direct call parser_prod#ABraExprs#init_abraexprs on <var14:ABraExprs>*/
 }
 var_pexprsnode1 = var14;
 var_node_list = var_pexprsnode1;
-var15 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction414> */
+var15 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction420> */
 {
-var16 = parser_work__Parser__go_to(var_p, var15);
+var16 = nit___nit__Parser___go_to(var_p, var15);
 }
 {
-parser_work__Parser__push(var_p, var16, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var16, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction414#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction414__action(val* self, val* p0) {
-parser__ReduceAction414__action(self, p0); /* Direct call parser#ReduceAction414#action on <self:Object(ReduceAction414)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction415#action for (self: ReduceAction415, Parser) */
-void parser__ReduceAction415__action(val* self, val* p0) {
+/* method parser#ReduceAction421#action for (self: ReduceAction421, Parser) */
+void nit__parser___nit__parser__ReduceAction421___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -4961,18 +5234,18 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode3 = var2;
 var_listnode2 = var_nodearraylist1;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var3 = 0;
 } else {
@@ -4984,35 +5257,30 @@ var3 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10181);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10231);
 show_backtrace(1);
 }
 {
-var4 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+var4 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
 }
 var_listnode3 = var4;
-var5 = NEW_parser_nodes__AListExprs(&type_parser_nodes__AListExprs);
+var5 = NEW_nit__AListExprs(&type_nit__AListExprs);
 {
-parser_prod__AListExprs__init_alistexprs(var5, var_listnode3); /* Direct call parser_prod#AListExprs#init_alistexprs on <var5:AListExprs>*/
+nit__parser_prod___AListExprs___init_alistexprs(var5, var_listnode3); /* Direct call parser_prod#AListExprs#init_alistexprs on <var5:AListExprs>*/
 }
 var_pexprsnode1 = var5;
 var_node_list = var_pexprsnode1;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction415> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction421> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction415#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction415__action(val* self, val* p0) {
-parser__ReduceAction415__action(self, p0); /* Direct call parser#ReduceAction415#action on <self:Object(ReduceAction415)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction417#action for (self: ReduceAction417, Parser) */
-void parser__ReduceAction417__action(val* self, val* p0) {
+/* method parser#ReduceAction423#action for (self: ReduceAction423, Parser) */
+void nit__parser___nit__parser__ReduceAction423___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5039,27 +5307,27 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
-var4 = NEW_array__Array(&type_array__Arraykernel__Object);
+var4 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var4->class->vft[COLOR_kernel__Object__init]))(var4) /* init on <var4:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var4); /* Direct call array#Array#init on <var4:Array[Object]>*/
 }
 var_listnode3 = var4;
 var_pexprnode1 = var_nodearraylist1;
 var_listnode2 = var_nodearraylist3;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var5 = 0;
 } else {
@@ -5071,7 +5339,7 @@ var5 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10201);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10251);
 show_backtrace(1);
 }
 var6 = NULL;
@@ -5081,36 +5349,31 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pexprnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexprnode1, var6) /* != on <var_pexprnode1:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pexprnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexprnode1, var6) /* != on <var_pexprnode1:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pexprnode1); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pexprnode1); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 {
-var9 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+var9 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
 }
 var_listnode3 = var9;
 var_node_list = var_listnode3;
-var10 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction417> */
+var10 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction423> */
 {
-var11 = parser_work__Parser__go_to(var_p, var10);
+var11 = nit___nit__Parser___go_to(var_p, var10);
 }
 {
-parser_work__Parser__push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction417#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction417__action(val* self, val* p0) {
-parser__ReduceAction417__action(self, p0); /* Direct call parser#ReduceAction417#action on <self:Object(ReduceAction417)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction418#action for (self: ReduceAction418, Parser) */
-void parser__ReduceAction418__action(val* self, val* p0) {
+/* method parser#ReduceAction424#action for (self: ReduceAction424, Parser) */
+void nit__parser___nit__parser__ReduceAction424___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5129,39 +5392,34 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
 var_pexprnode1 = var_nodearraylist3;
 var_node_list = var_pexprnode1;
-var5 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction418> */
+var5 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction424> */
 {
-var6 = parser_work__Parser__go_to(var_p, var5);
+var6 = nit___nit__Parser___go_to(var_p, var5);
 }
 {
-parser_work__Parser__push(var_p, var6, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var6, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction418#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction418__action(val* self, val* p0) {
-parser__ReduceAction418__action(self, p0); /* Direct call parser#ReduceAction418#action on <self:Object(ReduceAction418)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction419#action for (self: ReduceAction419, Parser) */
-void parser__ReduceAction419__action(val* self, val* p0) {
+/* method parser#ReduceAction425#action for (self: ReduceAction425, Parser) */
+void nit__parser___nit__parser__ReduceAction425___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5188,34 +5446,34 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist5 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var4;
 {
-var5 = parser_work__Parser__pop(var_p);
+var5 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var5;
-var6 = NEW_array__Array(&type_array__Arraykernel__Object);
+var6 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var6->class->vft[COLOR_kernel__Object__init]))(var6) /* init on <var6:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var6); /* Direct call array#Array#init on <var6:Array[Object]>*/
 }
 var_listnode2 = var6;
 var_listnode1 = var_nodearraylist3;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var7 = 0;
 } else {
@@ -5227,30 +5485,25 @@ var7 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10236);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10286);
 show_backtrace(1);
 }
 {
-var8 = parser_work__ReduceAction__concat(self, var_listnode2, var_listnode1);
+var8 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode2, var_listnode1);
 }
 var_listnode2 = var8;
 var_node_list = var_listnode2;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction419> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction425> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction419#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction419__action(val* self, val* p0) {
-parser__ReduceAction419__action(self, p0); /* Direct call parser#ReduceAction419#action on <self:Object(ReduceAction419)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction420#action for (self: ReduceAction420, Parser) */
-void parser__ReduceAction420__action(val* self, val* p0) {
+/* method parser#ReduceAction426#action for (self: ReduceAction426, Parser) */
+void nit__parser___nit__parser__ReduceAction426___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5269,18 +5522,18 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var3 = 0;
 } else {
@@ -5292,30 +5545,25 @@ var3 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10250);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10300);
 show_backtrace(1);
 }
 {
-var4 = parser_work__ReduceAction__concat(self, var_listnode2, var_listnode1);
+var4 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode2, var_listnode1);
 }
 var_listnode2 = var4;
 var_node_list = var_listnode2;
-var5 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction420> */
+var5 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction426> */
 {
-var6 = parser_work__Parser__go_to(var_p, var5);
+var6 = nit___nit__Parser___go_to(var_p, var5);
 }
 {
-parser_work__Parser__push(var_p, var6, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var6, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction420#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction420__action(val* self, val* p0) {
-parser__ReduceAction420__action(self, p0); /* Direct call parser#ReduceAction420#action on <self:Object(ReduceAction420)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction421#action for (self: ReduceAction421, Parser) */
-void parser__ReduceAction421__action(val* self, val* p0) {
+/* method parser#ReduceAction427#action for (self: ReduceAction427, Parser) */
+void nit__parser___nit__parser__ReduceAction427___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5333,12 +5581,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_tidnode1 = var_nodearraylist1;
@@ -5349,32 +5597,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_tidnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_tidnode1, var3) /* != on <var_tidnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_tidnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_tidnode1, var3) /* != on <var_tidnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_tidnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_tidnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction421> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction427> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction421#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction421__action(val* self, val* p0) {
-parser__ReduceAction421__action(self, p0); /* Direct call parser#ReduceAction421#action on <self:Object(ReduceAction421)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction422#action for (self: ReduceAction422, Parser) */
-void parser__ReduceAction422__action(val* self, val* p0) {
+/* method parser#ReduceAction428#action for (self: ReduceAction428, Parser) */
+void nit__parser___nit__parser__ReduceAction428___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5403,30 +5646,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode3 = var5;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var6 = 0;
 } else {
@@ -5438,12 +5681,12 @@ var6 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10282);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10332);
 show_backtrace(1);
 }
 var_tidnode2 = var_nodearraylist4;
 {
-var7 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var7 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var7;
 var8 = NULL;
@@ -5453,32 +5696,27 @@ var9 = 0; /* is null */
 var9 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var10 = ((short int (*)(val*, val*))(var_tidnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_tidnode2, var8) /* != on <var_tidnode2:nullable Object>*/;
+var10 = ((short int (*)(val* self, val* p0))(var_tidnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_tidnode2, var8) /* != on <var_tidnode2:nullable Object>*/;
 var9 = var10;
 }
 if (var9){
 {
-array__Array__add(var_listnode3, var_tidnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_tidnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var11 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction422> */
+var11 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction428> */
 {
-var12 = parser_work__Parser__go_to(var_p, var11);
+var12 = nit___nit__Parser___go_to(var_p, var11);
 }
 {
-parser_work__Parser__push(var_p, var12, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var12, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction422#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction422__action(val* self, val* p0) {
-parser__ReduceAction422__action(self, p0); /* Direct call parser#ReduceAction422#action on <self:Object(ReduceAction422)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction423#action for (self: ReduceAction423, Parser) */
-void parser__ReduceAction423__action(val* self, val* p0) {
+/* method parser#ReduceAction429#action for (self: ReduceAction429, Parser) */
+void nit__parser___nit__parser__ReduceAction429___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5499,18 +5737,18 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode3 = var2;
 var_tidnode4 = var_nodearraylist1;
 /* <var_tidnode4:nullable Object> isa nullable TId */
-cltype = type_nullable_parser_nodes__TId.color;
-idtype = type_nullable_parser_nodes__TId.id;
+cltype = type_nullable__nit__TId.color;
+idtype = type_nullable__nit__TId.id;
 if(var_tidnode4 == NULL) {
 var3 = 1;
 } else {
@@ -5522,32 +5760,27 @@ var3 = var_tidnode4->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10300);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10350);
 show_backtrace(1);
 }
-var4 = NEW_parser_nodes__AModuleName(&type_parser_nodes__AModuleName);
+var4 = NEW_nit__AModuleName(&type_nit__AModuleName);
 var5 = NULL;
 {
-parser_prod__AModuleName__init_amodulename(var4, var5, var_listnode3, var_tidnode4); /* Direct call parser_prod#AModuleName#init_amodulename on <var4:AModuleName>*/
+nit__parser_prod___AModuleName___init_amodulename(var4, var5, var_listnode3, var_tidnode4); /* Direct call parser_prod#AModuleName#init_amodulename on <var4:AModuleName>*/
 }
 var_pmodulenamenode1 = var4;
 var_node_list = var_pmodulenamenode1;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction423> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction429> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction423#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction423__action(val* self, val* p0) {
-parser__ReduceAction423__action(self, p0); /* Direct call parser#ReduceAction423#action on <self:Object(ReduceAction423)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction424#action for (self: ReduceAction424, Parser) */
-void parser__ReduceAction424__action(val* self, val* p0) {
+/* method parser#ReduceAction430#action for (self: ReduceAction430, Parser) */
+void nit__parser___nit__parser__ReduceAction430___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5575,22 +5808,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode4 = var3;
 var_listnode3 = var_nodearraylist1;
 /* <var_listnode3:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode3 == NULL) {
 var4 = 0;
 } else {
@@ -5602,17 +5835,17 @@ var4 = var_listnode3->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10319);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10369);
 show_backtrace(1);
 }
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode4, var_listnode3);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode4, var_listnode3);
 }
 var_listnode4 = var5;
 var_tidnode5 = var_nodearraylist2;
 /* <var_tidnode5:nullable Object> isa nullable TId */
-cltype7 = type_nullable_parser_nodes__TId.color;
-idtype8 = type_nullable_parser_nodes__TId.id;
+cltype7 = type_nullable__nit__TId.color;
+idtype8 = type_nullable__nit__TId.id;
 if(var_tidnode5 == NULL) {
 var6 = 1;
 } else {
@@ -5624,32 +5857,27 @@ var6 = var_tidnode5->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10322);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10372);
 show_backtrace(1);
 }
-var9 = NEW_parser_nodes__AModuleName(&type_parser_nodes__AModuleName);
+var9 = NEW_nit__AModuleName(&type_nit__AModuleName);
 var10 = NULL;
 {
-parser_prod__AModuleName__init_amodulename(var9, var10, var_listnode4, var_tidnode5); /* Direct call parser_prod#AModuleName#init_amodulename on <var9:AModuleName>*/
+nit__parser_prod___AModuleName___init_amodulename(var9, var10, var_listnode4, var_tidnode5); /* Direct call parser_prod#AModuleName#init_amodulename on <var9:AModuleName>*/
 }
 var_pmodulenamenode1 = var9;
 var_node_list = var_pmodulenamenode1;
-var11 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction424> */
+var11 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction430> */
 {
-var12 = parser_work__Parser__go_to(var_p, var11);
+var12 = nit___nit__Parser___go_to(var_p, var11);
 }
 {
-parser_work__Parser__push(var_p, var12, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var12, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction424#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction424__action(val* self, val* p0) {
-parser__ReduceAction424__action(self, p0); /* Direct call parser#ReduceAction424#action on <self:Object(ReduceAction424)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction425#action for (self: ReduceAction425, Parser) */
-void parser__ReduceAction425__action(val* self, val* p0) {
+/* method parser#ReduceAction431#action for (self: ReduceAction431, Parser) */
+void nit__parser___nit__parser__ReduceAction431___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5677,26 +5905,26 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
-var4 = NEW_array__Array(&type_array__Arraykernel__Object);
+var4 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var4->class->vft[COLOR_kernel__Object__init]))(var4) /* init on <var4:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var4); /* Direct call array#Array#init on <var4:Array[Object]>*/
 }
 var_listnode3 = var4;
 var_tquadnode2 = var_nodearraylist1;
 /* <var_tquadnode2:nullable Object> isa nullable TQuad */
-cltype = type_nullable_parser_nodes__TQuad.color;
-idtype = type_nullable_parser_nodes__TQuad.id;
+cltype = type_nullable__nit__TQuad.color;
+idtype = type_nullable__nit__TQuad.id;
 if(var_tquadnode2 == NULL) {
 var5 = 1;
 } else {
@@ -5708,13 +5936,13 @@ var5 = var_tquadnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10342);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10392);
 show_backtrace(1);
 }
 var_tidnode4 = var_nodearraylist3;
 /* <var_tidnode4:nullable Object> isa nullable TId */
-cltype7 = type_nullable_parser_nodes__TId.color;
-idtype8 = type_nullable_parser_nodes__TId.id;
+cltype7 = type_nullable__nit__TId.color;
+idtype8 = type_nullable__nit__TId.id;
 if(var_tidnode4 == NULL) {
 var6 = 1;
 } else {
@@ -5726,31 +5954,26 @@ var6 = var_tidnode4->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10344);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10394);
 show_backtrace(1);
 }
-var9 = NEW_parser_nodes__AModuleName(&type_parser_nodes__AModuleName);
+var9 = NEW_nit__AModuleName(&type_nit__AModuleName);
 {
-parser_prod__AModuleName__init_amodulename(var9, var_tquadnode2, var_listnode3, var_tidnode4); /* Direct call parser_prod#AModuleName#init_amodulename on <var9:AModuleName>*/
+nit__parser_prod___AModuleName___init_amodulename(var9, var_tquadnode2, var_listnode3, var_tidnode4); /* Direct call parser_prod#AModuleName#init_amodulename on <var9:AModuleName>*/
 }
 var_pmodulenamenode1 = var9;
 var_node_list = var_pmodulenamenode1;
-var10 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction425> */
+var10 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction431> */
 {
-var11 = parser_work__Parser__go_to(var_p, var10);
+var11 = nit___nit__Parser___go_to(var_p, var10);
 }
 {
-parser_work__Parser__push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction425#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction425__action(val* self, val* p0) {
-parser__ReduceAction425__action(self, p0); /* Direct call parser#ReduceAction425#action on <self:Object(ReduceAction425)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction426#action for (self: ReduceAction426, Parser) */
-void parser__ReduceAction426__action(val* self, val* p0) {
+/* method parser#ReduceAction432#action for (self: ReduceAction432, Parser) */
+void nit__parser___nit__parser__ReduceAction432___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5785,30 +6008,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
-var5 = NEW_array__Array(&type_array__Arraykernel__Object);
+var5 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var5->class->vft[COLOR_kernel__Object__init]))(var5) /* init on <var5:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var5); /* Direct call array#Array#init on <var5:Array[Object]>*/
 }
 var_listnode4 = var5;
 var_tquadnode2 = var_nodearraylist1;
 /* <var_tquadnode2:nullable Object> isa nullable TQuad */
-cltype = type_nullable_parser_nodes__TQuad.color;
-idtype = type_nullable_parser_nodes__TQuad.id;
+cltype = type_nullable__nit__TQuad.color;
+idtype = type_nullable__nit__TQuad.id;
 if(var_tquadnode2 == NULL) {
 var6 = 1;
 } else {
@@ -5820,13 +6043,13 @@ var6 = var_tquadnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10365);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10415);
 show_backtrace(1);
 }
 var_listnode3 = var_nodearraylist3;
 /* <var_listnode3:nullable Object> isa Array[Object] */
-cltype8 = type_array__Arraykernel__Object.color;
-idtype9 = type_array__Arraykernel__Object.id;
+cltype8 = type_standard__Array__standard__Object.color;
+idtype9 = type_standard__Array__standard__Object.id;
 if(var_listnode3 == NULL) {
 var7 = 0;
 } else {
@@ -5838,17 +6061,17 @@ var7 = var_listnode3->type->type_table[cltype8] == idtype9;
 }
 if (unlikely(!var7)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10367);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10417);
 show_backtrace(1);
 }
 {
-var10 = parser_work__ReduceAction__concat(self, var_listnode4, var_listnode3);
+var10 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode4, var_listnode3);
 }
 var_listnode4 = var10;
 var_tidnode5 = var_nodearraylist4;
 /* <var_tidnode5:nullable Object> isa nullable TId */
-cltype12 = type_nullable_parser_nodes__TId.color;
-idtype13 = type_nullable_parser_nodes__TId.id;
+cltype12 = type_nullable__nit__TId.color;
+idtype13 = type_nullable__nit__TId.id;
 if(var_tidnode5 == NULL) {
 var11 = 1;
 } else {
@@ -5860,31 +6083,26 @@ var11 = var_tidnode5->type->type_table[cltype12] == idtype13;
 }
 if (unlikely(!var11)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10370);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10420);
 show_backtrace(1);
 }
-var14 = NEW_parser_nodes__AModuleName(&type_parser_nodes__AModuleName);
+var14 = NEW_nit__AModuleName(&type_nit__AModuleName);
 {
-parser_prod__AModuleName__init_amodulename(var14, var_tquadnode2, var_listnode4, var_tidnode5); /* Direct call parser_prod#AModuleName#init_amodulename on <var14:AModuleName>*/
+nit__parser_prod___AModuleName___init_amodulename(var14, var_tquadnode2, var_listnode4, var_tidnode5); /* Direct call parser_prod#AModuleName#init_amodulename on <var14:AModuleName>*/
 }
 var_pmodulenamenode1 = var14;
 var_node_list = var_pmodulenamenode1;
-var15 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction426> */
+var15 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction432> */
 {
-var16 = parser_work__Parser__go_to(var_p, var15);
+var16 = nit___nit__Parser___go_to(var_p, var15);
 }
 {
-parser_work__Parser__push(var_p, var16, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var16, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction426#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction426__action(val* self, val* p0) {
-parser__ReduceAction426__action(self, p0); /* Direct call parser#ReduceAction426#action on <self:Object(ReduceAction426)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction427#action for (self: ReduceAction427, Parser) */
-void parser__ReduceAction427__action(val* self, val* p0) {
+/* method parser#ReduceAction433#action for (self: ReduceAction433, Parser) */
+void nit__parser___nit__parser__ReduceAction433___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5904,18 +6122,18 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_tclassidnode3 = var_nodearraylist1;
 /* <var_tclassidnode3:nullable Object> isa nullable TClassid */
-cltype = type_nullable_parser_nodes__TClassid.color;
-idtype = type_nullable_parser_nodes__TClassid.id;
+cltype = type_nullable__nit__TClassid.color;
+idtype = type_nullable__nit__TClassid.id;
 if(var_tclassidnode3 == NULL) {
 var3 = 1;
 } else {
@@ -5927,31 +6145,26 @@ var3 = var_tclassidnode3->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10388);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10438);
 show_backtrace(1);
 }
-var4 = NEW_parser_nodes__AQualified(&type_parser_nodes__AQualified);
+var4 = NEW_nit__AQualified(&type_nit__AQualified);
 {
-parser_prod__AQualified__init_aqualified(var4, var_listnode2, var_tclassidnode3); /* Direct call parser_prod#AQualified#init_aqualified on <var4:AQualified>*/
+nit__parser_prod___AQualified___init_aqualified(var4, var_listnode2, var_tclassidnode3); /* Direct call parser_prod#AQualified#init_aqualified on <var4:AQualified>*/
 }
 var_pqualifiednode1 = var4;
 var_node_list = var_pqualifiednode1;
-var5 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction427> */
+var5 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction433> */
 {
-var6 = parser_work__Parser__go_to(var_p, var5);
+var6 = nit___nit__Parser___go_to(var_p, var5);
 }
 {
-parser_work__Parser__push(var_p, var6, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var6, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction427#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction427__action(val* self, val* p0) {
-parser__ReduceAction427__action(self, p0); /* Direct call parser#ReduceAction427#action on <self:Object(ReduceAction427)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction428#action for (self: ReduceAction428, Parser) */
-void parser__ReduceAction428__action(val* self, val* p0) {
+/* method parser#ReduceAction434#action for (self: ReduceAction434, Parser) */
+void nit__parser___nit__parser__ReduceAction434___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -5978,22 +6191,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode2 = var_nodearraylist1;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var4 = 0;
 } else {
@@ -6005,17 +6218,17 @@ var4 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10406);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10456);
 show_backtrace(1);
 }
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
 }
 var_listnode3 = var5;
 var_tclassidnode4 = var_nodearraylist2;
 /* <var_tclassidnode4:nullable Object> isa nullable TClassid */
-cltype7 = type_nullable_parser_nodes__TClassid.color;
-idtype8 = type_nullable_parser_nodes__TClassid.id;
+cltype7 = type_nullable__nit__TClassid.color;
+idtype8 = type_nullable__nit__TClassid.id;
 if(var_tclassidnode4 == NULL) {
 var6 = 1;
 } else {
@@ -6027,31 +6240,26 @@ var6 = var_tclassidnode4->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10409);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10459);
 show_backtrace(1);
 }
-var9 = NEW_parser_nodes__AQualified(&type_parser_nodes__AQualified);
+var9 = NEW_nit__AQualified(&type_nit__AQualified);
 {
-parser_prod__AQualified__init_aqualified(var9, var_listnode3, var_tclassidnode4); /* Direct call parser_prod#AQualified#init_aqualified on <var9:AQualified>*/
+nit__parser_prod___AQualified___init_aqualified(var9, var_listnode3, var_tclassidnode4); /* Direct call parser_prod#AQualified#init_aqualified on <var9:AQualified>*/
 }
 var_pqualifiednode1 = var9;
 var_node_list = var_pqualifiednode1;
-var10 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction428> */
+var10 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction434> */
 {
-var11 = parser_work__Parser__go_to(var_p, var10);
+var11 = nit___nit__Parser___go_to(var_p, var10);
 }
 {
-parser_work__Parser__push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction428#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction428__action(val* self, val* p0) {
-parser__ReduceAction428__action(self, p0); /* Direct call parser#ReduceAction428#action on <self:Object(ReduceAction428)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction429#action for (self: ReduceAction429, Parser) */
-void parser__ReduceAction429__action(val* self, val* p0) {
+/* method parser#ReduceAction435#action for (self: ReduceAction435, Parser) */
+void nit__parser___nit__parser__ReduceAction435___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6073,18 +6281,18 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode3 = var2;
 var_listnode2 = var_nodearraylist1;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var3 = 0;
 } else {
@@ -6096,36 +6304,31 @@ var3 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10426);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10476);
 show_backtrace(1);
 }
 {
-var4 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+var4 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
 }
 var_listnode3 = var4;
-var5 = NEW_parser_nodes__AQualified(&type_parser_nodes__AQualified);
+var5 = NEW_nit__AQualified(&type_nit__AQualified);
 var6 = NULL;
 {
-parser_prod__AQualified__init_aqualified(var5, var_listnode3, var6); /* Direct call parser_prod#AQualified#init_aqualified on <var5:AQualified>*/
+nit__parser_prod___AQualified___init_aqualified(var5, var_listnode3, var6); /* Direct call parser_prod#AQualified#init_aqualified on <var5:AQualified>*/
 }
 var_pqualifiednode1 = var5;
 var_node_list = var_pqualifiednode1;
-var7 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction429> */
+var7 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction435> */
 {
-var8 = parser_work__Parser__go_to(var_p, var7);
+var8 = nit___nit__Parser___go_to(var_p, var7);
 }
 {
-parser_work__Parser__push(var_p, var8, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var8, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction429#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction429__action(val* self, val* p0) {
-parser__ReduceAction429__action(self, p0); /* Direct call parser#ReduceAction429#action on <self:Object(ReduceAction429)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction431#action for (self: ReduceAction431, Parser) */
-void parser__ReduceAction431__action(val* self, val* p0) {
+/* method parser#ReduceAction437#action for (self: ReduceAction437, Parser) */
+void nit__parser___nit__parser__ReduceAction437___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6138,27 +6341,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_tclassidnode1 = var_nodearraylist1;
 var_node_list = var_tclassidnode1;
-var2 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction431> */
+var2 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction437> */
 {
-var3 = parser_work__Parser__go_to(var_p, var2);
+var3 = nit___nit__Parser___go_to(var_p, var2);
 }
 {
-parser_work__Parser__push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction431#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction431__action(val* self, val* p0) {
-parser__ReduceAction431__action(self, p0); /* Direct call parser#ReduceAction431#action on <self:Object(ReduceAction431)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction432#action for (self: ReduceAction432, Parser) */
-void parser__ReduceAction432__action(val* self, val* p0) {
+/* method parser#ReduceAction438#action for (self: ReduceAction438, Parser) */
+void nit__parser___nit__parser__ReduceAction438___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6173,31 +6371,26 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
 var_tclassidnode1 = var_nodearraylist2;
 var_node_list = var_tclassidnode1;
-var3 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction432> */
+var3 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction438> */
 {
-var4 = parser_work__Parser__go_to(var_p, var3);
+var4 = nit___nit__Parser___go_to(var_p, var3);
 }
 {
-parser_work__Parser__push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction432#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction432__action(val* self, val* p0) {
-parser__ReduceAction432__action(self, p0); /* Direct call parser#ReduceAction432#action on <self:Object(ReduceAction432)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction433#action for (self: ReduceAction433, Parser) */
-void parser__ReduceAction433__action(val* self, val* p0) {
+/* method parser#ReduceAction439#action for (self: ReduceAction439, Parser) */
+void nit__parser___nit__parser__ReduceAction439___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6214,35 +6407,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_tclassidnode1 = var_nodearraylist3;
 var_node_list = var_tclassidnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction433> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction439> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction433#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction433__action(val* self, val* p0) {
-parser__ReduceAction433__action(self, p0); /* Direct call parser#ReduceAction433#action on <self:Object(ReduceAction433)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction435#action for (self: ReduceAction435, Parser) */
-void parser__ReduceAction435__action(val* self, val* p0) {
+/* method parser#ReduceAction441#action for (self: ReduceAction441, Parser) */
+void nit__parser___nit__parser__ReduceAction441___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6255,27 +6443,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_pmethidnode1 = var_nodearraylist1;
 var_node_list = var_pmethidnode1;
-var2 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction435> */
+var2 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction441> */
 {
-var3 = parser_work__Parser__go_to(var_p, var2);
+var3 = nit___nit__Parser___go_to(var_p, var2);
 }
 {
-parser_work__Parser__push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction435#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction435__action(val* self, val* p0) {
-parser__ReduceAction435__action(self, p0); /* Direct call parser#ReduceAction435#action on <self:Object(ReduceAction435)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction436#action for (self: ReduceAction436, Parser) */
-void parser__ReduceAction436__action(val* self, val* p0) {
+/* method parser#ReduceAction442#action for (self: ReduceAction442, Parser) */
+void nit__parser___nit__parser__ReduceAction442___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6290,31 +6473,26 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
 var_pmethidnode1 = var_nodearraylist2;
 var_node_list = var_pmethidnode1;
-var3 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction436> */
+var3 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction442> */
 {
-var4 = parser_work__Parser__go_to(var_p, var3);
+var4 = nit___nit__Parser___go_to(var_p, var3);
 }
 {
-parser_work__Parser__push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction436#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction436__action(val* self, val* p0) {
-parser__ReduceAction436__action(self, p0); /* Direct call parser#ReduceAction436#action on <self:Object(ReduceAction436)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction437#action for (self: ReduceAction437, Parser) */
-void parser__ReduceAction437__action(val* self, val* p0) {
+/* method parser#ReduceAction443#action for (self: ReduceAction443, Parser) */
+void nit__parser___nit__parser__ReduceAction443___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6331,35 +6509,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_pmethidnode1 = var_nodearraylist3;
 var_node_list = var_pmethidnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction437> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction443> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction437#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction437__action(val* self, val* p0) {
-parser__ReduceAction437__action(self, p0); /* Direct call parser#ReduceAction437#action on <self:Object(ReduceAction437)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction439#action for (self: ReduceAction439, Parser) */
-void parser__ReduceAction439__action(val* self, val* p0) {
+/* method parser#ReduceAction445#action for (self: ReduceAction445, Parser) */
+void nit__parser___nit__parser__ReduceAction445___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6376,35 +6549,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_tidnode1 = var_nodearraylist1;
 var_node_list = var_tidnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction439> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction445> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction439#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction439__action(val* self, val* p0) {
-parser__ReduceAction439__action(self, p0); /* Direct call parser#ReduceAction439#action on <self:Object(ReduceAction439)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction440#action for (self: ReduceAction440, Parser) */
-void parser__ReduceAction440__action(val* self, val* p0) {
+/* method parser#ReduceAction446#action for (self: ReduceAction446, Parser) */
+void nit__parser___nit__parser__ReduceAction446___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6421,35 +6589,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_tclassidnode1 = var_nodearraylist1;
 var_node_list = var_tclassidnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction440> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction446> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction440#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction440__action(val* self, val* p0) {
-parser__ReduceAction440__action(self, p0); /* Direct call parser#ReduceAction440#action on <self:Object(ReduceAction440)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction442#action for (self: ReduceAction442, Parser) */
-void parser__ReduceAction442__action(val* self, val* p0) {
+/* method parser#ReduceAction448#action for (self: ReduceAction448, Parser) */
+void nit__parser___nit__parser__ReduceAction448___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6462,27 +6625,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_tkwendnode1 = var_nodearraylist1;
 var_node_list = var_tkwendnode1;
-var2 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction442> */
+var2 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction448> */
 {
-var3 = parser_work__Parser__go_to(var_p, var2);
+var3 = nit___nit__Parser___go_to(var_p, var2);
 }
 {
-parser_work__Parser__push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction442#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction442__action(val* self, val* p0) {
-parser__ReduceAction442__action(self, p0); /* Direct call parser#ReduceAction442#action on <self:Object(ReduceAction442)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction443#action for (self: ReduceAction443, Parser) */
-void parser__ReduceAction443__action(val* self, val* p0) {
+/* method parser#ReduceAction449#action for (self: ReduceAction449, Parser) */
+void nit__parser___nit__parser__ReduceAction449___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6494,25 +6652,20 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction443> */
+var2 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction449> */
 {
-var3 = parser_work__Parser__go_to(var_p, var2);
+var3 = nit___nit__Parser___go_to(var_p, var2);
 }
 {
-parser_work__Parser__push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction443#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction443__action(val* self, val* p0) {
-parser__ReduceAction443__action(self, p0); /* Direct call parser#ReduceAction443#action on <self:Object(ReduceAction443)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction445#action for (self: ReduceAction445, Parser) */
-void parser__ReduceAction445__action(val* self, val* p0) {
+/* method parser#ReduceAction451#action for (self: ReduceAction451, Parser) */
+void nit__parser___nit__parser__ReduceAction451___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6533,18 +6686,18 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode3 = var2;
 var_listnode2 = var_nodearraylist1;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var3 = 0;
 } else {
@@ -6556,35 +6709,30 @@ var3 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10562);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10612);
 show_backtrace(1);
 }
 {
-var4 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+var4 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
 }
 var_listnode3 = var4;
-var5 = NEW_parser_nodes__ADoc(&type_parser_nodes__ADoc);
+var5 = NEW_nit__ADoc(&type_nit__ADoc);
 {
-parser_prod__ADoc__init_adoc(var5, var_listnode3); /* Direct call parser_prod#ADoc#init_adoc on <var5:ADoc>*/
+nit__parser_prod___ADoc___init_adoc(var5, var_listnode3); /* Direct call parser_prod#ADoc#init_adoc on <var5:ADoc>*/
 }
 var_pdocnode1 = var5;
 var_node_list = var_pdocnode1;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction445> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction451> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction445#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction445__action(val* self, val* p0) {
-parser__ReduceAction445__action(self, p0); /* Direct call parser#ReduceAction445#action on <self:Object(ReduceAction445)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction446#action for (self: ReduceAction446, Parser) */
-void parser__ReduceAction446__action(val* self, val* p0) {
+/* method parser#ReduceAction452#action for (self: ReduceAction452, Parser) */
+void nit__parser___nit__parser__ReduceAction452___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6607,22 +6755,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode2 = var_nodearraylist2;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var4 = 0;
 } else {
@@ -6634,35 +6782,30 @@ var4 = var_listnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10580);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10630);
 show_backtrace(1);
 }
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
 }
 var_listnode3 = var5;
-var6 = NEW_parser_nodes__ADoc(&type_parser_nodes__ADoc);
+var6 = NEW_nit__ADoc(&type_nit__ADoc);
 {
-parser_prod__ADoc__init_adoc(var6, var_listnode3); /* Direct call parser_prod#ADoc#init_adoc on <var6:ADoc>*/
+nit__parser_prod___ADoc___init_adoc(var6, var_listnode3); /* Direct call parser_prod#ADoc#init_adoc on <var6:ADoc>*/
 }
 var_pdocnode1 = var6;
 var_node_list = var_pdocnode1;
-var7 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction446> */
+var7 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction452> */
 {
-var8 = parser_work__Parser__go_to(var_p, var7);
+var8 = nit___nit__Parser___go_to(var_p, var7);
 }
 {
-parser_work__Parser__push(var_p, var8, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var8, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction446#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction446__action(val* self, val* p0) {
-parser__ReduceAction446__action(self, p0); /* Direct call parser#ReduceAction446#action on <self:Object(ReduceAction446)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction449#action for (self: ReduceAction449, Parser) */
-void parser__ReduceAction449__action(val* self, val* p0) {
+/* method parser#ReduceAction455#action for (self: ReduceAction455, Parser) */
+void nit__parser___nit__parser__ReduceAction455___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6675,27 +6818,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
 var_pdocnode1 = var_nodearraylist1;
 var_node_list = var_pdocnode1;
-var2 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction449> */
+var2 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction455> */
 {
-var3 = parser_work__Parser__go_to(var_p, var2);
+var3 = nit___nit__Parser___go_to(var_p, var2);
 }
 {
-parser_work__Parser__push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var3, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction449#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction449__action(val* self, val* p0) {
-parser__ReduceAction449__action(self, p0); /* Direct call parser#ReduceAction449#action on <self:Object(ReduceAction449)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction450#action for (self: ReduceAction450, Parser) */
-void parser__ReduceAction450__action(val* self, val* p0) {
+/* method parser#ReduceAction456#action for (self: ReduceAction456, Parser) */
+void nit__parser___nit__parser__ReduceAction456___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6709,29 +6847,24 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction450> */
+var3 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction456> */
 {
-var4 = parser_work__Parser__go_to(var_p, var3);
+var4 = nit___nit__Parser___go_to(var_p, var3);
 }
 {
-parser_work__Parser__push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction450#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction450__action(val* self, val* p0) {
-parser__ReduceAction450__action(self, p0); /* Direct call parser#ReduceAction450#action on <self:Object(ReduceAction450)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction451#action for (self: ReduceAction451, Parser) */
-void parser__ReduceAction451__action(val* self, val* p0) {
+/* method parser#ReduceAction457#action for (self: ReduceAction457, Parser) */
+void nit__parser___nit__parser__ReduceAction457___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6747,33 +6880,28 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction451> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction457> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction451#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction451__action(val* self, val* p0) {
-parser__ReduceAction451__action(self, p0); /* Direct call parser#ReduceAction451#action on <self:Object(ReduceAction451)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction780#action for (self: ReduceAction780, Parser) */
-void parser__ReduceAction780__action(val* self, val* p0) {
+/* method parser#ReduceAction786#action for (self: ReduceAction786, Parser) */
+void nit__parser___nit__parser__ReduceAction786___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6805,25 +6933,25 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
 var_tkwissetnode2 = var_nodearraylist1;
 /* <var_tkwissetnode2:nullable Object> isa nullable TKwisset */
-cltype = type_nullable_parser_nodes__TKwisset.color;
-idtype = type_nullable_parser_nodes__TKwisset.id;
+cltype = type_nullable__nit__TKwisset.color;
+idtype = type_nullable__nit__TKwisset.id;
 if(var_tkwissetnode2 == NULL) {
 var5 = 1;
 } else {
@@ -6835,13 +6963,13 @@ var5 = var_tkwissetnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10631);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10681);
 show_backtrace(1);
 }
 var_pexprnode3 = var_nodearraylist2;
 /* <var_pexprnode3:nullable Object> isa nullable AExpr */
-cltype7 = type_nullable_parser_nodes__AExpr.color;
-idtype8 = type_nullable_parser_nodes__AExpr.id;
+cltype7 = type_nullable__nit__AExpr.color;
+idtype8 = type_nullable__nit__AExpr.id;
 if(var_pexprnode3 == NULL) {
 var6 = 1;
 } else {
@@ -6853,13 +6981,13 @@ var6 = var_pexprnode3->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10633);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10683);
 show_backtrace(1);
 }
 var_tattridnode4 = var_nodearraylist4;
 /* <var_tattridnode4:nullable Object> isa nullable TAttrid */
-cltype10 = type_nullable_parser_nodes__TAttrid.color;
-idtype11 = type_nullable_parser_nodes__TAttrid.id;
+cltype10 = type_nullable__nit__TAttrid.color;
+idtype11 = type_nullable__nit__TAttrid.id;
 if(var_tattridnode4 == NULL) {
 var9 = 1;
 } else {
@@ -6871,31 +6999,26 @@ var9 = var_tattridnode4->type->type_table[cltype10] == idtype11;
 }
 if (unlikely(!var9)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10635);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10685);
 show_backtrace(1);
 }
-var12 = NEW_parser_nodes__AIssetAttrExpr(&type_parser_nodes__AIssetAttrExpr);
+var12 = NEW_nit__AIssetAttrExpr(&type_nit__AIssetAttrExpr);
 {
-parser_prod__AIssetAttrExpr__init_aissetattrexpr(var12, var_tkwissetnode2, var_pexprnode3, var_tattridnode4); /* Direct call parser_prod#AIssetAttrExpr#init_aissetattrexpr on <var12:AIssetAttrExpr>*/
+nit__parser_prod___AIssetAttrExpr___init_aissetattrexpr(var12, var_tkwissetnode2, var_pexprnode3, var_tattridnode4); /* Direct call parser_prod#AIssetAttrExpr#init_aissetattrexpr on <var12:AIssetAttrExpr>*/
 }
 var_pexprnode1 = var12;
 var_node_list = var_pexprnode1;
-var13 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction780> */
+var13 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction786> */
 {
-var14 = parser_work__Parser__go_to(var_p, var13);
+var14 = nit___nit__Parser___go_to(var_p, var13);
 }
 {
-parser_work__Parser__push(var_p, var14, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var14, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction780#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction780__action(val* self, val* p0) {
-parser__ReduceAction780__action(self, p0); /* Direct call parser#ReduceAction780#action on <self:Object(ReduceAction780)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction782#action for (self: ReduceAction782, Parser) */
-void parser__ReduceAction782__action(val* self, val* p0) {
+/* method parser#ReduceAction788#action for (self: ReduceAction788, Parser) */
+void nit__parser___nit__parser__ReduceAction788___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -6921,21 +7044,21 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var4 = 1;
 } else {
@@ -6947,13 +7070,13 @@ var4 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10654);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10704);
 show_backtrace(1);
 }
 var_tattridnode3 = var_nodearraylist3;
 /* <var_tattridnode3:nullable Object> isa nullable TAttrid */
-cltype6 = type_nullable_parser_nodes__TAttrid.color;
-idtype7 = type_nullable_parser_nodes__TAttrid.id;
+cltype6 = type_nullable__nit__TAttrid.color;
+idtype7 = type_nullable__nit__TAttrid.id;
 if(var_tattridnode3 == NULL) {
 var5 = 1;
 } else {
@@ -6965,31 +7088,26 @@ var5 = var_tattridnode3->type->type_table[cltype6] == idtype7;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10656);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10706);
 show_backtrace(1);
 }
-var8 = NEW_parser_nodes__AAttrExpr(&type_parser_nodes__AAttrExpr);
+var8 = NEW_nit__AAttrExpr(&type_nit__AAttrExpr);
 {
-parser_prod__AAttrExpr__init_aattrexpr(var8, var_pexprnode2, var_tattridnode3); /* Direct call parser_prod#AAttrExpr#init_aattrexpr on <var8:AAttrExpr>*/
+nit__parser_prod___AAttrExpr___init_aattrexpr(var8, var_pexprnode2, var_tattridnode3); /* Direct call parser_prod#AAttrExpr#init_aattrexpr on <var8:AAttrExpr>*/
 }
 var_pexprnode1 = var8;
 var_node_list = var_pexprnode1;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction782> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction788> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction782#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction782__action(val* self, val* p0) {
-parser__ReduceAction782__action(self, p0); /* Direct call parser#ReduceAction782#action on <self:Object(ReduceAction782)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction783#action for (self: ReduceAction783, Parser) */
-void parser__ReduceAction783__action(val* self, val* p0) {
+/* method parser#ReduceAction789#action for (self: ReduceAction789, Parser) */
+void nit__parser___nit__parser__ReduceAction789___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7019,21 +7137,21 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var4 = 1;
 } else {
@@ -7045,13 +7163,13 @@ var4 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10674);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10724);
 show_backtrace(1);
 }
 var_tidnode3 = var_nodearraylist2;
 /* <var_tidnode3:nullable Object> isa nullable TId */
-cltype6 = type_nullable_parser_nodes__TId.color;
-idtype7 = type_nullable_parser_nodes__TId.id;
+cltype6 = type_nullable__nit__TId.color;
+idtype7 = type_nullable__nit__TId.id;
 if(var_tidnode3 == NULL) {
 var5 = 1;
 } else {
@@ -7063,13 +7181,13 @@ var5 = var_tidnode3->type->type_table[cltype6] == idtype7;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10676);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10726);
 show_backtrace(1);
 }
 var_pexprsnode4 = var_nodearraylist3;
 /* <var_pexprsnode4:nullable Object> isa nullable AExprs */
-cltype9 = type_nullable_parser_nodes__AExprs.color;
-idtype10 = type_nullable_parser_nodes__AExprs.id;
+cltype9 = type_nullable__nit__AExprs.color;
+idtype10 = type_nullable__nit__AExprs.id;
 if(var_pexprsnode4 == NULL) {
 var8 = 1;
 } else {
@@ -7081,31 +7199,26 @@ var8 = var_pexprsnode4->type->type_table[cltype9] == idtype10;
 }
 if (unlikely(!var8)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10678);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10728);
 show_backtrace(1);
 }
-var11 = NEW_parser_nodes__ACallExpr(&type_parser_nodes__ACallExpr);
+var11 = NEW_nit__ACallExpr(&type_nit__ACallExpr);
 {
-parser_prod__ACallExpr__init_acallexpr(var11, var_pexprnode2, var_tidnode3, var_pexprsnode4); /* Direct call parser_prod#ACallExpr#init_acallexpr on <var11:ACallExpr>*/
+nit__parser_prod___ACallExpr___init_acallexpr(var11, var_pexprnode2, var_tidnode3, var_pexprsnode4); /* Direct call parser_prod#ACallExpr#init_acallexpr on <var11:ACallExpr>*/
 }
 var_pexprnode1 = var11;
 var_node_list = var_pexprnode1;
-var12 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction783> */
+var12 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction789> */
 {
-var13 = parser_work__Parser__go_to(var_p, var12);
+var13 = nit___nit__Parser___go_to(var_p, var12);
 }
 {
-parser_work__Parser__push(var_p, var13, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var13, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction783#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction783__action(val* self, val* p0) {
-parser__ReduceAction783__action(self, p0); /* Direct call parser#ReduceAction783#action on <self:Object(ReduceAction783)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction784#action for (self: ReduceAction784, Parser) */
-void parser__ReduceAction784__action(val* self, val* p0) {
+/* method parser#ReduceAction790#action for (self: ReduceAction790, Parser) */
+void nit__parser___nit__parser__ReduceAction790___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7133,17 +7246,17 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var3 = 1;
 } else {
@@ -7155,13 +7268,13 @@ var3 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10696);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10746);
 show_backtrace(1);
 }
 var_tidnode3 = var_nodearraylist2;
 /* <var_tidnode3:nullable Object> isa nullable TId */
-cltype5 = type_nullable_parser_nodes__TId.color;
-idtype6 = type_nullable_parser_nodes__TId.id;
+cltype5 = type_nullable__nit__TId.color;
+idtype6 = type_nullable__nit__TId.id;
 if(var_tidnode3 == NULL) {
 var4 = 1;
 } else {
@@ -7173,41 +7286,36 @@ var4 = var_tidnode3->type->type_table[cltype5] == idtype6;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10698);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10748);
 show_backtrace(1);
 }
-var7 = NEW_array__Array(&type_array__Arraykernel__Object);
+var7 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var7->class->vft[COLOR_kernel__Object__init]))(var7) /* init on <var7:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var7); /* Direct call array#Array#init on <var7:Array[Object]>*/
 }
 var_listnode5 = var7;
-var8 = NEW_parser_nodes__AListExprs(&type_parser_nodes__AListExprs);
+var8 = NEW_nit__AListExprs(&type_nit__AListExprs);
 {
-parser_prod__AListExprs__init_alistexprs(var8, var_listnode5); /* Direct call parser_prod#AListExprs#init_alistexprs on <var8:AListExprs>*/
+nit__parser_prod___AListExprs___init_alistexprs(var8, var_listnode5); /* Direct call parser_prod#AListExprs#init_alistexprs on <var8:AListExprs>*/
 }
 var_pexprsnode4 = var8;
-var9 = NEW_parser_nodes__ACallExpr(&type_parser_nodes__ACallExpr);
+var9 = NEW_nit__ACallExpr(&type_nit__ACallExpr);
 {
-parser_prod__ACallExpr__init_acallexpr(var9, var_pexprnode2, var_tidnode3, var_pexprsnode4); /* Direct call parser_prod#ACallExpr#init_acallexpr on <var9:ACallExpr>*/
+nit__parser_prod___ACallExpr___init_acallexpr(var9, var_pexprnode2, var_tidnode3, var_pexprsnode4); /* Direct call parser_prod#ACallExpr#init_acallexpr on <var9:ACallExpr>*/
 }
 var_pexprnode1 = var9;
 var_node_list = var_pexprnode1;
-var10 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction784> */
+var10 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction790> */
 {
-var11 = parser_work__Parser__go_to(var_p, var10);
+var11 = nit___nit__Parser___go_to(var_p, var10);
 }
 {
-parser_work__Parser__push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction784#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction784__action(val* self, val* p0) {
-parser__ReduceAction784__action(self, p0); /* Direct call parser#ReduceAction784#action on <self:Object(ReduceAction784)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction785#action for (self: ReduceAction785, Parser) */
-void parser__ReduceAction785__action(val* self, val* p0) {
+/* method parser#ReduceAction791#action for (self: ReduceAction791, Parser) */
+void nit__parser___nit__parser__ReduceAction791___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7239,25 +7347,25 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist4 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var3;
 {
-var4 = parser_work__Parser__pop(var_p);
+var4 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var4;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var5 = 1;
 } else {
@@ -7269,13 +7377,13 @@ var5 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10722);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10772);
 show_backtrace(1);
 }
 var_tidnode3 = var_nodearraylist3;
 /* <var_tidnode3:nullable Object> isa nullable TId */
-cltype7 = type_nullable_parser_nodes__TId.color;
-idtype8 = type_nullable_parser_nodes__TId.id;
+cltype7 = type_nullable__nit__TId.color;
+idtype8 = type_nullable__nit__TId.id;
 if(var_tidnode3 == NULL) {
 var6 = 1;
 } else {
@@ -7287,13 +7395,13 @@ var6 = var_tidnode3->type->type_table[cltype7] == idtype8;
 }
 if (unlikely(!var6)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10724);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10774);
 show_backtrace(1);
 }
 var_pexprsnode4 = var_nodearraylist4;
 /* <var_pexprsnode4:nullable Object> isa nullable AExprs */
-cltype10 = type_nullable_parser_nodes__AExprs.color;
-idtype11 = type_nullable_parser_nodes__AExprs.id;
+cltype10 = type_nullable__nit__AExprs.color;
+idtype11 = type_nullable__nit__AExprs.id;
 if(var_pexprsnode4 == NULL) {
 var9 = 1;
 } else {
@@ -7305,31 +7413,26 @@ var9 = var_pexprsnode4->type->type_table[cltype10] == idtype11;
 }
 if (unlikely(!var9)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10726);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10776);
 show_backtrace(1);
 }
-var12 = NEW_parser_nodes__ACallExpr(&type_parser_nodes__ACallExpr);
+var12 = NEW_nit__ACallExpr(&type_nit__ACallExpr);
 {
-parser_prod__ACallExpr__init_acallexpr(var12, var_pexprnode2, var_tidnode3, var_pexprsnode4); /* Direct call parser_prod#ACallExpr#init_acallexpr on <var12:ACallExpr>*/
+nit__parser_prod___ACallExpr___init_acallexpr(var12, var_pexprnode2, var_tidnode3, var_pexprsnode4); /* Direct call parser_prod#ACallExpr#init_acallexpr on <var12:ACallExpr>*/
 }
 var_pexprnode1 = var12;
 var_node_list = var_pexprnode1;
-var13 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction785> */
+var13 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction791> */
 {
-var14 = parser_work__Parser__go_to(var_p, var13);
+var14 = nit___nit__Parser___go_to(var_p, var13);
 }
 {
-parser_work__Parser__push(var_p, var14, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var14, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction785#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction785__action(val* self, val* p0) {
-parser__ReduceAction785__action(self, p0); /* Direct call parser#ReduceAction785#action on <self:Object(ReduceAction785)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction786#action for (self: ReduceAction786, Parser) */
-void parser__ReduceAction786__action(val* self, val* p0) {
+/* method parser#ReduceAction792#action for (self: ReduceAction792, Parser) */
+void nit__parser___nit__parser__ReduceAction792___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7359,21 +7462,21 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var4 = 1;
 } else {
@@ -7385,13 +7488,13 @@ var4 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10745);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10795);
 show_backtrace(1);
 }
 var_tidnode3 = var_nodearraylist3;
 /* <var_tidnode3:nullable Object> isa nullable TId */
-cltype6 = type_nullable_parser_nodes__TId.color;
-idtype7 = type_nullable_parser_nodes__TId.id;
+cltype6 = type_nullable__nit__TId.color;
+idtype7 = type_nullable__nit__TId.id;
 if(var_tidnode3 == NULL) {
 var5 = 1;
 } else {
@@ -7403,41 +7506,36 @@ var5 = var_tidnode3->type->type_table[cltype6] == idtype7;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10747);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10797);
 show_backtrace(1);
 }
-var8 = NEW_array__Array(&type_array__Arraykernel__Object);
+var8 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var8->class->vft[COLOR_kernel__Object__init]))(var8) /* init on <var8:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var8); /* Direct call array#Array#init on <var8:Array[Object]>*/
 }
 var_listnode5 = var8;
-var9 = NEW_parser_nodes__AListExprs(&type_parser_nodes__AListExprs);
+var9 = NEW_nit__AListExprs(&type_nit__AListExprs);
 {
-parser_prod__AListExprs__init_alistexprs(var9, var_listnode5); /* Direct call parser_prod#AListExprs#init_alistexprs on <var9:AListExprs>*/
+nit__parser_prod___AListExprs___init_alistexprs(var9, var_listnode5); /* Direct call parser_prod#AListExprs#init_alistexprs on <var9:AListExprs>*/
 }
 var_pexprsnode4 = var9;
-var10 = NEW_parser_nodes__ACallExpr(&type_parser_nodes__ACallExpr);
+var10 = NEW_nit__ACallExpr(&type_nit__ACallExpr);
 {
-parser_prod__ACallExpr__init_acallexpr(var10, var_pexprnode2, var_tidnode3, var_pexprsnode4); /* Direct call parser_prod#ACallExpr#init_acallexpr on <var10:ACallExpr>*/
+nit__parser_prod___ACallExpr___init_acallexpr(var10, var_pexprnode2, var_tidnode3, var_pexprsnode4); /* Direct call parser_prod#ACallExpr#init_acallexpr on <var10:ACallExpr>*/
 }
 var_pexprnode1 = var10;
 var_node_list = var_pexprnode1;
-var11 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction786> */
+var11 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction792> */
 {
-var12 = parser_work__Parser__go_to(var_p, var11);
+var12 = nit___nit__Parser___go_to(var_p, var11);
 }
 {
-parser_work__Parser__push(var_p, var12, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var12, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction786#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction786__action(val* self, val* p0) {
-parser__ReduceAction786__action(self, p0); /* Direct call parser#ReduceAction786#action on <self:Object(ReduceAction786)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction793#action for (self: ReduceAction793, Parser) */
-void parser__ReduceAction793__action(val* self, val* p0) {
+/* method parser#ReduceAction799#action for (self: ReduceAction799, Parser) */
+void nit__parser___nit__parser__ReduceAction799___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7467,21 +7565,21 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var4 = 1;
 } else {
@@ -7493,13 +7591,13 @@ var4 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10770);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10820);
 show_backtrace(1);
 }
 var_tkwinitnode3 = var_nodearraylist2;
 /* <var_tkwinitnode3:nullable Object> isa nullable TKwinit */
-cltype6 = type_nullable_parser_nodes__TKwinit.color;
-idtype7 = type_nullable_parser_nodes__TKwinit.id;
+cltype6 = type_nullable__nit__TKwinit.color;
+idtype7 = type_nullable__nit__TKwinit.id;
 if(var_tkwinitnode3 == NULL) {
 var5 = 1;
 } else {
@@ -7511,13 +7609,13 @@ var5 = var_tkwinitnode3->type->type_table[cltype6] == idtype7;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10772);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10822);
 show_backtrace(1);
 }
 var_pexprsnode4 = var_nodearraylist3;
 /* <var_pexprsnode4:nullable Object> isa nullable AExprs */
-cltype9 = type_nullable_parser_nodes__AExprs.color;
-idtype10 = type_nullable_parser_nodes__AExprs.id;
+cltype9 = type_nullable__nit__AExprs.color;
+idtype10 = type_nullable__nit__AExprs.id;
 if(var_pexprsnode4 == NULL) {
 var8 = 1;
 } else {
@@ -7529,31 +7627,26 @@ var8 = var_pexprsnode4->type->type_table[cltype9] == idtype10;
 }
 if (unlikely(!var8)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10774);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10824);
 show_backtrace(1);
 }
-var11 = NEW_parser_nodes__AInitExpr(&type_parser_nodes__AInitExpr);
+var11 = NEW_nit__AInitExpr(&type_nit__AInitExpr);
 {
-parser_prod__AInitExpr__init_ainitexpr(var11, var_pexprnode2, var_tkwinitnode3, var_pexprsnode4); /* Direct call parser_prod#AInitExpr#init_ainitexpr on <var11:AInitExpr>*/
+nit__parser_prod___AInitExpr___init_ainitexpr(var11, var_pexprnode2, var_tkwinitnode3, var_pexprsnode4); /* Direct call parser_prod#AInitExpr#init_ainitexpr on <var11:AInitExpr>*/
 }
 var_pexprnode1 = var11;
 var_node_list = var_pexprnode1;
-var12 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction793> */
+var12 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction799> */
 {
-var13 = parser_work__Parser__go_to(var_p, var12);
+var13 = nit___nit__Parser___go_to(var_p, var12);
 }
 {
-parser_work__Parser__push(var_p, var13, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var13, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction793#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction793__action(val* self, val* p0) {
-parser__ReduceAction793__action(self, p0); /* Direct call parser#ReduceAction793#action on <self:Object(ReduceAction793)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction794#action for (self: ReduceAction794, Parser) */
-void parser__ReduceAction794__action(val* self, val* p0) {
+/* method parser#ReduceAction800#action for (self: ReduceAction800, Parser) */
+void nit__parser___nit__parser__ReduceAction800___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7581,17 +7674,17 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
 var_pexprnode2 = var_nodearraylist1;
 /* <var_pexprnode2:nullable Object> isa nullable AExpr */
-cltype = type_nullable_parser_nodes__AExpr.color;
-idtype = type_nullable_parser_nodes__AExpr.id;
+cltype = type_nullable__nit__AExpr.color;
+idtype = type_nullable__nit__AExpr.id;
 if(var_pexprnode2 == NULL) {
 var3 = 1;
 } else {
@@ -7603,13 +7696,13 @@ var3 = var_pexprnode2->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10792);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10842);
 show_backtrace(1);
 }
 var_tkwinitnode3 = var_nodearraylist2;
 /* <var_tkwinitnode3:nullable Object> isa nullable TKwinit */
-cltype5 = type_nullable_parser_nodes__TKwinit.color;
-idtype6 = type_nullable_parser_nodes__TKwinit.id;
+cltype5 = type_nullable__nit__TKwinit.color;
+idtype6 = type_nullable__nit__TKwinit.id;
 if(var_tkwinitnode3 == NULL) {
 var4 = 1;
 } else {
@@ -7621,41 +7714,36 @@ var4 = var_tkwinitnode3->type->type_table[cltype5] == idtype6;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10794);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10844);
 show_backtrace(1);
 }
-var7 = NEW_array__Array(&type_array__Arraykernel__Object);
+var7 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var7->class->vft[COLOR_kernel__Object__init]))(var7) /* init on <var7:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var7); /* Direct call array#Array#init on <var7:Array[Object]>*/
 }
 var_listnode5 = var7;
-var8 = NEW_parser_nodes__AListExprs(&type_parser_nodes__AListExprs);
+var8 = NEW_nit__AListExprs(&type_nit__AListExprs);
 {
-parser_prod__AListExprs__init_alistexprs(var8, var_listnode5); /* Direct call parser_prod#AListExprs#init_alistexprs on <var8:AListExprs>*/
+nit__parser_prod___AListExprs___init_alistexprs(var8, var_listnode5); /* Direct call parser_prod#AListExprs#init_alistexprs on <var8:AListExprs>*/
 }
 var_pexprsnode4 = var8;
-var9 = NEW_parser_nodes__AInitExpr(&type_parser_nodes__AInitExpr);
+var9 = NEW_nit__AInitExpr(&type_nit__AInitExpr);
 {
-parser_prod__AInitExpr__init_ainitexpr(var9, var_pexprnode2, var_tkwinitnode3, var_pexprsnode4); /* Direct call parser_prod#AInitExpr#init_ainitexpr on <var9:AInitExpr>*/
+nit__parser_prod___AInitExpr___init_ainitexpr(var9, var_pexprnode2, var_tkwinitnode3, var_pexprsnode4); /* Direct call parser_prod#AInitExpr#init_ainitexpr on <var9:AInitExpr>*/
 }
 var_pexprnode1 = var9;
 var_node_list = var_pexprnode1;
-var10 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction794> */
+var10 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction800> */
 {
-var11 = parser_work__Parser__go_to(var_p, var10);
+var11 = nit___nit__Parser___go_to(var_p, var10);
 }
 {
-parser_work__Parser__push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction794#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction794__action(val* self, val* p0) {
-parser__ReduceAction794__action(self, p0); /* Direct call parser#ReduceAction794#action on <self:Object(ReduceAction794)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction817#action for (self: ReduceAction817, Parser) */
-void parser__ReduceAction817__action(val* self, val* p0) {
+/* method parser#ReduceAction823#action for (self: ReduceAction823, Parser) */
+void nit__parser___nit__parser__ReduceAction823___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7672,35 +7760,30 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist3 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var2;
 {
-var3 = parser_work__Parser__pop(var_p);
+var3 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var3;
 var_pexprnode1 = var_nodearraylist1;
 var_node_list = var_pexprnode1;
-var4 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction817> */
+var4 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction823> */
 {
-var5 = parser_work__Parser__go_to(var_p, var4);
+var5 = nit___nit__Parser___go_to(var_p, var4);
 }
 {
-parser_work__Parser__push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var5, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction817#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction817__action(val* self, val* p0) {
-parser__ReduceAction817__action(self, p0); /* Direct call parser#ReduceAction817#action on <self:Object(ReduceAction817)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction818#action for (self: ReduceAction818, Parser) */
-void parser__ReduceAction818__action(val* self, val* p0) {
+/* method parser#ReduceAction824#action for (self: ReduceAction824, Parser) */
+void nit__parser___nit__parser__ReduceAction824___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7711,7 +7794,7 @@ long var4 /* : Int */;
 var_p = p0;
 var = NULL;
 var_node_list = var;
-var1 = NEW_parser_nodes__AImplicitSelfExpr(&type_parser_nodes__AImplicitSelfExpr);
+var1 = NEW_nit__AImplicitSelfExpr(&type_nit__AImplicitSelfExpr);
 {
 { /* Inline parser_prod#AImplicitSelfExpr#init_aimplicitselfexpr (var1) on <var1:AImplicitSelfExpr> */
 RET_LABEL2:(void)0;
@@ -7719,22 +7802,17 @@ RET_LABEL2:(void)0;
 }
 var_pexprnode1 = var1;
 var_node_list = var_pexprnode1;
-var3 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction818> */
+var3 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction824> */
 {
-var4 = parser_work__Parser__go_to(var_p, var3);
+var4 = nit___nit__Parser___go_to(var_p, var3);
 }
 {
-parser_work__Parser__push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var4, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction818#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction818__action(val* self, val* p0) {
-parser__ReduceAction818__action(self, p0); /* Direct call parser#ReduceAction818#action on <self:Object(ReduceAction818)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction968#action for (self: ReduceAction968, Parser) */
-void parser__ReduceAction968__action(val* self, val* p0) {
+/* method parser#ReduceAction974#action for (self: ReduceAction974, Parser) */
+void nit__parser___nit__parser__ReduceAction974___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7752,12 +7830,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_pimportnode1 = var_nodearraylist1;
@@ -7768,32 +7846,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_pimportnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pimportnode1, var3) /* != on <var_pimportnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_pimportnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pimportnode1, var3) /* != on <var_pimportnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_pimportnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pimportnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction968> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction974> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction968#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction968__action(val* self, val* p0) {
-parser__ReduceAction968__action(self, p0); /* Direct call parser#ReduceAction968#action on <self:Object(ReduceAction968)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction969#action for (self: ReduceAction969, Parser) */
-void parser__ReduceAction969__action(val* self, val* p0) {
+/* method parser#ReduceAction975#action for (self: ReduceAction975, Parser) */
+void nit__parser___nit__parser__ReduceAction975___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7818,22 +7891,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -7845,12 +7918,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10855);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10905);
 show_backtrace(1);
 }
 var_pimportnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -7860,32 +7933,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pimportnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pimportnode2, var6) /* != on <var_pimportnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pimportnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pimportnode2, var6) /* != on <var_pimportnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pimportnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pimportnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction969> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction975> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction969#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction969__action(val* self, val* p0) {
-parser__ReduceAction969__action(self, p0); /* Direct call parser#ReduceAction969#action on <self:Object(ReduceAction969)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction970#action for (self: ReduceAction970, Parser) */
-void parser__ReduceAction970__action(val* self, val* p0) {
+/* method parser#ReduceAction976#action for (self: ReduceAction976, Parser) */
+void nit__parser___nit__parser__ReduceAction976___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7903,12 +7971,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_pexterncodeblocknode1 = var_nodearraylist1;
@@ -7919,32 +7987,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_pexterncodeblocknode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexterncodeblocknode1, var3) /* != on <var_pexterncodeblocknode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_pexterncodeblocknode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexterncodeblocknode1, var3) /* != on <var_pexterncodeblocknode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_pexterncodeblocknode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pexterncodeblocknode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction970> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction976> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction970#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction970__action(val* self, val* p0) {
-parser__ReduceAction970__action(self, p0); /* Direct call parser#ReduceAction970#action on <self:Object(ReduceAction970)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction971#action for (self: ReduceAction971, Parser) */
-void parser__ReduceAction971__action(val* self, val* p0) {
+/* method parser#ReduceAction977#action for (self: ReduceAction977, Parser) */
+void nit__parser___nit__parser__ReduceAction977___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -7969,22 +8032,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -7996,12 +8059,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10889);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10939);
 show_backtrace(1);
 }
 var_pexterncodeblocknode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -8011,32 +8074,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pexterncodeblocknode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexterncodeblocknode2, var6) /* != on <var_pexterncodeblocknode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pexterncodeblocknode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexterncodeblocknode2, var6) /* != on <var_pexterncodeblocknode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pexterncodeblocknode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pexterncodeblocknode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction971> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction977> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction971#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction971__action(val* self, val* p0) {
-parser__ReduceAction971__action(self, p0); /* Direct call parser#ReduceAction971#action on <self:Object(ReduceAction971)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction972#action for (self: ReduceAction972, Parser) */
-void parser__ReduceAction972__action(val* self, val* p0) {
+/* method parser#ReduceAction978#action for (self: ReduceAction978, Parser) */
+void nit__parser___nit__parser__ReduceAction978___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8054,12 +8112,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_pclassdefnode1 = var_nodearraylist1;
@@ -8070,32 +8128,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_pclassdefnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pclassdefnode1, var3) /* != on <var_pclassdefnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_pclassdefnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pclassdefnode1, var3) /* != on <var_pclassdefnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_pclassdefnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pclassdefnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction972> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction978> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction972#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction972__action(val* self, val* p0) {
-parser__ReduceAction972__action(self, p0); /* Direct call parser#ReduceAction972#action on <self:Object(ReduceAction972)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction973#action for (self: ReduceAction973, Parser) */
-void parser__ReduceAction973__action(val* self, val* p0) {
+/* method parser#ReduceAction979#action for (self: ReduceAction979, Parser) */
+void nit__parser___nit__parser__ReduceAction979___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8120,22 +8173,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -8147,12 +8200,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10923);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 10973);
 show_backtrace(1);
 }
 var_pclassdefnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -8162,32 +8215,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pclassdefnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pclassdefnode2, var6) /* != on <var_pclassdefnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pclassdefnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pclassdefnode2, var6) /* != on <var_pclassdefnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pclassdefnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pclassdefnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction973> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction979> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction973#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction973__action(val* self, val* p0) {
-parser__ReduceAction973__action(self, p0); /* Direct call parser#ReduceAction973#action on <self:Object(ReduceAction973)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction974#action for (self: ReduceAction974, Parser) */
-void parser__ReduceAction974__action(val* self, val* p0) {
+/* method parser#ReduceAction980#action for (self: ReduceAction980, Parser) */
+void nit__parser___nit__parser__ReduceAction980___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8205,12 +8253,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_psuperclassnode1 = var_nodearraylist1;
@@ -8221,32 +8269,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_psuperclassnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_psuperclassnode1, var3) /* != on <var_psuperclassnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_psuperclassnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_psuperclassnode1, var3) /* != on <var_psuperclassnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_psuperclassnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_psuperclassnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction974> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction980> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction974#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction974__action(val* self, val* p0) {
-parser__ReduceAction974__action(self, p0); /* Direct call parser#ReduceAction974#action on <self:Object(ReduceAction974)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction975#action for (self: ReduceAction975, Parser) */
-void parser__ReduceAction975__action(val* self, val* p0) {
+/* method parser#ReduceAction981#action for (self: ReduceAction981, Parser) */
+void nit__parser___nit__parser__ReduceAction981___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8271,22 +8314,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -8298,12 +8341,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10957);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11007);
 show_backtrace(1);
 }
 var_psuperclassnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -8313,32 +8356,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_psuperclassnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_psuperclassnode2, var6) /* != on <var_psuperclassnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_psuperclassnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_psuperclassnode2, var6) /* != on <var_psuperclassnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_psuperclassnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_psuperclassnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction975> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction981> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction975#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction975__action(val* self, val* p0) {
-parser__ReduceAction975__action(self, p0); /* Direct call parser#ReduceAction975#action on <self:Object(ReduceAction975)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction976#action for (self: ReduceAction976, Parser) */
-void parser__ReduceAction976__action(val* self, val* p0) {
+/* method parser#ReduceAction982#action for (self: ReduceAction982, Parser) */
+void nit__parser___nit__parser__ReduceAction982___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8356,12 +8394,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_ppropdefnode1 = var_nodearraylist1;
@@ -8372,32 +8410,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_ppropdefnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_ppropdefnode1, var3) /* != on <var_ppropdefnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_ppropdefnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_ppropdefnode1, var3) /* != on <var_ppropdefnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_ppropdefnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_ppropdefnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction976> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction982> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction976#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction976__action(val* self, val* p0) {
-parser__ReduceAction976__action(self, p0); /* Direct call parser#ReduceAction976#action on <self:Object(ReduceAction976)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction977#action for (self: ReduceAction977, Parser) */
-void parser__ReduceAction977__action(val* self, val* p0) {
+/* method parser#ReduceAction983#action for (self: ReduceAction983, Parser) */
+void nit__parser___nit__parser__ReduceAction983___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8422,22 +8455,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -8449,12 +8482,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 10991);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11041);
 show_backtrace(1);
 }
 var_ppropdefnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -8464,32 +8497,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_ppropdefnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_ppropdefnode2, var6) /* != on <var_ppropdefnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_ppropdefnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_ppropdefnode2, var6) /* != on <var_ppropdefnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_ppropdefnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_ppropdefnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction977> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction983> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction977#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction977__action(val* self, val* p0) {
-parser__ReduceAction977__action(self, p0); /* Direct call parser#ReduceAction977#action on <self:Object(ReduceAction977)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction978#action for (self: ReduceAction978, Parser) */
-void parser__ReduceAction978__action(val* self, val* p0) {
+/* method parser#ReduceAction984#action for (self: ReduceAction984, Parser) */
+void nit__parser___nit__parser__ReduceAction984___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8507,12 +8535,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_pformaldefnode1 = var_nodearraylist1;
@@ -8523,32 +8551,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_pformaldefnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pformaldefnode1, var3) /* != on <var_pformaldefnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_pformaldefnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pformaldefnode1, var3) /* != on <var_pformaldefnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_pformaldefnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pformaldefnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction978> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction984> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction978#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction978__action(val* self, val* p0) {
-parser__ReduceAction978__action(self, p0); /* Direct call parser#ReduceAction978#action on <self:Object(ReduceAction978)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction979#action for (self: ReduceAction979, Parser) */
-void parser__ReduceAction979__action(val* self, val* p0) {
+/* method parser#ReduceAction985#action for (self: ReduceAction985, Parser) */
+void nit__parser___nit__parser__ReduceAction985___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8573,22 +8596,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -8600,12 +8623,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11025);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11075);
 show_backtrace(1);
 }
 var_pformaldefnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -8615,32 +8638,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pformaldefnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pformaldefnode2, var6) /* != on <var_pformaldefnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pformaldefnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pformaldefnode2, var6) /* != on <var_pformaldefnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pformaldefnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pformaldefnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction979> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction985> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction979#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction979__action(val* self, val* p0) {
-parser__ReduceAction979__action(self, p0); /* Direct call parser#ReduceAction979#action on <self:Object(ReduceAction979)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction980#action for (self: ReduceAction980, Parser) */
-void parser__ReduceAction980__action(val* self, val* p0) {
+/* method parser#ReduceAction986#action for (self: ReduceAction986, Parser) */
+void nit__parser___nit__parser__ReduceAction986___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8658,12 +8676,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_pparamnode1 = var_nodearraylist1;
@@ -8674,32 +8692,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_pparamnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pparamnode1, var3) /* != on <var_pparamnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_pparamnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pparamnode1, var3) /* != on <var_pparamnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_pparamnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pparamnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction980> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction986> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction980#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction980__action(val* self, val* p0) {
-parser__ReduceAction980__action(self, p0); /* Direct call parser#ReduceAction980#action on <self:Object(ReduceAction980)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction981#action for (self: ReduceAction981, Parser) */
-void parser__ReduceAction981__action(val* self, val* p0) {
+/* method parser#ReduceAction987#action for (self: ReduceAction987, Parser) */
+void nit__parser___nit__parser__ReduceAction987___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8724,22 +8737,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -8751,12 +8764,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11059);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11109);
 show_backtrace(1);
 }
 var_pparamnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -8766,32 +8779,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pparamnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pparamnode2, var6) /* != on <var_pparamnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pparamnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pparamnode2, var6) /* != on <var_pparamnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pparamnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pparamnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction981> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction987> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction981#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction981__action(val* self, val* p0) {
-parser__ReduceAction981__action(self, p0); /* Direct call parser#ReduceAction981#action on <self:Object(ReduceAction981)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction982#action for (self: ReduceAction982, Parser) */
-void parser__ReduceAction982__action(val* self, val* p0) {
+/* method parser#ReduceAction988#action for (self: ReduceAction988, Parser) */
+void nit__parser___nit__parser__ReduceAction988___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8809,12 +8817,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_pexterncallnode1 = var_nodearraylist1;
@@ -8825,32 +8833,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_pexterncallnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexterncallnode1, var3) /* != on <var_pexterncallnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_pexterncallnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexterncallnode1, var3) /* != on <var_pexterncallnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_pexterncallnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_pexterncallnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction982> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction988> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction982#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction982__action(val* self, val* p0) {
-parser__ReduceAction982__action(self, p0); /* Direct call parser#ReduceAction982#action on <self:Object(ReduceAction982)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction983#action for (self: ReduceAction983, Parser) */
-void parser__ReduceAction983__action(val* self, val* p0) {
+/* method parser#ReduceAction989#action for (self: ReduceAction989, Parser) */
+void nit__parser___nit__parser__ReduceAction989___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8875,22 +8878,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -8902,12 +8905,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11093);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11143);
 show_backtrace(1);
 }
 var_pexterncallnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -8917,32 +8920,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pexterncallnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexterncallnode2, var6) /* != on <var_pexterncallnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pexterncallnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexterncallnode2, var6) /* != on <var_pexterncallnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pexterncallnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pexterncallnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction983> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction989> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction983#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction983__action(val* self, val* p0) {
-parser__ReduceAction983__action(self, p0); /* Direct call parser#ReduceAction983#action on <self:Object(ReduceAction983)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction985#action for (self: ReduceAction985, Parser) */
-void parser__ReduceAction985__action(val* self, val* p0) {
+/* method parser#ReduceAction991#action for (self: ReduceAction991, Parser) */
+void nit__parser___nit__parser__ReduceAction991___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -8967,22 +8965,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -8994,12 +8992,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11112);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11162);
 show_backtrace(1);
 }
 var_ptypenode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -9009,32 +9007,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_ptypenode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_ptypenode2, var6) /* != on <var_ptypenode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_ptypenode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_ptypenode2, var6) /* != on <var_ptypenode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_ptypenode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_ptypenode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction985> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction991> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction985#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction985__action(val* self, val* p0) {
-parser__ReduceAction985__action(self, p0); /* Direct call parser#ReduceAction985#action on <self:Object(ReduceAction985)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction987#action for (self: ReduceAction987, Parser) */
-void parser__ReduceAction987__action(val* self, val* p0) {
+/* method parser#ReduceAction993#action for (self: ReduceAction993, Parser) */
+void nit__parser___nit__parser__ReduceAction993___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -9059,22 +9052,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -9086,12 +9079,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11131);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11181);
 show_backtrace(1);
 }
 var_pexprnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -9101,32 +9094,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pexprnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pexprnode2, var6) /* != on <var_pexprnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pexprnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pexprnode2, var6) /* != on <var_pexprnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pexprnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pexprnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction987> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction993> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction987#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction987__action(val* self, val* p0) {
-parser__ReduceAction987__action(self, p0); /* Direct call parser#ReduceAction987#action on <self:Object(ReduceAction987)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction991#action for (self: ReduceAction991, Parser) */
-void parser__ReduceAction991__action(val* self, val* p0) {
+/* method parser#ReduceAction999#action for (self: ReduceAction999, Parser) */
+void nit__parser___nit__parser__ReduceAction999___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -9152,22 +9140,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -9179,13 +9167,13 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11150);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11200);
 show_backtrace(1);
 }
 var_listnode2 = var_nodearraylist2;
 /* <var_listnode2:nullable Object> isa Array[Object] */
-cltype6 = type_array__Arraykernel__Object.color;
-idtype7 = type_array__Arraykernel__Object.id;
+cltype6 = type_standard__Array__standard__Object.color;
+idtype7 = type_standard__Array__standard__Object.id;
 if(var_listnode2 == NULL) {
 var5 = 0;
 } else {
@@ -9197,34 +9185,29 @@ var5 = var_listnode2->type->type_table[cltype6] == idtype7;
 }
 if (unlikely(!var5)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11152);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11202);
 show_backtrace(1);
 }
 {
-var8 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var8 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var8;
 {
-var9 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode2);
+var9 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode2);
 }
 var_listnode3 = var9;
 var_node_list = var_listnode3;
-var10 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction991> */
+var10 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction999> */
 {
-var11 = parser_work__Parser__go_to(var_p, var10);
+var11 = nit___nit__Parser___go_to(var_p, var10);
 }
 {
-parser_work__Parser__push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var11, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction991#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction991__action(val* self, val* p0) {
-parser__ReduceAction991__action(self, p0); /* Direct call parser#ReduceAction991#action on <self:Object(ReduceAction991)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction993#action for (self: ReduceAction993, Parser) */
-void parser__ReduceAction993__action(val* self, val* p0) {
+/* method parser#ReduceAction1001#action for (self: ReduceAction1001, Parser) */
+void nit__parser___nit__parser__ReduceAction1001___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -9249,22 +9232,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -9276,12 +9259,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11168);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11218);
 show_backtrace(1);
 }
 var_pannotationnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -9291,32 +9274,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_pannotationnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_pannotationnode2, var6) /* != on <var_pannotationnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_pannotationnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_pannotationnode2, var6) /* != on <var_pannotationnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_pannotationnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_pannotationnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction993> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1001> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction993#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction993__action(val* self, val* p0) {
-parser__ReduceAction993__action(self, p0); /* Direct call parser#ReduceAction993#action on <self:Object(ReduceAction993)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction1003#action for (self: ReduceAction1003, Parser) */
-void parser__ReduceAction1003__action(val* self, val* p0) {
+/* method parser#ReduceAction1011#action for (self: ReduceAction1011, Parser) */
+void nit__parser___nit__parser__ReduceAction1011___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -9341,22 +9319,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -9368,12 +9346,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11187);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11237);
 show_backtrace(1);
 }
 var_tidnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -9383,32 +9361,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_tidnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_tidnode2, var6) /* != on <var_tidnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_tidnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_tidnode2, var6) /* != on <var_tidnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_tidnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_tidnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1003> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1011> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction1003#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction1003__action(val* self, val* p0) {
-parser__ReduceAction1003__action(self, p0); /* Direct call parser#ReduceAction1003#action on <self:Object(ReduceAction1003)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction1004#action for (self: ReduceAction1004, Parser) */
-void parser__ReduceAction1004__action(val* self, val* p0) {
+/* method parser#ReduceAction1012#action for (self: ReduceAction1012, Parser) */
+void nit__parser___nit__parser__ReduceAction1012___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -9426,12 +9399,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_tcommentnode1 = var_nodearraylist1;
@@ -9442,32 +9415,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_tcommentnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_tcommentnode1, var3) /* != on <var_tcommentnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_tcommentnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_tcommentnode1, var3) /* != on <var_tcommentnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_tcommentnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_tcommentnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1004> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1012> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction1004#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction1004__action(val* self, val* p0) {
-parser__ReduceAction1004__action(self, p0); /* Direct call parser#ReduceAction1004#action on <self:Object(ReduceAction1004)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction1005#action for (self: ReduceAction1005, Parser) */
-void parser__ReduceAction1005__action(val* self, val* p0) {
+/* method parser#ReduceAction1013#action for (self: ReduceAction1013, Parser) */
+void nit__parser___nit__parser__ReduceAction1013___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -9492,22 +9460,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -9519,12 +9487,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11221);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11271);
 show_backtrace(1);
 }
 var_tcommentnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -9534,32 +9502,27 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_tcommentnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_tcommentnode2, var6) /* != on <var_tcommentnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_tcommentnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_tcommentnode2, var6) /* != on <var_tcommentnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_tcommentnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_tcommentnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1005> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1013> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction1005#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction1005__action(val* self, val* p0) {
-parser__ReduceAction1005__action(self, p0); /* Direct call parser#ReduceAction1005#action on <self:Object(ReduceAction1005)>*/
 RET_LABEL:;
 }
-/* method parser#ReduceAction1006#action for (self: ReduceAction1006, Parser) */
-void parser__ReduceAction1006__action(val* self, val* p0) {
+/* method parser#ReduceAction1014#action for (self: ReduceAction1014, Parser) */
+void nit__parser___nit__parser__ReduceAction1014___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -9577,12 +9540,12 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var1;
-var2 = NEW_array__Array(&type_array__Arraykernel__Object);
+var2 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var2->class->vft[COLOR_kernel__Object__init]))(var2) /* init on <var2:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var2); /* Direct call array#Array#init on <var2:Array[Object]>*/
 }
 var_listnode2 = var2;
 var_teolnode1 = var_nodearraylist1;
@@ -9593,32 +9556,27 @@ var4 = 0; /* is null */
 var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var5 = ((short int (*)(val*, val*))(var_teolnode1->class->vft[COLOR_kernel__Object___33d_61d]))(var_teolnode1, var3) /* != on <var_teolnode1:nullable Object>*/;
+var5 = ((short int (*)(val* self, val* p0))(var_teolnode1->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_teolnode1, var3) /* != on <var_teolnode1:nullable Object>*/;
 var4 = var5;
 }
 if (var4){
 {
-array__Array__add(var_listnode2, var_teolnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode2, var_teolnode1); /* Direct call array#Array#add on <var_listnode2:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode2;
-var6 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1006> */
+var6 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1014> */
 {
-var7 = parser_work__Parser__go_to(var_p, var6);
+var7 = nit___nit__Parser___go_to(var_p, var6);
 }
 {
-parser_work__Parser__push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
+nit___nit__Parser___push(var_p, var7, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
 RET_LABEL:;
 }
-/* method parser#ReduceAction1006#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction1006__action(val* self, val* p0) {
-parser__ReduceAction1006__action(self, p0); /* Direct call parser#ReduceAction1006#action on <self:Object(ReduceAction1006)>*/
-RET_LABEL:;
-}
-/* method parser#ReduceAction1007#action for (self: ReduceAction1007, Parser) */
-void parser__ReduceAction1007__action(val* self, val* p0) {
+/* method parser#ReduceAction1015#action for (self: ReduceAction1015, Parser) */
+void nit__parser___nit__parser__ReduceAction1015___nit__parser_work__ReduceAction__action(val* self, val* p0) {
 val* var_p /* var p: Parser */;
 val* var /* : null */;
 val* var_node_list /* var node_list: nullable Object */;
@@ -9643,22 +9601,22 @@ var_p = p0;
 var = NULL;
 var_node_list = var;
 {
-var1 = parser_work__Parser__pop(var_p);
+var1 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist2 = var1;
 {
-var2 = parser_work__Parser__pop(var_p);
+var2 = nit___nit__Parser___pop(var_p);
 }
 var_nodearraylist1 = var2;
-var3 = NEW_array__Array(&type_array__Arraykernel__Object);
+var3 = NEW_standard__Array(&type_standard__Array__standard__Object);
 {
-((void (*)(val*))(var3->class->vft[COLOR_kernel__Object__init]))(var3) /* init on <var3:Array[Object]>*/;
+standard___standard__Array___standard__kernel__Object__init(var3); /* Direct call array#Array#init on <var3:Array[Object]>*/
 }
 var_listnode3 = var3;
 var_listnode1 = var_nodearraylist1;
 /* <var_listnode1:nullable Object> isa Array[Object] */
-cltype = type_array__Arraykernel__Object.color;
-idtype = type_array__Arraykernel__Object.id;
+cltype = type_standard__Array__standard__Object.color;
+idtype = type_standard__Array__standard__Object.id;
 if(var_listnode1 == NULL) {
 var4 = 0;
 } else {
@@ -9670,12 +9628,12 @@ var4 = var_listnode1->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var4)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "parser/parser.nit", 11255);
+PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser, 11305);
 show_backtrace(1);
 }
 var_teolnode2 = var_nodearraylist2;
 {
-var5 = parser_work__ReduceAction__concat(self, var_listnode3, var_listnode1);
+var5 = nit__parser_work___nit__parser_work__ReduceAction___concat(self, var_listnode3, var_listnode1);
 }
 var_listnode3 = var5;
 var6 = NULL;
@@ -9685,27 +9643,22 @@ var7 = 0; /* is null */
 var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-var8 = ((short int (*)(val*, val*))(var_teolnode2->class->vft[COLOR_kernel__Object___33d_61d]))(var_teolnode2, var6) /* != on <var_teolnode2:nullable Object>*/;
+var8 = ((short int (*)(val* self, val* p0))(var_teolnode2->class->vft[COLOR_standard__kernel__Object___33d_61d]))(var_teolnode2, var6) /* != on <var_teolnode2:nullable Object>*/;
 var7 = var8;
 }
 if (var7){
 {
-array__Array__add(var_listnode3, var_teolnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var_listnode3, var_teolnode2); /* Direct call array#Array#add on <var_listnode3:Array[Object]>*/
 }
 } else {
 }
 var_node_list = var_listnode3;
-var9 = self->attrs[COLOR_parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1007> */
+var9 = self->attrs[COLOR_nit__parser_work__ReduceAction___goto].l; /* _goto on <self:ReduceAction1015> */
 {
-var10 = parser_work__Parser__go_to(var_p, var9);
+var10 = nit___nit__Parser___go_to(var_p, var9);
 }
 {
-parser_work__Parser__push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
-}
-RET_LABEL:;
+nit___nit__Parser___push(var_p, var10, var_node_list); /* Direct call parser_work#Parser#push on <var_p:Parser>*/
 }
-/* method parser#ReduceAction1007#action for (self: Object, Parser) */
-void VIRTUAL_parser__ReduceAction1007__action(val* self, val* p0) {
-parser__ReduceAction1007__action(self, p0); /* Direct call parser#ReduceAction1007#action on <self:Object(ReduceAction1007)>*/
 RET_LABEL:;
 }