c_src: regenerate

[nit.git] / c_src / nitc__parser_prod.sep.2.c

diff --git a/c_src/nit__parser_prod.sep.2.c b/c_src/nitc__parser_prod.sep.2.c
similarity index 61%
rename from c_src/nit__parser_prod.sep.2.c
rename to c_src/nitc__parser_prod.sep.2.c
index 0eca80a..2f890c2 100644 (file)
--- a/c_src/nit__parser_prod.sep.2.c
+++ b/c_src/nitc__parser_prod.sep.2.c
@@ -1,6 +1,6 @@
-#include "nit__parser_prod.sep.0.h"
+#include "nitc__parser_prod.sep.0.h"
 /* method parser_prod#ASuperPropdef#n_doc= for (self: ASuperPropdef, nullable ADoc) */
-void nit__parser_prod___ASuperPropdef___nit__parser_nodes__ADefinition__n_doc_61d(val* self, val* p0) {
+void nitc__parser_prod___ASuperPropdef___nitc__parser_nodes__ADefinition__n_doc_61d(val* self, val* p0) {
 val* var_node /* var node: nullable ADoc */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -8,7 +8,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_doc].val = var_node; /* _n_doc on <self:ASuperPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_doc].val = var_node; /* _n_doc on <self:ASuperPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -18,7 +18,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable ADoc> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ADoc(ADoc)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ADoc(ADoc)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -30,7 +30,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable ADoc(ADoc)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ADoc(ADoc)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ADoc(ADoc)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -39,7 +39,7 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#ASuperPropdef#n_kwredef= for (self: ASuperPropdef, nullable TKwredef) */
-void nit__parser_prod___ASuperPropdef___nit__parser_nodes__ADefinition__n_kwredef_61d(val* self, val* p0) {
+void nitc__parser_prod___ASuperPropdef___nitc__parser_nodes__ADefinition__n_kwredef_61d(val* self, val* p0) {
 val* var_node /* var node: nullable TKwredef */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -47,7 +47,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_kwredef].val = var_node; /* _n_kwredef on <self:ASuperPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_kwredef].val = var_node; /* _n_kwredef on <self:ASuperPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -57,7 +57,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwredef> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwredef(TKwredef)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwredef(TKwredef)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -69,7 +69,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwredef(TKwredef)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwredef(TKwredef)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwredef(TKwredef)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -78,55 +78,55 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#ASuperPropdef#n_visibility= for (self: ASuperPropdef, nullable AVisibility) */
-void nit__parser_prod___ASuperPropdef___nit__parser_nodes__ADefinition__n_visibility_61d(val* self, val* p0) {
+void nitc__parser_prod___ASuperPropdef___nitc__parser_nodes__ADefinition__n_visibility_61d(val* self, val* p0) {
 val* var_node /* var node: nullable AVisibility */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_visibility].val = var_node; /* _n_visibility on <self:ASuperPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_visibility].val = var_node; /* _n_visibility on <self:ASuperPropdef> */
 if (var_node == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1374);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1374);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AVisibility> */
 if (unlikely(var_node == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AVisibility> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AVisibility> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ASuperPropdef#n_kwsuper= for (self: ASuperPropdef, TKwsuper) */
-void nit__parser_prod___ASuperPropdef___n_kwsuper_61d(val* self, val* p0) {
+void nitc__parser_prod___ASuperPropdef___n_kwsuper_61d(val* self, val* p0) {
 val* var_node /* var node: TKwsuper */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ASuperPropdef___n_kwsuper].val = var_node; /* _n_kwsuper on <self:ASuperPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ASuperPropdef___n_kwsuper].val = var_node; /* _n_kwsuper on <self:ASuperPropdef> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwsuper> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwsuper> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwsuper> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ASuperPropdef#n_type= for (self: ASuperPropdef, AType) */
-void nit__parser_prod___ASuperPropdef___n_type_61d(val* self, val* p0) {
+void nitc__parser_prod___ASuperPropdef___n_type_61d(val* self, val* p0) {
 val* var_node /* var node: AType */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ASuperPropdef___n_type].val = var_node; /* _n_type on <self:ASuperPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ASuperPropdef___n_type].val = var_node; /* _n_type on <self:ASuperPropdef> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:AType> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:AType> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:AType> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ASuperPropdef#n_annotations= for (self: ASuperPropdef, nullable AAnnotations) */
-void nit__parser_prod___ASuperPropdef___nit__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
+void nitc__parser_prod___ASuperPropdef___nitc__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
 val* var_node /* var node: nullable AAnnotations */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -134,7 +134,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:ASuperPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:ASuperPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -144,7 +144,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AAnnotations> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -156,7 +156,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AAnnotations(AAnnotations)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -165,7 +165,7 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#ASuperPropdef#visit_all for (self: ASuperPropdef, Visitor) */
-void nit__parser_prod___ASuperPropdef___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ASuperPropdef___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : nullable ADoc */;
 val* var1 /* : nullable TKwredef */;
@@ -174,44 +174,44 @@ val* var3 /* : TKwsuper */;
 val* var4 /* : AType */;
 val* var5 /* : nullable AAnnotations */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_doc].val; /* _n_doc on <self:ASuperPropdef> */
+var = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_doc].val; /* _n_doc on <self:ASuperPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_kwredef].val; /* _n_kwredef on <self:ASuperPropdef> */
+var1 = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_kwredef].val; /* _n_kwredef on <self:ASuperPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var2 = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_visibility].val; /* _n_visibility on <self:ASuperPropdef> */
+var2 = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_visibility].val; /* _n_visibility on <self:ASuperPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var3 = self->attrs[COLOR_nit__parser_nodes__ASuperPropdef___n_kwsuper].val; /* _n_kwsuper on <self:ASuperPropdef> */
+var3 = self->attrs[COLOR_nitc__parser_nodes__ASuperPropdef___n_kwsuper].val; /* _n_kwsuper on <self:ASuperPropdef> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwsuper");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1398);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1398);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var4 = self->attrs[COLOR_nit__parser_nodes__ASuperPropdef___n_type].val; /* _n_type on <self:ASuperPropdef> */
+var4 = self->attrs[COLOR_nitc__parser_nodes__ASuperPropdef___n_type].val; /* _n_type on <self:ASuperPropdef> */
 if (unlikely(var4 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_type");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1399);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1399);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var5 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:ASuperPropdef> */
+var5 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:ASuperPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var5); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var5); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#init_aannotpropdef for (self: AAnnotPropdef, nullable ADoc, nullable TKwredef, nullable AVisibility, nullable AAtid, nullable TOpar, Collection[Object], nullable TCpar, nullable AAnnotations) */
-void nit__parser_prod___AAnnotPropdef___init_aannotpropdef(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5, val* p6, val* p7) {
+void nitc__parser_prod___AAnnotPropdef___init_aannotpropdef(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5, val* p6, val* p7) {
 val* var_n_doc /* var n_doc: nullable ADoc */;
 val* var_n_kwredef /* var n_kwredef: nullable TKwredef */;
 val* var_n_visibility /* var n_visibility: nullable AVisibility */;
@@ -260,7 +260,7 @@ var_n_opar = p4;
 var_n_args = p5;
 var_n_cpar = p6;
 var_n_annotations = p7;
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_doc].val = var_n_doc; /* _n_doc on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_doc].val = var_n_doc; /* _n_doc on <self:AAnnotPropdef> */
 if (var_n_doc == NULL) {
 var = 0; /* is null */
 } else {
@@ -270,7 +270,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_n_doc,((val*)NULL)) on <var_n_doc:nullable ADoc> */
 var_other = ((val*)NULL);
 {
-var4 = ((short int(*)(val* self, val* p0))(var_n_doc->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_doc, var_other); /* == on <var_n_doc:nullable ADoc(ADoc)>*/
+var4 = ((short int(*)(val* self, val* p0))(var_n_doc->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_doc, var_other); /* == on <var_n_doc:nullable ADoc(ADoc)>*/
 }
 var5 = !var4;
 var2 = var5;
@@ -282,13 +282,13 @@ var = var2;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_n_doc,self) on <var_n_doc:nullable ADoc(ADoc)> */
-var_n_doc->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_doc:nullable ADoc(ADoc)> */
+var_n_doc->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_doc:nullable ADoc(ADoc)> */
 RET_LABEL6:(void)0;
 }
 }
 } else {
 }
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_kwredef].val = var_n_kwredef; /* _n_kwredef on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_kwredef].val = var_n_kwredef; /* _n_kwredef on <self:AAnnotPropdef> */
 if (var_n_kwredef == NULL) {
 var7 = 0; /* is null */
 } else {
@@ -298,7 +298,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_n_kwredef,((val*)NULL)) on <var_n_kwredef:nullable TKwredef> */
 var_other = ((val*)NULL);
 {
-var10 = ((short int(*)(val* self, val* p0))(var_n_kwredef->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_kwredef, var_other); /* == on <var_n_kwredef:nullable TKwredef(TKwredef)>*/
+var10 = ((short int(*)(val* self, val* p0))(var_n_kwredef->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_kwredef, var_other); /* == on <var_n_kwredef:nullable TKwredef(TKwredef)>*/
 }
 var11 = !var10;
 var8 = var11;
@@ -310,13 +310,13 @@ var7 = var8;
 if (var7){
 {
 { /* Inline parser_nodes#ANode#parent= (var_n_kwredef,self) on <var_n_kwredef:nullable TKwredef(TKwredef)> */
-var_n_kwredef->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwredef:nullable TKwredef(TKwredef)> */
+var_n_kwredef->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwredef:nullable TKwredef(TKwredef)> */
 RET_LABEL12:(void)0;
 }
 }
 } else {
 }
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_visibility].val = var_n_visibility; /* _n_visibility on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_visibility].val = var_n_visibility; /* _n_visibility on <self:AAnnotPropdef> */
 if (var_n_visibility == NULL) {
 var13 = 0; /* is null */
 } else {
@@ -326,7 +326,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_n_visibility,((val*)NULL)) on <var_n_visibility:nullable AVisibility> */
 var_other = ((val*)NULL);
 {
-var16 = ((short int(*)(val* self, val* p0))(var_n_visibility->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_visibility, var_other); /* == on <var_n_visibility:nullable AVisibility(AVisibility)>*/
+var16 = ((short int(*)(val* self, val* p0))(var_n_visibility->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_visibility, var_other); /* == on <var_n_visibility:nullable AVisibility(AVisibility)>*/
 }
 var17 = !var16;
 var14 = var17;
@@ -338,7 +338,7 @@ var13 = var14;
 if (var13){
 {
 { /* Inline parser_nodes#ANode#parent= (var_n_visibility,self) on <var_n_visibility:nullable AVisibility(AVisibility)> */
-var_n_visibility->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_visibility:nullable AVisibility(AVisibility)> */
+var_n_visibility->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_visibility:nullable AVisibility(AVisibility)> */
 RET_LABEL18:(void)0;
 }
 }
@@ -346,26 +346,26 @@ RET_LABEL18:(void)0;
 }
 if (unlikely(var_n_atid == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1421);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1421);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_atid].val = var_n_atid; /* _n_atid on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_atid].val = var_n_atid; /* _n_atid on <self:AAnnotPropdef> */
 if (var_n_atid == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1422);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1422);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_atid,self) on <var_n_atid:nullable AAtid> */
 if (unlikely(var_n_atid == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_atid->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_atid:nullable AAtid> */
+var_n_atid->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_atid:nullable AAtid> */
 RET_LABEL19:(void)0;
 }
 }
-self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_opar].val = var_n_opar; /* _n_opar on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_opar].val = var_n_opar; /* _n_opar on <self:AAnnotPropdef> */
 if (var_n_opar == NULL) {
 var20 = 0; /* is null */
 } else {
@@ -375,7 +375,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_n_opar,((val*)NULL)) on <var_n_opar:nullable TOpar> */
 var_other = ((val*)NULL);
 {
-var23 = ((short int(*)(val* self, val* p0))(var_n_opar->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_opar, var_other); /* == on <var_n_opar:nullable TOpar(TOpar)>*/
+var23 = ((short int(*)(val* self, val* p0))(var_n_opar->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_opar, var_other); /* == on <var_n_opar:nullable TOpar(TOpar)>*/
 }
 var24 = !var23;
 var21 = var24;
@@ -387,7 +387,7 @@ var20 = var21;
 if (var20){
 {
 { /* Inline parser_nodes#ANode#parent= (var_n_opar,self) on <var_n_opar:nullable TOpar(TOpar)> */
-var_n_opar->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_opar:nullable TOpar(TOpar)> */
+var_n_opar->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_opar:nullable TOpar(TOpar)> */
 RET_LABEL25:(void)0;
 }
 }
@@ -395,10 +395,10 @@ RET_LABEL25:(void)0;
 }
 {
 { /* Inline parser_nodes#AAnnotation#n_args (self) on <self:AAnnotPropdef> */
-var28 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_args].val; /* _n_args on <self:AAnnotPropdef> */
+var28 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_args].val; /* _n_args on <self:AAnnotPropdef> */
 if (unlikely(var28 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_args");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 2988);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 2926);
 fatal_exit(1);
 }
 var26 = var28;
@@ -406,9 +406,9 @@ RET_LABEL27:(void)0;
 }
 }
 {
-nit___nit__ANodes___unsafe_add_all(var26, var_n_args); /* Direct call parser_nodes#ANodes#unsafe_add_all on <var26:ANodes[AExpr]>*/
+nitc___nitc__ANodes___unsafe_add_all(var26, var_n_args); /* Direct call parser_nodes#ANodes#unsafe_add_all on <var26:ANodes[AExpr]>*/
 }
-self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_cpar].val = var_n_cpar; /* _n_cpar on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_cpar].val = var_n_cpar; /* _n_cpar on <self:AAnnotPropdef> */
 if (var_n_cpar == NULL) {
 var29 = 0; /* is null */
 } else {
@@ -418,7 +418,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_n_cpar,((val*)NULL)) on <var_n_cpar:nullable TCpar> */
 var_other = ((val*)NULL);
 {
-var32 = ((short int(*)(val* self, val* p0))(var_n_cpar->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_cpar, var_other); /* == on <var_n_cpar:nullable TCpar(TCpar)>*/
+var32 = ((short int(*)(val* self, val* p0))(var_n_cpar->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_cpar, var_other); /* == on <var_n_cpar:nullable TCpar(TCpar)>*/
 }
 var33 = !var32;
 var30 = var33;
@@ -430,13 +430,13 @@ var29 = var30;
 if (var29){
 {
 { /* Inline parser_nodes#ANode#parent= (var_n_cpar,self) on <var_n_cpar:nullable TCpar(TCpar)> */
-var_n_cpar->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cpar:nullable TCpar(TCpar)> */
+var_n_cpar->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cpar:nullable TCpar(TCpar)> */
 RET_LABEL34:(void)0;
 }
 }
 } else {
 }
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_n_annotations; /* _n_annotations on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_n_annotations; /* _n_annotations on <self:AAnnotPropdef> */
 if (var_n_annotations == NULL) {
 var35 = 0; /* is null */
 } else {
@@ -446,7 +446,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_n_annotations,((val*)NULL)) on <var_n_annotations:nullable AAnnotations> */
 var_other = ((val*)NULL);
 {
-var38 = ((short int(*)(val* self, val* p0))(var_n_annotations->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_annotations, var_other); /* == on <var_n_annotations:nullable AAnnotations(AAnnotations)>*/
+var38 = ((short int(*)(val* self, val* p0))(var_n_annotations->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_annotations, var_other); /* == on <var_n_annotations:nullable AAnnotations(AAnnotations)>*/
 }
 var39 = !var38;
 var36 = var39;
@@ -458,7 +458,7 @@ var35 = var36;
 if (var35){
 {
 { /* Inline parser_nodes#ANode#parent= (var_n_annotations,self) on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
-var_n_annotations->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
+var_n_annotations->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
 RET_LABEL40:(void)0;
 }
 }
@@ -467,7 +467,7 @@ RET_LABEL40:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#replace_child for (self: AAnnotPropdef, ANode, nullable ANode) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : nullable ADoc */;
@@ -538,7 +538,7 @@ int idtype75;
 const char* var_class_name76;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_doc].val; /* _n_doc on <self:AAnnotPropdef> */
+var = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_doc].val; /* _n_doc on <self:AAnnotPropdef> */
 if (var == NULL) {
 var1 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
@@ -560,8 +560,8 @@ var1 = var2;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa nullable ADoc */
-cltype = type_nullable__nit__ADoc.color;
-idtype = type_nullable__nit__ADoc.id;
+cltype = type_nullable__nitc__ADoc.color;
+idtype = type_nullable__nitc__ADoc.id;
 if(var_new_child == NULL) {
 var7 = 1;
 } else {
@@ -574,16 +574,16 @@ var7 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var7)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable ADoc", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1435);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1435);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAnnotPropdef___nit__parser_nodes__ADefinition__n_doc_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_doc= on <self:AAnnotPropdef>*/
+nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__ADefinition__n_doc_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_doc= on <self:AAnnotPropdef>*/
 }
 goto RET_LABEL;
 } else {
 }
-var8 = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_kwredef].val; /* _n_kwredef on <self:AAnnotPropdef> */
+var8 = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_kwredef].val; /* _n_kwredef on <self:AAnnotPropdef> */
 if (var8 == NULL) {
 var9 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
@@ -605,8 +605,8 @@ var9 = var10;
 }
 if (var9){
 /* <var_new_child:nullable ANode> isa nullable TKwredef */
-cltype16 = type_nullable__nit__TKwredef.color;
-idtype17 = type_nullable__nit__TKwredef.id;
+cltype16 = type_nullable__nitc__TKwredef.color;
+idtype17 = type_nullable__nitc__TKwredef.id;
 if(var_new_child == NULL) {
 var15 = 1;
 } else {
@@ -619,16 +619,16 @@ var15 = var_new_child->type->type_table[cltype16] == idtype17;
 if (unlikely(!var15)) {
 var_class_name18 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwredef", var_class_name18);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1439);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1439);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAnnotPropdef___nit__parser_nodes__ADefinition__n_kwredef_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_kwredef= on <self:AAnnotPropdef>*/
+nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__ADefinition__n_kwredef_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_kwredef= on <self:AAnnotPropdef>*/
 }
 goto RET_LABEL;
 } else {
 }
-var19 = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_visibility].val; /* _n_visibility on <self:AAnnotPropdef> */
+var19 = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_visibility].val; /* _n_visibility on <self:AAnnotPropdef> */
 if (var19 == NULL) {
 var20 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
@@ -650,8 +650,8 @@ var20 = var21;
 }
 if (var20){
 /* <var_new_child:nullable ANode> isa nullable AVisibility */
-cltype27 = type_nullable__nit__AVisibility.color;
-idtype28 = type_nullable__nit__AVisibility.id;
+cltype27 = type_nullable__nitc__AVisibility.color;
+idtype28 = type_nullable__nitc__AVisibility.id;
 if(var_new_child == NULL) {
 var26 = 1;
 } else {
@@ -664,19 +664,19 @@ var26 = var_new_child->type->type_table[cltype27] == idtype28;
 if (unlikely(!var26)) {
 var_class_name29 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AVisibility", var_class_name29);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1443);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1443);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAnnotPropdef___nit__parser_nodes__ADefinition__n_visibility_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_visibility= on <self:AAnnotPropdef>*/
+nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__ADefinition__n_visibility_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_visibility= on <self:AAnnotPropdef>*/
 }
 goto RET_LABEL;
 } else {
 }
-var30 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_atid].val; /* _n_atid on <self:AAnnotPropdef> */
+var30 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_atid].val; /* _n_atid on <self:AAnnotPropdef> */
 if (unlikely(var30 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_atid");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1446);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1446);
 fatal_exit(1);
 }
 {
@@ -697,8 +697,8 @@ RET_LABEL32:(void)0;
 }
 if (var31){
 /* <var_new_child:nullable ANode> isa AAtid */
-cltype37 = type_nit__AAtid.color;
-idtype38 = type_nit__AAtid.id;
+cltype37 = type_nitc__AAtid.color;
+idtype38 = type_nitc__AAtid.id;
 if(var_new_child == NULL) {
 var36 = 0;
 } else {
@@ -711,16 +711,16 @@ var36 = var_new_child->type->type_table[cltype37] == idtype38;
 if (unlikely(!var36)) {
 var_class_name39 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "AAtid", var_class_name39);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1447);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1447);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAnnotPropdef___nit__parser_nodes__AAnnotation__n_atid_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_atid= on <self:AAnnotPropdef>*/
+nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__AAnnotation__n_atid_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_atid= on <self:AAnnotPropdef>*/
 }
 goto RET_LABEL;
 } else {
 }
-var40 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_opar].val; /* _n_opar on <self:AAnnotPropdef> */
+var40 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_opar].val; /* _n_opar on <self:AAnnotPropdef> */
 if (var40 == NULL) {
 var41 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
@@ -742,8 +742,8 @@ var41 = var42;
 }
 if (var41){
 /* <var_new_child:nullable ANode> isa nullable TOpar */
-cltype48 = type_nullable__nit__TOpar.color;
-idtype49 = type_nullable__nit__TOpar.id;
+cltype48 = type_nullable__nitc__TOpar.color;
+idtype49 = type_nullable__nitc__TOpar.id;
 if(var_new_child == NULL) {
 var47 = 1;
 } else {
@@ -756,21 +756,21 @@ var47 = var_new_child->type->type_table[cltype48] == idtype49;
 if (unlikely(!var47)) {
 var_class_name50 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TOpar", var_class_name50);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1451);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1451);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAnnotPropdef___nit__parser_nodes__AAnnotation__n_opar_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_opar= on <self:AAnnotPropdef>*/
+nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__AAnnotation__n_opar_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_opar= on <self:AAnnotPropdef>*/
 }
 goto RET_LABEL;
 } else {
 }
 {
 { /* Inline parser_nodes#AAnnotation#n_args (self) on <self:AAnnotPropdef> */
-var53 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_args].val; /* _n_args on <self:AAnnotPropdef> */
+var53 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_args].val; /* _n_args on <self:AAnnotPropdef> */
 if (unlikely(var53 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_args");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 2988);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 2926);
 fatal_exit(1);
 }
 var51 = var53;
@@ -778,13 +778,13 @@ RET_LABEL52:(void)0;
 }
 }
 {
-var54 = nit___nit__ANodes___replace_child(var51, var_old_child, var_new_child);
+var54 = nitc___nitc__ANodes___replace_child(var51, var_old_child, var_new_child);
 }
 if (var54){
 goto RET_LABEL;
 } else {
 }
-var55 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_cpar].val; /* _n_cpar on <self:AAnnotPropdef> */
+var55 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_cpar].val; /* _n_cpar on <self:AAnnotPropdef> */
 if (var55 == NULL) {
 var56 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
@@ -806,8 +806,8 @@ var56 = var57;
 }
 if (var56){
 /* <var_new_child:nullable ANode> isa nullable TCpar */
-cltype63 = type_nullable__nit__TCpar.color;
-idtype64 = type_nullable__nit__TCpar.id;
+cltype63 = type_nullable__nitc__TCpar.color;
+idtype64 = type_nullable__nitc__TCpar.id;
 if(var_new_child == NULL) {
 var62 = 1;
 } else {
@@ -820,16 +820,16 @@ var62 = var_new_child->type->type_table[cltype63] == idtype64;
 if (unlikely(!var62)) {
 var_class_name65 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TCpar", var_class_name65);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1456);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1456);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAnnotPropdef___nit__parser_nodes__AAnnotation__n_cpar_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_cpar= on <self:AAnnotPropdef>*/
+nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__AAnnotation__n_cpar_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_cpar= on <self:AAnnotPropdef>*/
 }
 goto RET_LABEL;
 } else {
 }
-var66 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AAnnotPropdef> */
+var66 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AAnnotPropdef> */
 if (var66 == NULL) {
 var67 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
@@ -851,8 +851,8 @@ var67 = var68;
 }
 if (var67){
 /* <var_new_child:nullable ANode> isa nullable AAnnotations */
-cltype74 = type_nullable__nit__AAnnotations.color;
-idtype75 = type_nullable__nit__AAnnotations.id;
+cltype74 = type_nullable__nitc__AAnnotations.color;
+idtype75 = type_nullable__nitc__AAnnotations.id;
 if(var_new_child == NULL) {
 var73 = 1;
 } else {
@@ -865,11 +865,11 @@ var73 = var_new_child->type->type_table[cltype74] == idtype75;
 if (unlikely(!var73)) {
 var_class_name76 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AAnnotations", var_class_name76);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1460);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1460);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAnnotPropdef___nit__parser_nodes__Prod__n_annotations_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_annotations= on <self:AAnnotPropdef>*/
+nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__Prod__n_annotations_61d(self, var_new_child); /* Direct call parser_prod#AAnnotPropdef#n_annotations= on <self:AAnnotPropdef>*/
 }
 goto RET_LABEL;
 } else {
@@ -877,7 +877,7 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#n_doc= for (self: AAnnotPropdef, nullable ADoc) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__ADefinition__n_doc_61d(val* self, val* p0) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__ADefinition__n_doc_61d(val* self, val* p0) {
 val* var_node /* var node: nullable ADoc */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -885,7 +885,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_doc].val = var_node; /* _n_doc on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_doc].val = var_node; /* _n_doc on <self:AAnnotPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -895,7 +895,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable ADoc> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ADoc(ADoc)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ADoc(ADoc)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -907,7 +907,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable ADoc(ADoc)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ADoc(ADoc)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ADoc(ADoc)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -916,7 +916,7 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#n_kwredef= for (self: AAnnotPropdef, nullable TKwredef) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__ADefinition__n_kwredef_61d(val* self, val* p0) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__ADefinition__n_kwredef_61d(val* self, val* p0) {
 val* var_node /* var node: nullable TKwredef */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -924,7 +924,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_kwredef].val = var_node; /* _n_kwredef on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_kwredef].val = var_node; /* _n_kwredef on <self:AAnnotPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -934,7 +934,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwredef> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwredef(TKwredef)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwredef(TKwredef)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -946,7 +946,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwredef(TKwredef)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwredef(TKwredef)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwredef(TKwredef)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -955,7 +955,7 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#n_visibility= for (self: AAnnotPropdef, nullable AVisibility) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__ADefinition__n_visibility_61d(val* self, val* p0) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__ADefinition__n_visibility_61d(val* self, val* p0) {
 val* var_node /* var node: nullable AVisibility */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -963,7 +963,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ADefinition___n_visibility].val = var_node; /* _n_visibility on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_visibility].val = var_node; /* _n_visibility on <self:AAnnotPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -973,7 +973,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AVisibility> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AVisibility(AVisibility)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AVisibility(AVisibility)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -985,7 +985,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AVisibility(AVisibility)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AVisibility(AVisibility)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AVisibility(AVisibility)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -994,20 +994,20 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#n_atid= for (self: AAnnotPropdef, AAtid) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__AAnnotation__n_atid_61d(val* self, val* p0) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__AAnnotation__n_atid_61d(val* self, val* p0) {
 val* var_node /* var node: AAtid */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_atid].val = var_node; /* _n_atid on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_atid].val = var_node; /* _n_atid on <self:AAnnotPropdef> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:AAtid> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:AAtid> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:AAtid> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#n_opar= for (self: AAnnotPropdef, nullable TOpar) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__AAnnotation__n_opar_61d(val* self, val* p0) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__AAnnotation__n_opar_61d(val* self, val* p0) {
 val* var_node /* var node: nullable TOpar */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -1015,7 +1015,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_opar].val = var_node; /* _n_opar on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_opar].val = var_node; /* _n_opar on <self:AAnnotPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -1025,7 +1025,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TOpar> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TOpar(TOpar)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TOpar(TOpar)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -1037,7 +1037,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TOpar(TOpar)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TOpar(TOpar)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TOpar(TOpar)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -1046,7 +1046,7 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#n_cpar= for (self: AAnnotPropdef, nullable TCpar) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__AAnnotation__n_cpar_61d(val* self, val* p0) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__AAnnotation__n_cpar_61d(val* self, val* p0) {
 val* var_node /* var node: nullable TCpar */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -1054,7 +1054,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_cpar].val = var_node; /* _n_cpar on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_cpar].val = var_node; /* _n_cpar on <self:AAnnotPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -1064,7 +1064,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TCpar> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TCpar(TCpar)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TCpar(TCpar)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -1076,7 +1076,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TCpar(TCpar)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TCpar(TCpar)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TCpar(TCpar)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -1085,7 +1085,7 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#n_annotations= for (self: AAnnotPropdef, nullable AAnnotations) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
 val* var_node /* var node: nullable AAnnotations */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -1093,7 +1093,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:AAnnotPropdef> */
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:AAnnotPropdef> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -1103,7 +1103,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AAnnotations> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -1115,7 +1115,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AAnnotations(AAnnotations)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -1124,7 +1124,7 @@ RET_LABEL5:(void)0;
 RET_LABEL:;
 }
 /* method parser_prod#AAnnotPropdef#visit_all for (self: AAnnotPropdef, Visitor) */
-void nit__parser_prod___AAnnotPropdef___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AAnnotPropdef___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : nullable ADoc */;
 val* var1 /* : nullable TKwredef */;
@@ -1136,37 +1136,37 @@ val* var7 /* : ANodes[AExpr] */;
 val* var8 /* : nullable TCpar */;
 val* var9 /* : nullable AAnnotations */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_doc].val; /* _n_doc on <self:AAnnotPropdef> */
+var = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_doc].val; /* _n_doc on <self:AAnnotPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_kwredef].val; /* _n_kwredef on <self:AAnnotPropdef> */
+var1 = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_kwredef].val; /* _n_kwredef on <self:AAnnotPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var2 = self->attrs[COLOR_nit__parser_nodes__ADefinition___n_visibility].val; /* _n_visibility on <self:AAnnotPropdef> */
+var2 = self->attrs[COLOR_nitc__parser_nodes__ADefinition___n_visibility].val; /* _n_visibility on <self:AAnnotPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var3 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_atid].val; /* _n_atid on <self:AAnnotPropdef> */
+var3 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_atid].val; /* _n_atid on <self:AAnnotPropdef> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_atid");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1507);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1507);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var4 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_opar].val; /* _n_opar on <self:AAnnotPropdef> */
+var4 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_opar].val; /* _n_opar on <self:AAnnotPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 {
 { /* Inline parser_nodes#AAnnotation#n_args (self) on <self:AAnnotPropdef> */
-var7 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_args].val; /* _n_args on <self:AAnnotPropdef> */
+var7 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_args].val; /* _n_args on <self:AAnnotPropdef> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_args");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 2988);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 2926);
 fatal_exit(1);
 }
 var5 = var7;
@@ -1174,20 +1174,20 @@ RET_LABEL6:(void)0;
 }
 }
 {
-nit___nit__ANodes___visit_all(var5, var_v); /* Direct call parser_nodes#ANodes#visit_all on <var5:ANodes[AExpr]>*/
+nitc___nitc__ANodes___visit_all(var5, var_v); /* Direct call parser_nodes#ANodes#visit_all on <var5:ANodes[AExpr]>*/
 }
-var8 = self->attrs[COLOR_nit__parser_nodes__AAnnotation___n_cpar].val; /* _n_cpar on <self:AAnnotPropdef> */
+var8 = self->attrs[COLOR_nitc__parser_nodes__AAnnotation___n_cpar].val; /* _n_cpar on <self:AAnnotPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var8); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var8); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var9 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AAnnotPropdef> */
+var9 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AAnnotPropdef> */
 {
-nit___nit__Visitor___enter_visit(var_v, var9); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var9); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AIdMethid#init_aidmethid for (self: AIdMethid, nullable TId) */
-void nit__parser_prod___AIdMethid___init_aidmethid(val* self, val* p0) {
+void nitc__parser_prod___AIdMethid___init_aidmethid(val* self, val* p0) {
 val* var_n_id /* var n_id: nullable TId */;
 {
 { /* Inline kernel#Object#init (self) on <self:AIdMethid> */
@@ -1197,29 +1197,29 @@ RET_LABEL1:(void)0;
 var_n_id = p0;
 if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1519);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1519);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AIdMethid___n_id].val = var_n_id; /* _n_id on <self:AIdMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AIdMethid___n_id].val = var_n_id; /* _n_id on <self:AIdMethid> */
 if (var_n_id == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1520);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1520);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId> */
 if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_id->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
+var_n_id->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AIdMethid#replace_child for (self: AIdMethid, ANode, nullable ANode) */
-void nit__parser_prod___AIdMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AIdMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : TId */;
@@ -1233,10 +1233,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AIdMethid___n_id].val; /* _n_id on <self:AIdMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AIdMethid___n_id].val; /* _n_id on <self:AIdMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1525);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1525);
 fatal_exit(1);
 }
 {
@@ -1257,8 +1257,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TId */
-cltype = type_nit__TId.color;
-idtype = type_nit__TId.id;
+cltype = type_nitc__TId.color;
+idtype = type_nitc__TId.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -1271,11 +1271,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TId", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1526);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1526);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIdMethid___n_id_61d(self, var_new_child); /* Direct call parser_prod#AIdMethid#n_id= on <self:AIdMethid>*/
+nitc__parser_prod___AIdMethid___n_id_61d(self, var_new_child); /* Direct call parser_prod#AIdMethid#n_id= on <self:AIdMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -1283,36 +1283,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AIdMethid#n_id= for (self: AIdMethid, TId) */
-void nit__parser_prod___AIdMethid___n_id_61d(val* self, val* p0) {
+void nitc__parser_prod___AIdMethid___n_id_61d(val* self, val* p0) {
 val* var_node /* var node: TId */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AIdMethid___n_id].val = var_node; /* _n_id on <self:AIdMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AIdMethid___n_id].val = var_node; /* _n_id on <self:AIdMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TId> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AIdMethid#visit_all for (self: AIdMethid, Visitor) */
-void nit__parser_prod___AIdMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AIdMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : TId */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AIdMethid___n_id].val; /* _n_id on <self:AIdMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AIdMethid___n_id].val; /* _n_id on <self:AIdMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1540);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1540);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#APlusMethid#init_aplusmethid for (self: APlusMethid, nullable TPlus) */
-void nit__parser_prod___APlusMethid___init_aplusmethid(val* self, val* p0) {
+void nitc__parser_prod___APlusMethid___init_aplusmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TPlus */;
 {
 { /* Inline kernel#Object#init (self) on <self:APlusMethid> */
@@ -1322,29 +1322,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1548);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1548);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:APlusMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:APlusMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1549);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1549);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TPlus> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TPlus> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TPlus> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#APlusMethid#replace_child for (self: APlusMethid, ANode, nullable ANode) */
-void nit__parser_prod___APlusMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___APlusMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -1358,10 +1358,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APlusMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APlusMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1554);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1554);
 fatal_exit(1);
 }
 {
@@ -1382,8 +1382,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TPlus */
-cltype = type_nit__TPlus.color;
-idtype = type_nit__TPlus.id;
+cltype = type_nitc__TPlus.color;
+idtype = type_nitc__TPlus.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -1396,11 +1396,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TPlus", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1555);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1555);
 fatal_exit(1);
 }
 {
-nit__parser_prod___APlusMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#APlusMethid#n_op= on <self:APlusMethid>*/
+nitc__parser_prod___APlusMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#APlusMethid#n_op= on <self:APlusMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -1408,36 +1408,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#APlusMethid#n_op= for (self: APlusMethid, Token) */
-void nit__parser_prod___APlusMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___APlusMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:APlusMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:APlusMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#APlusMethid#visit_all for (self: APlusMethid, Visitor) */
-void nit__parser_prod___APlusMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___APlusMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APlusMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APlusMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1569);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1569);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AMinusMethid#init_aminusmethid for (self: AMinusMethid, nullable TMinus) */
-void nit__parser_prod___AMinusMethid___init_aminusmethid(val* self, val* p0) {
+void nitc__parser_prod___AMinusMethid___init_aminusmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TMinus */;
 {
 { /* Inline kernel#Object#init (self) on <self:AMinusMethid> */
@@ -1447,29 +1447,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1577);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1577);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AMinusMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AMinusMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1578);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1578);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TMinus> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TMinus> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TMinus> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AMinusMethid#replace_child for (self: AMinusMethid, ANode, nullable ANode) */
-void nit__parser_prod___AMinusMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AMinusMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -1483,10 +1483,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AMinusMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AMinusMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1583);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1583);
 fatal_exit(1);
 }
 {
@@ -1507,8 +1507,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TMinus */
-cltype = type_nit__TMinus.color;
-idtype = type_nit__TMinus.id;
+cltype = type_nitc__TMinus.color;
+idtype = type_nitc__TMinus.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -1521,11 +1521,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TMinus", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1584);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1584);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AMinusMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AMinusMethid#n_op= on <self:AMinusMethid>*/
+nitc__parser_prod___AMinusMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AMinusMethid#n_op= on <self:AMinusMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -1533,36 +1533,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AMinusMethid#n_op= for (self: AMinusMethid, Token) */
-void nit__parser_prod___AMinusMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AMinusMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AMinusMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AMinusMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AMinusMethid#visit_all for (self: AMinusMethid, Visitor) */
-void nit__parser_prod___AMinusMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AMinusMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AMinusMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AMinusMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1598);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1598);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarMethid#init_astarmethid for (self: AStarMethid, nullable TStar) */
-void nit__parser_prod___AStarMethid___init_astarmethid(val* self, val* p0) {
+void nitc__parser_prod___AStarMethid___init_astarmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TStar */;
 {
 { /* Inline kernel#Object#init (self) on <self:AStarMethid> */
@@ -1572,29 +1572,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1606);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1606);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AStarMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AStarMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1607);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1607);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TStar> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TStar> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TStar> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarMethid#replace_child for (self: AStarMethid, ANode, nullable ANode) */
-void nit__parser_prod___AStarMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AStarMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -1608,10 +1608,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1612);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1612);
 fatal_exit(1);
 }
 {
@@ -1632,8 +1632,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TStar */
-cltype = type_nit__TStar.color;
-idtype = type_nit__TStar.id;
+cltype = type_nitc__TStar.color;
+idtype = type_nitc__TStar.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -1646,11 +1646,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TStar", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1613);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1613);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AStarMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AStarMethid#n_op= on <self:AStarMethid>*/
+nitc__parser_prod___AStarMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AStarMethid#n_op= on <self:AStarMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -1658,36 +1658,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AStarMethid#n_op= for (self: AStarMethid, Token) */
-void nit__parser_prod___AStarMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AStarMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AStarMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AStarMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarMethid#visit_all for (self: AStarMethid, Visitor) */
-void nit__parser_prod___AStarMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AStarMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1627);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1627);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarstarMethid#init_astarstarmethid for (self: AStarstarMethid, nullable TStarstar) */
-void nit__parser_prod___AStarstarMethid___init_astarstarmethid(val* self, val* p0) {
+void nitc__parser_prod___AStarstarMethid___init_astarstarmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TStarstar */;
 {
 { /* Inline kernel#Object#init (self) on <self:AStarstarMethid> */
@@ -1697,29 +1697,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1635);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1635);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AStarstarMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AStarstarMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1636);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1636);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TStarstar> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TStarstar> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TStarstar> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarstarMethid#replace_child for (self: AStarstarMethid, ANode, nullable ANode) */
-void nit__parser_prod___AStarstarMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AStarstarMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -1733,10 +1733,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarstarMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarstarMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1641);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1641);
 fatal_exit(1);
 }
 {
@@ -1757,8 +1757,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TStarstar */
-cltype = type_nit__TStarstar.color;
-idtype = type_nit__TStarstar.id;
+cltype = type_nitc__TStarstar.color;
+idtype = type_nitc__TStarstar.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -1771,11 +1771,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TStarstar", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1642);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1642);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AStarstarMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AStarstarMethid#n_op= on <self:AStarstarMethid>*/
+nitc__parser_prod___AStarstarMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AStarstarMethid#n_op= on <self:AStarstarMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -1783,36 +1783,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AStarstarMethid#n_op= for (self: AStarstarMethid, Token) */
-void nit__parser_prod___AStarstarMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AStarstarMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AStarstarMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AStarstarMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarstarMethid#visit_all for (self: AStarstarMethid, Visitor) */
-void nit__parser_prod___AStarstarMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AStarstarMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarstarMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarstarMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1656);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1656);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ASlashMethid#init_aslashmethid for (self: ASlashMethid, nullable TSlash) */
-void nit__parser_prod___ASlashMethid___init_aslashmethid(val* self, val* p0) {
+void nitc__parser_prod___ASlashMethid___init_aslashmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TSlash */;
 {
 { /* Inline kernel#Object#init (self) on <self:ASlashMethid> */
@@ -1822,29 +1822,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1664);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1664);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ASlashMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ASlashMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1665);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1665);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TSlash> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TSlash> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TSlash> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ASlashMethid#replace_child for (self: ASlashMethid, ANode, nullable ANode) */
-void nit__parser_prod___ASlashMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ASlashMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -1858,10 +1858,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ASlashMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ASlashMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1670);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1670);
 fatal_exit(1);
 }
 {
@@ -1882,8 +1882,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TSlash */
-cltype = type_nit__TSlash.color;
-idtype = type_nit__TSlash.id;
+cltype = type_nitc__TSlash.color;
+idtype = type_nitc__TSlash.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -1896,11 +1896,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TSlash", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1671);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1671);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ASlashMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ASlashMethid#n_op= on <self:ASlashMethid>*/
+nitc__parser_prod___ASlashMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ASlashMethid#n_op= on <self:ASlashMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -1908,36 +1908,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ASlashMethid#n_op= for (self: ASlashMethid, Token) */
-void nit__parser_prod___ASlashMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___ASlashMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ASlashMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ASlashMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ASlashMethid#visit_all for (self: ASlashMethid, Visitor) */
-void nit__parser_prod___ASlashMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ASlashMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ASlashMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ASlashMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1685);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1685);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#APercentMethid#init_apercentmethid for (self: APercentMethid, nullable TPercent) */
-void nit__parser_prod___APercentMethid___init_apercentmethid(val* self, val* p0) {
+void nitc__parser_prod___APercentMethid___init_apercentmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TPercent */;
 {
 { /* Inline kernel#Object#init (self) on <self:APercentMethid> */
@@ -1947,29 +1947,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1693);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1693);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:APercentMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:APercentMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1694);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1694);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TPercent> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TPercent> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TPercent> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#APercentMethid#replace_child for (self: APercentMethid, ANode, nullable ANode) */
-void nit__parser_prod___APercentMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___APercentMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -1983,10 +1983,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APercentMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APercentMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1699);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1699);
 fatal_exit(1);
 }
 {
@@ -2007,8 +2007,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TPercent */
-cltype = type_nit__TPercent.color;
-idtype = type_nit__TPercent.id;
+cltype = type_nitc__TPercent.color;
+idtype = type_nitc__TPercent.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -2021,11 +2021,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TPercent", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1700);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1700);
 fatal_exit(1);
 }
 {
-nit__parser_prod___APercentMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#APercentMethid#n_op= on <self:APercentMethid>*/
+nitc__parser_prod___APercentMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#APercentMethid#n_op= on <self:APercentMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -2033,36 +2033,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#APercentMethid#n_op= for (self: APercentMethid, Token) */
-void nit__parser_prod___APercentMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___APercentMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:APercentMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:APercentMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#APercentMethid#visit_all for (self: APercentMethid, Visitor) */
-void nit__parser_prod___APercentMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___APercentMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APercentMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APercentMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1714);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1714);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AEqMethid#init_aeqmethid for (self: AEqMethid, nullable TEq) */
-void nit__parser_prod___AEqMethid___init_aeqmethid(val* self, val* p0) {
+void nitc__parser_prod___AEqMethid___init_aeqmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TEq */;
 {
 { /* Inline kernel#Object#init (self) on <self:AEqMethid> */
@@ -2072,29 +2072,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1722);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1722);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AEqMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AEqMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1723);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1723);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TEq> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TEq> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TEq> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AEqMethid#replace_child for (self: AEqMethid, ANode, nullable ANode) */
-void nit__parser_prod___AEqMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AEqMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -2108,10 +2108,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AEqMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AEqMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1728);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1728);
 fatal_exit(1);
 }
 {
@@ -2132,8 +2132,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TEq */
-cltype = type_nit__TEq.color;
-idtype = type_nit__TEq.id;
+cltype = type_nitc__TEq.color;
+idtype = type_nitc__TEq.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -2146,11 +2146,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TEq", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1729);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1729);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AEqMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AEqMethid#n_op= on <self:AEqMethid>*/
+nitc__parser_prod___AEqMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AEqMethid#n_op= on <self:AEqMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -2158,36 +2158,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AEqMethid#n_op= for (self: AEqMethid, Token) */
-void nit__parser_prod___AEqMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AEqMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AEqMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AEqMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AEqMethid#visit_all for (self: AEqMethid, Visitor) */
-void nit__parser_prod___AEqMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AEqMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AEqMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AEqMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1743);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1743);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ANeMethid#init_anemethid for (self: ANeMethid, nullable TNe) */
-void nit__parser_prod___ANeMethid___init_anemethid(val* self, val* p0) {
+void nitc__parser_prod___ANeMethid___init_anemethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TNe */;
 {
 { /* Inline kernel#Object#init (self) on <self:ANeMethid> */
@@ -2197,29 +2197,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1751);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1751);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ANeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ANeMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1752);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1752);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TNe> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TNe> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TNe> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ANeMethid#replace_child for (self: ANeMethid, ANode, nullable ANode) */
-void nit__parser_prod___ANeMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ANeMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -2233,10 +2233,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ANeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ANeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1757);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1757);
 fatal_exit(1);
 }
 {
@@ -2257,8 +2257,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TNe */
-cltype = type_nit__TNe.color;
-idtype = type_nit__TNe.id;
+cltype = type_nitc__TNe.color;
+idtype = type_nitc__TNe.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -2271,11 +2271,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TNe", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1758);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1758);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ANeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ANeMethid#n_op= on <self:ANeMethid>*/
+nitc__parser_prod___ANeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ANeMethid#n_op= on <self:ANeMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -2283,36 +2283,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ANeMethid#n_op= for (self: ANeMethid, Token) */
-void nit__parser_prod___ANeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___ANeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ANeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ANeMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ANeMethid#visit_all for (self: ANeMethid, Visitor) */
-void nit__parser_prod___ANeMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ANeMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ANeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ANeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1772);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1772);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALeMethid#init_alemethid for (self: ALeMethid, nullable TLe) */
-void nit__parser_prod___ALeMethid___init_alemethid(val* self, val* p0) {
+void nitc__parser_prod___ALeMethid___init_alemethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TLe */;
 {
 { /* Inline kernel#Object#init (self) on <self:ALeMethid> */
@@ -2322,29 +2322,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1780);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1780);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ALeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ALeMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1781);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1781);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TLe> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TLe> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TLe> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALeMethid#replace_child for (self: ALeMethid, ANode, nullable ANode) */
-void nit__parser_prod___ALeMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ALeMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -2358,10 +2358,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1786);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1786);
 fatal_exit(1);
 }
 {
@@ -2382,8 +2382,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TLe */
-cltype = type_nit__TLe.color;
-idtype = type_nit__TLe.id;
+cltype = type_nitc__TLe.color;
+idtype = type_nitc__TLe.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -2396,11 +2396,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TLe", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1787);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1787);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ALeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ALeMethid#n_op= on <self:ALeMethid>*/
+nitc__parser_prod___ALeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ALeMethid#n_op= on <self:ALeMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -2408,36 +2408,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ALeMethid#n_op= for (self: ALeMethid, Token) */
-void nit__parser_prod___ALeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___ALeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ALeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ALeMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALeMethid#visit_all for (self: ALeMethid, Visitor) */
-void nit__parser_prod___ALeMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ALeMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1801);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1801);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGeMethid#init_agemethid for (self: AGeMethid, nullable TGe) */
-void nit__parser_prod___AGeMethid___init_agemethid(val* self, val* p0) {
+void nitc__parser_prod___AGeMethid___init_agemethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TGe */;
 {
 { /* Inline kernel#Object#init (self) on <self:AGeMethid> */
@@ -2447,29 +2447,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1809);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1809);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AGeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AGeMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1810);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1810);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TGe> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TGe> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TGe> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGeMethid#replace_child for (self: AGeMethid, ANode, nullable ANode) */
-void nit__parser_prod___AGeMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AGeMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -2483,10 +2483,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1815);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1815);
 fatal_exit(1);
 }
 {
@@ -2507,8 +2507,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TGe */
-cltype = type_nit__TGe.color;
-idtype = type_nit__TGe.id;
+cltype = type_nitc__TGe.color;
+idtype = type_nitc__TGe.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -2521,11 +2521,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TGe", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1816);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1816);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AGeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AGeMethid#n_op= on <self:AGeMethid>*/
+nitc__parser_prod___AGeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AGeMethid#n_op= on <self:AGeMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -2533,36 +2533,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AGeMethid#n_op= for (self: AGeMethid, Token) */
-void nit__parser_prod___AGeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AGeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AGeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AGeMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGeMethid#visit_all for (self: AGeMethid, Visitor) */
-void nit__parser_prod___AGeMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AGeMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1830);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1830);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALtMethid#init_altmethid for (self: ALtMethid, nullable TLt) */
-void nit__parser_prod___ALtMethid___init_altmethid(val* self, val* p0) {
+void nitc__parser_prod___ALtMethid___init_altmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TLt */;
 {
 { /* Inline kernel#Object#init (self) on <self:ALtMethid> */
@@ -2572,29 +2572,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1838);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1838);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ALtMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ALtMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1839);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1839);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TLt> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TLt> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TLt> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALtMethid#replace_child for (self: ALtMethid, ANode, nullable ANode) */
-void nit__parser_prod___ALtMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ALtMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -2608,10 +2608,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALtMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALtMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1844);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1844);
 fatal_exit(1);
 }
 {
@@ -2632,8 +2632,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TLt */
-cltype = type_nit__TLt.color;
-idtype = type_nit__TLt.id;
+cltype = type_nitc__TLt.color;
+idtype = type_nitc__TLt.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -2646,11 +2646,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TLt", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1845);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1845);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ALtMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ALtMethid#n_op= on <self:ALtMethid>*/
+nitc__parser_prod___ALtMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ALtMethid#n_op= on <self:ALtMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -2658,36 +2658,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ALtMethid#n_op= for (self: ALtMethid, Token) */
-void nit__parser_prod___ALtMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___ALtMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ALtMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ALtMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALtMethid#visit_all for (self: ALtMethid, Visitor) */
-void nit__parser_prod___ALtMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ALtMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALtMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALtMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1859);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1859);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGtMethid#init_agtmethid for (self: AGtMethid, nullable TGt) */
-void nit__parser_prod___AGtMethid___init_agtmethid(val* self, val* p0) {
+void nitc__parser_prod___AGtMethid___init_agtmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TGt */;
 {
 { /* Inline kernel#Object#init (self) on <self:AGtMethid> */
@@ -2697,29 +2697,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1867);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1867);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AGtMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AGtMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1868);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1868);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TGt> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TGt> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TGt> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGtMethid#replace_child for (self: AGtMethid, ANode, nullable ANode) */
-void nit__parser_prod___AGtMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AGtMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -2733,10 +2733,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGtMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGtMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1873);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1873);
 fatal_exit(1);
 }
 {
@@ -2757,8 +2757,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TGt */
-cltype = type_nit__TGt.color;
-idtype = type_nit__TGt.id;
+cltype = type_nitc__TGt.color;
+idtype = type_nitc__TGt.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -2771,11 +2771,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TGt", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1874);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1874);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AGtMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AGtMethid#n_op= on <self:AGtMethid>*/
+nitc__parser_prod___AGtMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AGtMethid#n_op= on <self:AGtMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -2783,36 +2783,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AGtMethid#n_op= for (self: AGtMethid, Token) */
-void nit__parser_prod___AGtMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AGtMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AGtMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AGtMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGtMethid#visit_all for (self: AGtMethid, Visitor) */
-void nit__parser_prod___AGtMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AGtMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGtMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGtMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1888);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1888);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALlMethid#init_allmethid for (self: ALlMethid, nullable TLl) */
-void nit__parser_prod___ALlMethid___init_allmethid(val* self, val* p0) {
+void nitc__parser_prod___ALlMethid___init_allmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TLl */;
 {
 { /* Inline kernel#Object#init (self) on <self:ALlMethid> */
@@ -2822,29 +2822,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1896);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1896);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ALlMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ALlMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1897);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1897);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TLl> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TLl> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TLl> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALlMethid#replace_child for (self: ALlMethid, ANode, nullable ANode) */
-void nit__parser_prod___ALlMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ALlMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -2858,10 +2858,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALlMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALlMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1902);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1902);
 fatal_exit(1);
 }
 {
@@ -2882,8 +2882,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TLl */
-cltype = type_nit__TLl.color;
-idtype = type_nit__TLl.id;
+cltype = type_nitc__TLl.color;
+idtype = type_nitc__TLl.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -2896,11 +2896,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TLl", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1903);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1903);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ALlMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ALlMethid#n_op= on <self:ALlMethid>*/
+nitc__parser_prod___ALlMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ALlMethid#n_op= on <self:ALlMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -2908,36 +2908,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ALlMethid#n_op= for (self: ALlMethid, Token) */
-void nit__parser_prod___ALlMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___ALlMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ALlMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ALlMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ALlMethid#visit_all for (self: ALlMethid, Visitor) */
-void nit__parser_prod___ALlMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ALlMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALlMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ALlMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1917);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1917);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGgMethid#init_aggmethid for (self: AGgMethid, nullable TGg) */
-void nit__parser_prod___AGgMethid___init_aggmethid(val* self, val* p0) {
+void nitc__parser_prod___AGgMethid___init_aggmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TGg */;
 {
 { /* Inline kernel#Object#init (self) on <self:AGgMethid> */
@@ -2947,29 +2947,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1925);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1925);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AGgMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AGgMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1926);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1926);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TGg> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TGg> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TGg> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGgMethid#replace_child for (self: AGgMethid, ANode, nullable ANode) */
-void nit__parser_prod___AGgMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AGgMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -2983,10 +2983,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGgMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGgMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1931);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1931);
 fatal_exit(1);
 }
 {
@@ -3007,8 +3007,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TGg */
-cltype = type_nit__TGg.color;
-idtype = type_nit__TGg.id;
+cltype = type_nitc__TGg.color;
+idtype = type_nitc__TGg.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -3021,11 +3021,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TGg", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1932);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1932);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AGgMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AGgMethid#n_op= on <self:AGgMethid>*/
+nitc__parser_prod___AGgMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AGgMethid#n_op= on <self:AGgMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -3033,36 +3033,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AGgMethid#n_op= for (self: AGgMethid, Token) */
-void nit__parser_prod___AGgMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AGgMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AGgMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AGgMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AGgMethid#visit_all for (self: AGgMethid, Visitor) */
-void nit__parser_prod___AGgMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AGgMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGgMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AGgMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1946);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1946);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarshipMethid#init_astarshipmethid for (self: AStarshipMethid, nullable TStarship) */
-void nit__parser_prod___AStarshipMethid___init_astarshipmethid(val* self, val* p0) {
+void nitc__parser_prod___AStarshipMethid___init_astarshipmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TStarship */;
 {
 { /* Inline kernel#Object#init (self) on <self:AStarshipMethid> */
@@ -3072,29 +3072,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1954);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1954);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AStarshipMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AStarshipMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1955);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1955);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TStarship> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TStarship> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TStarship> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarshipMethid#replace_child for (self: AStarshipMethid, ANode, nullable ANode) */
-void nit__parser_prod___AStarshipMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AStarshipMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -3108,10 +3108,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarshipMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarshipMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1960);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1960);
 fatal_exit(1);
 }
 {
@@ -3132,8 +3132,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TStarship */
-cltype = type_nit__TStarship.color;
-idtype = type_nit__TStarship.id;
+cltype = type_nitc__TStarship.color;
+idtype = type_nitc__TStarship.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -3146,11 +3146,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TStarship", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1961);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1961);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AStarshipMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AStarshipMethid#n_op= on <self:AStarshipMethid>*/
+nitc__parser_prod___AStarshipMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AStarshipMethid#n_op= on <self:AStarshipMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -3158,36 +3158,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AStarshipMethid#n_op= for (self: AStarshipMethid, Token) */
-void nit__parser_prod___AStarshipMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AStarshipMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AStarshipMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AStarshipMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AStarshipMethid#visit_all for (self: AStarshipMethid, Visitor) */
-void nit__parser_prod___AStarshipMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AStarshipMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarshipMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AStarshipMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1975);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1975);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#APipeMethid#init_apipemethid for (self: APipeMethid, nullable TPipe) */
-void nit__parser_prod___APipeMethid___init_apipemethid(val* self, val* p0) {
+void nitc__parser_prod___APipeMethid___init_apipemethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TPipe */;
 {
 { /* Inline kernel#Object#init (self) on <self:APipeMethid> */
@@ -3197,29 +3197,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1983);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1983);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:APipeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:APipeMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1984);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1984);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TPipe> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TPipe> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TPipe> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#APipeMethid#replace_child for (self: APipeMethid, ANode, nullable ANode) */
-void nit__parser_prod___APipeMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___APipeMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -3233,10 +3233,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APipeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APipeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1989);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1989);
 fatal_exit(1);
 }
 {
@@ -3257,8 +3257,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TPipe */
-cltype = type_nit__TPipe.color;
-idtype = type_nit__TPipe.id;
+cltype = type_nitc__TPipe.color;
+idtype = type_nitc__TPipe.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -3271,11 +3271,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TPipe", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 1990);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 1990);
 fatal_exit(1);
 }
 {
-nit__parser_prod___APipeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#APipeMethid#n_op= on <self:APipeMethid>*/
+nitc__parser_prod___APipeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#APipeMethid#n_op= on <self:APipeMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -3283,36 +3283,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#APipeMethid#n_op= for (self: APipeMethid, Token) */
-void nit__parser_prod___APipeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___APipeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:APipeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:APipeMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#APipeMethid#visit_all for (self: APipeMethid, Visitor) */
-void nit__parser_prod___APipeMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___APipeMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APipeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:APipeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2004);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2004);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ACaretMethid#init_acaretmethid for (self: ACaretMethid, nullable TCaret) */
-void nit__parser_prod___ACaretMethid___init_acaretmethid(val* self, val* p0) {
+void nitc__parser_prod___ACaretMethid___init_acaretmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TCaret */;
 {
 { /* Inline kernel#Object#init (self) on <self:ACaretMethid> */
@@ -3322,29 +3322,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2012);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2012);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ACaretMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ACaretMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2013);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2013);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TCaret> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TCaret> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TCaret> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ACaretMethid#replace_child for (self: ACaretMethid, ANode, nullable ANode) */
-void nit__parser_prod___ACaretMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ACaretMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -3358,10 +3358,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ACaretMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ACaretMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2018);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2018);
 fatal_exit(1);
 }
 {
@@ -3382,8 +3382,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TCaret */
-cltype = type_nit__TCaret.color;
-idtype = type_nit__TCaret.id;
+cltype = type_nitc__TCaret.color;
+idtype = type_nitc__TCaret.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -3396,11 +3396,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TCaret", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2019);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2019);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ACaretMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ACaretMethid#n_op= on <self:ACaretMethid>*/
+nitc__parser_prod___ACaretMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ACaretMethid#n_op= on <self:ACaretMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -3408,36 +3408,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ACaretMethid#n_op= for (self: ACaretMethid, Token) */
-void nit__parser_prod___ACaretMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___ACaretMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ACaretMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ACaretMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ACaretMethid#visit_all for (self: ACaretMethid, Visitor) */
-void nit__parser_prod___ACaretMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ACaretMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ACaretMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ACaretMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2033);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2033);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAmpMethid#init_aampmethid for (self: AAmpMethid, nullable TAmp) */
-void nit__parser_prod___AAmpMethid___init_aampmethid(val* self, val* p0) {
+void nitc__parser_prod___AAmpMethid___init_aampmethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TAmp */;
 {
 { /* Inline kernel#Object#init (self) on <self:AAmpMethid> */
@@ -3447,29 +3447,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2041);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2041);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AAmpMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:AAmpMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2042);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2042);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TAmp> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TAmp> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TAmp> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAmpMethid#replace_child for (self: AAmpMethid, ANode, nullable ANode) */
-void nit__parser_prod___AAmpMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AAmpMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -3483,10 +3483,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AAmpMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AAmpMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2047);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2047);
 fatal_exit(1);
 }
 {
@@ -3507,8 +3507,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TAmp */
-cltype = type_nit__TAmp.color;
-idtype = type_nit__TAmp.id;
+cltype = type_nitc__TAmp.color;
+idtype = type_nitc__TAmp.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -3521,11 +3521,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TAmp", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2048);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2048);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAmpMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AAmpMethid#n_op= on <self:AAmpMethid>*/
+nitc__parser_prod___AAmpMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#AAmpMethid#n_op= on <self:AAmpMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -3533,36 +3533,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AAmpMethid#n_op= for (self: AAmpMethid, Token) */
-void nit__parser_prod___AAmpMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___AAmpMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AAmpMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:AAmpMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAmpMethid#visit_all for (self: AAmpMethid, Visitor) */
-void nit__parser_prod___AAmpMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AAmpMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AAmpMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:AAmpMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2062);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2062);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ATildeMethid#init_atildemethid for (self: ATildeMethid, nullable TTilde) */
-void nit__parser_prod___ATildeMethid___init_atildemethid(val* self, val* p0) {
+void nitc__parser_prod___ATildeMethid___init_atildemethid(val* self, val* p0) {
 val* var_n_op /* var n_op: nullable TTilde */;
 {
 { /* Inline kernel#Object#init (self) on <self:ATildeMethid> */
@@ -3572,29 +3572,29 @@ RET_LABEL1:(void)0;
 var_n_op = p0;
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2070);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2070);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ATildeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_n_op; /* _n_op on <self:ATildeMethid> */
 if (var_n_op == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2071);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2071);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_op,self) on <var_n_op:nullable TTilde> */
 if (unlikely(var_n_op == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_op->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TTilde> */
+var_n_op->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_op:nullable TTilde> */
 RET_LABEL2:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ATildeMethid#replace_child for (self: ATildeMethid, ANode, nullable ANode) */
-void nit__parser_prod___ATildeMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ATildeMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : Token */;
@@ -3608,10 +3608,10 @@ int idtype;
 const char* var_class_name;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ATildeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ATildeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2076);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2076);
 fatal_exit(1);
 }
 {
@@ -3632,8 +3632,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TTilde */
-cltype = type_nit__TTilde.color;
-idtype = type_nit__TTilde.id;
+cltype = type_nitc__TTilde.color;
+idtype = type_nitc__TTilde.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -3646,11 +3646,11 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TTilde", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2077);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2077);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ATildeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ATildeMethid#n_op= on <self:ATildeMethid>*/
+nitc__parser_prod___ATildeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(self, var_new_child); /* Direct call parser_prod#ATildeMethid#n_op= on <self:ATildeMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -3658,36 +3658,36 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ATildeMethid#n_op= for (self: ATildeMethid, Token) */
-void nit__parser_prod___ATildeMethid___nit__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
+void nitc__parser_prod___ATildeMethid___nitc__parser_nodes__AOperatorMethid__n_op_61d(val* self, val* p0) {
 val* var_node /* var node: Token */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ATildeMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val = var_node; /* _n_op on <self:ATildeMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:Token> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:Token> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ATildeMethid#visit_all for (self: ATildeMethid, Visitor) */
-void nit__parser_prod___ATildeMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ATildeMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : Token */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ATildeMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AOperatorMethid___n_op].val; /* _n_op on <self:ATildeMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_op");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2091);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2091);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraMethid#init_abramethid for (self: ABraMethid, nullable TObra, nullable TCbra) */
-void nit__parser_prod___ABraMethid___init_abramethid(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ABraMethid___init_abramethid(val* self, val* p0, val* p1) {
 val* var_n_obra /* var n_obra: nullable TObra */;
 val* var_n_cbra /* var n_cbra: nullable TCbra */;
 {
@@ -3699,50 +3699,50 @@ var_n_obra = p0;
 var_n_cbra = p1;
 if (unlikely(var_n_obra == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2100);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2100);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__ABraMethid___n_obra].val = var_n_obra; /* _n_obra on <self:ABraMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraMethid___n_obra].val = var_n_obra; /* _n_obra on <self:ABraMethid> */
 if (var_n_obra == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2101);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2101);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_obra,self) on <var_n_obra:nullable TObra> */
 if (unlikely(var_n_obra == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_obra->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_obra:nullable TObra> */
+var_n_obra->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_obra:nullable TObra> */
 RET_LABEL2:(void)0;
 }
 }
 if (unlikely(var_n_cbra == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2102);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2102);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__ABraMethid___n_cbra].val = var_n_cbra; /* _n_cbra on <self:ABraMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraMethid___n_cbra].val = var_n_cbra; /* _n_cbra on <self:ABraMethid> */
 if (var_n_cbra == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2103);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2103);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_cbra,self) on <var_n_cbra:nullable TCbra> */
 if (unlikely(var_n_cbra == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_cbra->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cbra:nullable TCbra> */
+var_n_cbra->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cbra:nullable TCbra> */
 RET_LABEL3:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraMethid#replace_child for (self: ABraMethid, ANode, nullable ANode) */
-void nit__parser_prod___ABraMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ABraMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : TObra */;
@@ -3764,10 +3764,10 @@ int idtype15;
 const char* var_class_name16;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__ABraMethid___n_obra].val; /* _n_obra on <self:ABraMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__ABraMethid___n_obra].val; /* _n_obra on <self:ABraMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_obra");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2108);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2108);
 fatal_exit(1);
 }
 {
@@ -3788,8 +3788,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TObra */
-cltype = type_nit__TObra.color;
-idtype = type_nit__TObra.id;
+cltype = type_nitc__TObra.color;
+idtype = type_nitc__TObra.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -3802,19 +3802,19 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TObra", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2109);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2109);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ABraMethid___n_obra_61d(self, var_new_child); /* Direct call parser_prod#ABraMethid#n_obra= on <self:ABraMethid>*/
+nitc__parser_prod___ABraMethid___n_obra_61d(self, var_new_child); /* Direct call parser_prod#ABraMethid#n_obra= on <self:ABraMethid>*/
 }
 goto RET_LABEL;
 } else {
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__ABraMethid___n_cbra].val; /* _n_cbra on <self:ABraMethid> */
+var7 = self->attrs[COLOR_nitc__parser_nodes__ABraMethid___n_cbra].val; /* _n_cbra on <self:ABraMethid> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_cbra");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2112);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2112);
 fatal_exit(1);
 }
 {
@@ -3835,8 +3835,8 @@ RET_LABEL9:(void)0;
 }
 if (var8){
 /* <var_new_child:nullable ANode> isa TCbra */
-cltype14 = type_nit__TCbra.color;
-idtype15 = type_nit__TCbra.id;
+cltype14 = type_nitc__TCbra.color;
+idtype15 = type_nitc__TCbra.id;
 if(var_new_child == NULL) {
 var13 = 0;
 } else {
@@ -3849,11 +3849,11 @@ var13 = var_new_child->type->type_table[cltype14] == idtype15;
 if (unlikely(!var13)) {
 var_class_name16 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TCbra", var_class_name16);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2113);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2113);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ABraMethid___n_cbra_61d(self, var_new_child); /* Direct call parser_prod#ABraMethid#n_cbra= on <self:ABraMethid>*/
+nitc__parser_prod___ABraMethid___n_cbra_61d(self, var_new_child); /* Direct call parser_prod#ABraMethid#n_cbra= on <self:ABraMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -3861,59 +3861,59 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ABraMethid#n_obra= for (self: ABraMethid, TObra) */
-void nit__parser_prod___ABraMethid___n_obra_61d(val* self, val* p0) {
+void nitc__parser_prod___ABraMethid___n_obra_61d(val* self, val* p0) {
 val* var_node /* var node: TObra */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ABraMethid___n_obra].val = var_node; /* _n_obra on <self:ABraMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraMethid___n_obra].val = var_node; /* _n_obra on <self:ABraMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TObra> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TObra> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TObra> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraMethid#n_cbra= for (self: ABraMethid, TCbra) */
-void nit__parser_prod___ABraMethid___n_cbra_61d(val* self, val* p0) {
+void nitc__parser_prod___ABraMethid___n_cbra_61d(val* self, val* p0) {
 val* var_node /* var node: TCbra */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ABraMethid___n_cbra].val = var_node; /* _n_cbra on <self:ABraMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraMethid___n_cbra].val = var_node; /* _n_cbra on <self:ABraMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TCbra> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TCbra> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TCbra> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraMethid#visit_all for (self: ABraMethid, Visitor) */
-void nit__parser_prod___ABraMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ABraMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : TObra */;
 val* var1 /* : TCbra */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__ABraMethid___n_obra].val; /* _n_obra on <self:ABraMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__ABraMethid___n_obra].val; /* _n_obra on <self:ABraMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_obra");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2132);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2132);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__ABraMethid___n_cbra].val; /* _n_cbra on <self:ABraMethid> */
+var1 = self->attrs[COLOR_nitc__parser_nodes__ABraMethid___n_cbra].val; /* _n_cbra on <self:ABraMethid> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_cbra");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2133);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2133);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAssignMethid#init_aassignmethid for (self: AAssignMethid, nullable TId, nullable TAssign) */
-void nit__parser_prod___AAssignMethid___init_aassignmethid(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AAssignMethid___init_aassignmethid(val* self, val* p0, val* p1) {
 val* var_n_id /* var n_id: nullable TId */;
 val* var_n_assign /* var n_assign: nullable TAssign */;
 {
@@ -3925,50 +3925,50 @@ var_n_id = p0;
 var_n_assign = p1;
 if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2142);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2142);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AAssignMethid___n_id].val = var_n_id; /* _n_id on <self:AAssignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AAssignMethid___n_id].val = var_n_id; /* _n_id on <self:AAssignMethid> */
 if (var_n_id == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2143);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2143);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId> */
 if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_id->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
+var_n_id->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
 RET_LABEL2:(void)0;
 }
 }
 if (unlikely(var_n_assign == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2144);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2144);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AAssignMethid___n_assign].val = var_n_assign; /* _n_assign on <self:AAssignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AAssignMethid___n_assign].val = var_n_assign; /* _n_assign on <self:AAssignMethid> */
 if (var_n_assign == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2145);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2145);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_assign,self) on <var_n_assign:nullable TAssign> */
 if (unlikely(var_n_assign == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_assign->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_assign:nullable TAssign> */
+var_n_assign->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_assign:nullable TAssign> */
 RET_LABEL3:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAssignMethid#replace_child for (self: AAssignMethid, ANode, nullable ANode) */
-void nit__parser_prod___AAssignMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___AAssignMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : TId */;
@@ -3990,10 +3990,10 @@ int idtype15;
 const char* var_class_name16;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AAssignMethid___n_id].val; /* _n_id on <self:AAssignMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AAssignMethid___n_id].val; /* _n_id on <self:AAssignMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2150);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2150);
 fatal_exit(1);
 }
 {
@@ -4014,8 +4014,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TId */
-cltype = type_nit__TId.color;
-idtype = type_nit__TId.id;
+cltype = type_nitc__TId.color;
+idtype = type_nitc__TId.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -4028,19 +4028,19 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TId", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2151);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2151);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAssignMethid___n_id_61d(self, var_new_child); /* Direct call parser_prod#AAssignMethid#n_id= on <self:AAssignMethid>*/
+nitc__parser_prod___AAssignMethid___n_id_61d(self, var_new_child); /* Direct call parser_prod#AAssignMethid#n_id= on <self:AAssignMethid>*/
 }
 goto RET_LABEL;
 } else {
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__AAssignMethid___n_assign].val; /* _n_assign on <self:AAssignMethid> */
+var7 = self->attrs[COLOR_nitc__parser_nodes__AAssignMethid___n_assign].val; /* _n_assign on <self:AAssignMethid> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_assign");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2154);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2154);
 fatal_exit(1);
 }
 {
@@ -4061,8 +4061,8 @@ RET_LABEL9:(void)0;
 }
 if (var8){
 /* <var_new_child:nullable ANode> isa TAssign */
-cltype14 = type_nit__TAssign.color;
-idtype15 = type_nit__TAssign.id;
+cltype14 = type_nitc__TAssign.color;
+idtype15 = type_nitc__TAssign.id;
 if(var_new_child == NULL) {
 var13 = 0;
 } else {
@@ -4075,11 +4075,11 @@ var13 = var_new_child->type->type_table[cltype14] == idtype15;
 if (unlikely(!var13)) {
 var_class_name16 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TAssign", var_class_name16);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2155);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2155);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AAssignMethid___n_assign_61d(self, var_new_child); /* Direct call parser_prod#AAssignMethid#n_assign= on <self:AAssignMethid>*/
+nitc__parser_prod___AAssignMethid___n_assign_61d(self, var_new_child); /* Direct call parser_prod#AAssignMethid#n_assign= on <self:AAssignMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -4087,59 +4087,59 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#AAssignMethid#n_id= for (self: AAssignMethid, TId) */
-void nit__parser_prod___AAssignMethid___n_id_61d(val* self, val* p0) {
+void nitc__parser_prod___AAssignMethid___n_id_61d(val* self, val* p0) {
 val* var_node /* var node: TId */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AAssignMethid___n_id].val = var_node; /* _n_id on <self:AAssignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AAssignMethid___n_id].val = var_node; /* _n_id on <self:AAssignMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TId> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAssignMethid#n_assign= for (self: AAssignMethid, TAssign) */
-void nit__parser_prod___AAssignMethid___n_assign_61d(val* self, val* p0) {
+void nitc__parser_prod___AAssignMethid___n_assign_61d(val* self, val* p0) {
 val* var_node /* var node: TAssign */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AAssignMethid___n_assign].val = var_node; /* _n_assign on <self:AAssignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__AAssignMethid___n_assign].val = var_node; /* _n_assign on <self:AAssignMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TAssign> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TAssign> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TAssign> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#AAssignMethid#visit_all for (self: AAssignMethid, Visitor) */
-void nit__parser_prod___AAssignMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___AAssignMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : TId */;
 val* var1 /* : TAssign */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AAssignMethid___n_id].val; /* _n_id on <self:AAssignMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__AAssignMethid___n_id].val; /* _n_id on <self:AAssignMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2174);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2174);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__AAssignMethid___n_assign].val; /* _n_assign on <self:AAssignMethid> */
+var1 = self->attrs[COLOR_nitc__parser_nodes__AAssignMethid___n_assign].val; /* _n_assign on <self:AAssignMethid> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_assign");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2175);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2175);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraassignMethid#init_abraassignmethid for (self: ABraassignMethid, nullable TObra, nullable TCbra, nullable TAssign) */
-void nit__parser_prod___ABraassignMethid___init_abraassignmethid(val* self, val* p0, val* p1, val* p2) {
+void nitc__parser_prod___ABraassignMethid___init_abraassignmethid(val* self, val* p0, val* p1, val* p2) {
 val* var_n_obra /* var n_obra: nullable TObra */;
 val* var_n_cbra /* var n_cbra: nullable TCbra */;
 val* var_n_assign /* var n_assign: nullable TAssign */;
@@ -4153,71 +4153,71 @@ var_n_cbra = p1;
 var_n_assign = p2;
 if (unlikely(var_n_obra == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2185);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2185);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_obra].val = var_n_obra; /* _n_obra on <self:ABraassignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_obra].val = var_n_obra; /* _n_obra on <self:ABraassignMethid> */
 if (var_n_obra == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2186);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2186);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_obra,self) on <var_n_obra:nullable TObra> */
 if (unlikely(var_n_obra == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_obra->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_obra:nullable TObra> */
+var_n_obra->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_obra:nullable TObra> */
 RET_LABEL2:(void)0;
 }
 }
 if (unlikely(var_n_cbra == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2187);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2187);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_cbra].val = var_n_cbra; /* _n_cbra on <self:ABraassignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_cbra].val = var_n_cbra; /* _n_cbra on <self:ABraassignMethid> */
 if (var_n_cbra == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2188);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2188);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_cbra,self) on <var_n_cbra:nullable TCbra> */
 if (unlikely(var_n_cbra == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_cbra->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cbra:nullable TCbra> */
+var_n_cbra->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cbra:nullable TCbra> */
 RET_LABEL3:(void)0;
 }
 }
 if (unlikely(var_n_assign == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2189);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2189);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_assign].val = var_n_assign; /* _n_assign on <self:ABraassignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_assign].val = var_n_assign; /* _n_assign on <self:ABraassignMethid> */
 if (var_n_assign == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2190);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2190);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_assign,self) on <var_n_assign:nullable TAssign> */
 if (unlikely(var_n_assign == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_assign->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_assign:nullable TAssign> */
+var_n_assign->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_assign:nullable TAssign> */
 RET_LABEL4:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraassignMethid#replace_child for (self: ABraassignMethid, ANode, nullable ANode) */
-void nit__parser_prod___ABraassignMethid___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+void nitc__parser_prod___ABraassignMethid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : TObra */;
@@ -4247,10 +4247,10 @@ int idtype25;
 const char* var_class_name26;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_obra].val; /* _n_obra on <self:ABraassignMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_obra].val; /* _n_obra on <self:ABraassignMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_obra");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2195);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2195);
 fatal_exit(1);
 }
 {
@@ -4271,8 +4271,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TObra */
-cltype = type_nit__TObra.color;
-idtype = type_nit__TObra.id;
+cltype = type_nitc__TObra.color;
+idtype = type_nitc__TObra.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -4285,19 +4285,19 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TObra", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2196);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2196);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ABraassignMethid___n_obra_61d(self, var_new_child); /* Direct call parser_prod#ABraassignMethid#n_obra= on <self:ABraassignMethid>*/
+nitc__parser_prod___ABraassignMethid___n_obra_61d(self, var_new_child); /* Direct call parser_prod#ABraassignMethid#n_obra= on <self:ABraassignMethid>*/
 }
 goto RET_LABEL;
 } else {
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_cbra].val; /* _n_cbra on <self:ABraassignMethid> */
+var7 = self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_cbra].val; /* _n_cbra on <self:ABraassignMethid> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_cbra");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2199);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2199);
 fatal_exit(1);
 }
 {
@@ -4318,8 +4318,8 @@ RET_LABEL9:(void)0;
 }
 if (var8){
 /* <var_new_child:nullable ANode> isa TCbra */
-cltype14 = type_nit__TCbra.color;
-idtype15 = type_nit__TCbra.id;
+cltype14 = type_nitc__TCbra.color;
+idtype15 = type_nitc__TCbra.id;
 if(var_new_child == NULL) {
 var13 = 0;
 } else {
@@ -4332,19 +4332,19 @@ var13 = var_new_child->type->type_table[cltype14] == idtype15;
 if (unlikely(!var13)) {
 var_class_name16 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TCbra", var_class_name16);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2200);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2200);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ABraassignMethid___n_cbra_61d(self, var_new_child); /* Direct call parser_prod#ABraassignMethid#n_cbra= on <self:ABraassignMethid>*/
+nitc__parser_prod___ABraassignMethid___n_cbra_61d(self, var_new_child); /* Direct call parser_prod#ABraassignMethid#n_cbra= on <self:ABraassignMethid>*/
 }
 goto RET_LABEL;
 } else {
 }
-var17 = self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_assign].val; /* _n_assign on <self:ABraassignMethid> */
+var17 = self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_assign].val; /* _n_assign on <self:ABraassignMethid> */
 if (unlikely(var17 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_assign");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2203);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2203);
 fatal_exit(1);
 }
 {
@@ -4365,8 +4365,8 @@ RET_LABEL19:(void)0;
 }
 if (var18){
 /* <var_new_child:nullable ANode> isa TAssign */
-cltype24 = type_nit__TAssign.color;
-idtype25 = type_nit__TAssign.id;
+cltype24 = type_nitc__TAssign.color;
+idtype25 = type_nitc__TAssign.id;
 if(var_new_child == NULL) {
 var23 = 0;
 } else {
@@ -4379,11 +4379,11 @@ var23 = var_new_child->type->type_table[cltype24] == idtype25;
 if (unlikely(!var23)) {
 var_class_name26 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TAssign", var_class_name26);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2204);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2204);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ABraassignMethid___n_assign_61d(self, var_new_child); /* Direct call parser_prod#ABraassignMethid#n_assign= on <self:ABraassignMethid>*/
+nitc__parser_prod___ABraassignMethid___n_assign_61d(self, var_new_child); /* Direct call parser_prod#ABraassignMethid#n_assign= on <self:ABraassignMethid>*/
 }
 goto RET_LABEL;
 } else {
@@ -4391,121 +4391,107 @@ goto RET_LABEL;
 RET_LABEL:;
 }
 /* method parser_prod#ABraassignMethid#n_obra= for (self: ABraassignMethid, TObra) */
-void nit__parser_prod___ABraassignMethid___n_obra_61d(val* self, val* p0) {
+void nitc__parser_prod___ABraassignMethid___n_obra_61d(val* self, val* p0) {
 val* var_node /* var node: TObra */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_obra].val = var_node; /* _n_obra on <self:ABraassignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_obra].val = var_node; /* _n_obra on <self:ABraassignMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TObra> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TObra> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TObra> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraassignMethid#n_cbra= for (self: ABraassignMethid, TCbra) */
-void nit__parser_prod___ABraassignMethid___n_cbra_61d(val* self, val* p0) {
+void nitc__parser_prod___ABraassignMethid___n_cbra_61d(val* self, val* p0) {
 val* var_node /* var node: TCbra */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_cbra].val = var_node; /* _n_cbra on <self:ABraassignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_cbra].val = var_node; /* _n_cbra on <self:ABraassignMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TCbra> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TCbra> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TCbra> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraassignMethid#n_assign= for (self: ABraassignMethid, TAssign) */
-void nit__parser_prod___ABraassignMethid___n_assign_61d(val* self, val* p0) {
+void nitc__parser_prod___ABraassignMethid___n_assign_61d(val* self, val* p0) {
 val* var_node /* var node: TAssign */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_assign].val = var_node; /* _n_assign on <self:ABraassignMethid> */
+self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_assign].val = var_node; /* _n_assign on <self:ABraassignMethid> */
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TAssign> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TAssign> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TAssign> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
 /* method parser_prod#ABraassignMethid#visit_all for (self: ABraassignMethid, Visitor) */
-void nit__parser_prod___ABraassignMethid___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+void nitc__parser_prod___ABraassignMethid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
 val* var /* : TObra */;
 val* var1 /* : TCbra */;
 val* var2 /* : TAssign */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_obra].val; /* _n_obra on <self:ABraassignMethid> */
+var = self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_obra].val; /* _n_obra on <self:ABraassignMethid> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_obra");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2228);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2228);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_cbra].val; /* _n_cbra on <self:ABraassignMethid> */
+var1 = self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_cbra].val; /* _n_cbra on <self:ABraassignMethid> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_cbra");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2229);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2229);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var2 = self->attrs[COLOR_nit__parser_nodes__ABraassignMethid___n_assign].val; /* _n_assign on <self:ABraassignMethid> */
+var2 = self->attrs[COLOR_nitc__parser_nodes__ABraassignMethid___n_assign].val; /* _n_assign on <self:ABraassignMethid> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_assign");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2230);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2230);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#ASignature#init_asignature for (self: ASignature, nullable TOpar, Collection[Object], nullable TCpar, nullable AType) */
-void nit__parser_prod___ASignature___init_asignature(val* self, val* p0, val* p1, val* p2, val* p3) {
-val* var_n_opar /* var n_opar: nullable TOpar */;
-val* var_n_params /* var n_params: Collection[Object] */;
-val* var_n_cpar /* var n_cpar: nullable TCpar */;
-val* var_n_type /* var n_type: nullable AType */;
+/* method parser_prod#AQid#init_aqid for (self: AQid, nullable AQualified, nullable TId) */
+void nitc__parser_prod___AQid___init_aqid(val* self, val* p0, val* p1) {
+val* var_n_qualified /* var n_qualified: nullable AQualified */;
+val* var_n_id /* var n_id: nullable TId */;
 short int var /* : Bool */;
 short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var4 /* : Bool */;
 short int var5 /* : Bool */;
-val* var7 /* : ANodes[AParam] */;
-val* var9 /* : ANodes[AParam] */;
-short int var10 /* : Bool */;
-short int var11 /* : Bool */;
-short int var13 /* : Bool */;
-short int var14 /* : Bool */;
-short int var16 /* : Bool */;
-short int var17 /* : Bool */;
-short int var19 /* : Bool */;
-short int var20 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:ASignature> */
+{ /* Inline kernel#Object#init (self) on <self:AQid> */
 RET_LABEL1:(void)0;
 }
 }
-var_n_opar = p0;
-var_n_params = p1;
-var_n_cpar = p2;
-var_n_type = p3;
-self->attrs[COLOR_nit__parser_nodes__ASignature___n_opar].val = var_n_opar; /* _n_opar on <self:ASignature> */
-if (var_n_opar == NULL) {
+var_n_qualified = p0;
+var_n_id = p1;
+self->attrs[COLOR_nitc__parser_nodes__AQid___n_qualified].val = var_n_qualified; /* _n_qualified on <self:AQid> */
+if (var_n_qualified == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_opar,((val*)NULL)) on <var_n_opar:nullable TOpar> */
+{ /* Inline kernel#Object#!= (var_n_qualified,((val*)NULL)) on <var_n_qualified:nullable AQualified> */
 var_other = ((val*)NULL);
 {
-var4 = ((short int(*)(val* self, val* p0))(var_n_opar->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_opar, var_other); /* == on <var_n_opar:nullable TOpar(TOpar)>*/
+var4 = ((short int(*)(val* self, val* p0))(var_n_qualified->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_qualified, var_other); /* == on <var_n_qualified:nullable AQualified(AQualified)>*/
 }
 var5 = !var4;
 var2 = var5;
@@ -4516,91 +4502,41 @@ var = var2;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_opar,self) on <var_n_opar:nullable TOpar(TOpar)> */
-var_n_opar->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_opar:nullable TOpar(TOpar)> */
+{ /* Inline parser_nodes#ANode#parent= (var_n_qualified,self) on <var_n_qualified:nullable AQualified(AQualified)> */
+var_n_qualified->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_qualified:nullable AQualified(AQualified)> */
 RET_LABEL6:(void)0;
 }
 }
 } else {
 }
-{
-{ /* Inline parser_nodes#ASignature#n_params (self) on <self:ASignature> */
-var9 = self->attrs[COLOR_nit__parser_nodes__ASignature___n_params].val; /* _n_params on <self:ASignature> */
-if (unlikely(var9 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_params");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1693);
+if (unlikely(var_n_id == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Cast failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2241);
 fatal_exit(1);
 }
-var7 = var9;
-RET_LABEL8:(void)0;
-}
-}
-{
-nit___nit__ANodes___unsafe_add_all(var7, var_n_params); /* Direct call parser_nodes#ANodes#unsafe_add_all on <var7:ANodes[AParam]>*/
-}
-self->attrs[COLOR_nit__parser_nodes__ASignature___n_cpar].val = var_n_cpar; /* _n_cpar on <self:ASignature> */
-if (var_n_cpar == NULL) {
-var10 = 0; /* is null */
-} else {
-var10 = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_cpar,((val*)NULL)) on <var_n_cpar:nullable TCpar> */
-var_other = ((val*)NULL);
-{
-var13 = ((short int(*)(val* self, val* p0))(var_n_cpar->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_cpar, var_other); /* == on <var_n_cpar:nullable TCpar(TCpar)>*/
-}
-var14 = !var13;
-var11 = var14;
-goto RET_LABEL12;
-RET_LABEL12:(void)0;
-}
-var10 = var11;
-}
-if (var10){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_cpar,self) on <var_n_cpar:nullable TCpar(TCpar)> */
-var_n_cpar->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cpar:nullable TCpar(TCpar)> */
-RET_LABEL15:(void)0;
-}
-}
-} else {
-}
-self->attrs[COLOR_nit__parser_nodes__ASignature___n_type].val = var_n_type; /* _n_type on <self:ASignature> */
-if (var_n_type == NULL) {
-var16 = 0; /* is null */
+self->attrs[COLOR_nitc__parser_nodes__AQid___n_id].val = var_n_id; /* _n_id on <self:AQid> */
+if (var_n_id == NULL) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2242);
+fatal_exit(1);
 } else {
-var16 = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_type,((val*)NULL)) on <var_n_type:nullable AType> */
-var_other = ((val*)NULL);
-{
-var19 = ((short int(*)(val* self, val* p0))(var_n_type->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_type, var_other); /* == on <var_n_type:nullable AType(AType)>*/
-}
-var20 = !var19;
-var17 = var20;
-goto RET_LABEL18;
-RET_LABEL18:(void)0;
-}
-var16 = var17;
-}
-if (var16){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_type,self) on <var_n_type:nullable AType(AType)> */
-var_n_type->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_type:nullable AType(AType)> */
-RET_LABEL21:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId> */
+if (unlikely(var_n_id == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
+fatal_exit(1);
 }
+var_n_id->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
+RET_LABEL7:(void)0;
 }
-} else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#ASignature#replace_child for (self: ASignature, ANode, nullable ANode) */
-void nit__parser_prod___ASignature___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#AQid#replace_child for (self: AQid, ANode, nullable ANode) */
+void nitc__parser_prod___AQid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : nullable TOpar */;
+val* var /* : nullable AQualified */;
 short int var1 /* : Bool */;
 short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
@@ -4610,37 +4546,24 @@ short int var7 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-val* var8 /* : ANodes[AParam] */;
-val* var10 /* : ANodes[AParam] */;
+val* var8 /* : TId */;
+short int var9 /* : Bool */;
 short int var11 /* : Bool */;
-val* var12 /* : nullable TCpar */;
 short int var13 /* : Bool */;
 short int var14 /* : Bool */;
-short int var16 /* : Bool */;
-short int var18 /* : Bool */;
-short int var19 /* : Bool */;
-int cltype20;
-int idtype21;
-const char* var_class_name22;
-val* var23 /* : nullable AType */;
-short int var24 /* : Bool */;
-short int var25 /* : Bool */;
-short int var27 /* : Bool */;
-short int var29 /* : Bool */;
-short int var30 /* : Bool */;
-int cltype31;
-int idtype32;
-const char* var_class_name33;
+int cltype15;
+int idtype16;
+const char* var_class_name17;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__ASignature___n_opar].val; /* _n_opar on <self:ASignature> */
+var = self->attrs[COLOR_nitc__parser_nodes__AQid___n_qualified].val; /* _n_qualified on <self:AQid> */
 if (var == NULL) {
 var1 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TOpar> */
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable AQualified> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TOpar(TOpar)> */
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable AQualified(AQualified)> */
 var6 = var == var_other;
 var4 = var6;
 goto RET_LABEL5;
@@ -4654,9 +4577,9 @@ RET_LABEL3:(void)0;
 var1 = var2;
 }
 if (var1){
-/* <var_new_child:nullable ANode> isa nullable TOpar */
-cltype = type_nullable__nit__TOpar.color;
-idtype = type_nullable__nit__TOpar.id;
+/* <var_new_child:nullable ANode> isa nullable AQualified */
+cltype = type_nullable__nitc__AQualified.color;
+idtype = type_nullable__nitc__AQualified.id;
 if(var_new_child == NULL) {
 var7 = 1;
 } else {
@@ -4668,147 +4591,85 @@ var7 = var_new_child->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var7)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TOpar", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2253);
-fatal_exit(1);
-}
-{
-nit__parser_prod___ASignature___n_opar_61d(self, var_new_child); /* Direct call parser_prod#ASignature#n_opar= on <self:ASignature>*/
-}
-goto RET_LABEL;
-} else {
-}
-{
-{ /* Inline parser_nodes#ASignature#n_params (self) on <self:ASignature> */
-var10 = self->attrs[COLOR_nit__parser_nodes__ASignature___n_params].val; /* _n_params on <self:ASignature> */
-if (unlikely(var10 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_params");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1693);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AQualified", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2248);
 fatal_exit(1);
 }
-var8 = var10;
-RET_LABEL9:(void)0;
-}
-}
 {
-var11 = nit___nit__ANodes___replace_child(var8, var_old_child, var_new_child);
+nitc__parser_prod___AQid___n_qualified_61d(self, var_new_child); /* Direct call parser_prod#AQid#n_qualified= on <self:AQid>*/
 }
-if (var11){
 goto RET_LABEL;
 } else {
 }
-var12 = self->attrs[COLOR_nit__parser_nodes__ASignature___n_cpar].val; /* _n_cpar on <self:ASignature> */
-if (var12 == NULL) {
-var13 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var12,var_old_child) on <var12:nullable TCpar> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var12,var_other) on <var12:nullable TCpar(TCpar)> */
-var18 = var12 == var_other;
-var16 = var18;
-goto RET_LABEL17;
-RET_LABEL17:(void)0;
-}
-}
-var14 = var16;
-goto RET_LABEL15;
-RET_LABEL15:(void)0;
-}
-var13 = var14;
-}
-if (var13){
-/* <var_new_child:nullable ANode> isa nullable TCpar */
-cltype20 = type_nullable__nit__TCpar.color;
-idtype21 = type_nullable__nit__TCpar.id;
-if(var_new_child == NULL) {
-var19 = 1;
-} else {
-if(cltype20 >= var_new_child->type->table_size) {
-var19 = 0;
-} else {
-var19 = var_new_child->type->type_table[cltype20] == idtype21;
-}
-}
-if (unlikely(!var19)) {
-var_class_name22 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TCpar", var_class_name22);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2258);
+var8 = self->attrs[COLOR_nitc__parser_nodes__AQid___n_id].val; /* _n_id on <self:AQid> */
+if (unlikely(var8 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2251);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ASignature___n_cpar_61d(self, var_new_child); /* Direct call parser_prod#ASignature#n_cpar= on <self:ASignature>*/
-}
-goto RET_LABEL;
-} else {
-}
-var23 = self->attrs[COLOR_nit__parser_nodes__ASignature___n_type].val; /* _n_type on <self:ASignature> */
-if (var23 == NULL) {
-var24 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var23,var_old_child) on <var23:nullable AType> */
+{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:TId> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var23,var_other) on <var23:nullable AType(AType)> */
-var29 = var23 == var_other;
-var27 = var29;
-goto RET_LABEL28;
-RET_LABEL28:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:TId> */
+var13 = var8 == var_other;
+var11 = var13;
+goto RET_LABEL12;
+RET_LABEL12:(void)0;
 }
 }
-var25 = var27;
-goto RET_LABEL26;
-RET_LABEL26:(void)0;
+var9 = var11;
+goto RET_LABEL10;
+RET_LABEL10:(void)0;
 }
-var24 = var25;
 }
-if (var24){
-/* <var_new_child:nullable ANode> isa nullable AType */
-cltype31 = type_nullable__nit__AType.color;
-idtype32 = type_nullable__nit__AType.id;
+if (var9){
+/* <var_new_child:nullable ANode> isa TId */
+cltype15 = type_nitc__TId.color;
+idtype16 = type_nitc__TId.id;
 if(var_new_child == NULL) {
-var30 = 1;
+var14 = 0;
 } else {
-if(cltype31 >= var_new_child->type->table_size) {
-var30 = 0;
+if(cltype15 >= var_new_child->type->table_size) {
+var14 = 0;
 } else {
-var30 = var_new_child->type->type_table[cltype31] == idtype32;
+var14 = var_new_child->type->type_table[cltype15] == idtype16;
 }
 }
-if (unlikely(!var30)) {
-var_class_name33 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AType", var_class_name33);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2262);
+if (unlikely(!var14)) {
+var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TId", var_class_name17);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2252);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ASignature___n_type_61d(self, var_new_child); /* Direct call parser_prod#ASignature#n_type= on <self:ASignature>*/
+nitc__parser_prod___AQid___n_id_61d(self, var_new_child); /* Direct call parser_prod#AQid#n_id= on <self:AQid>*/
 }
 goto RET_LABEL;
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#ASignature#n_opar= for (self: ASignature, nullable TOpar) */
-void nit__parser_prod___ASignature___n_opar_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TOpar */;
+/* method parser_prod#AQid#n_qualified= for (self: AQid, nullable AQualified) */
+void nitc__parser_prod___AQid___n_qualified_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AQualified */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ASignature___n_opar].val = var_node; /* _n_opar on <self:ASignature> */
+self->attrs[COLOR_nitc__parser_nodes__AQid___n_qualified].val = var_node; /* _n_qualified on <self:AQid> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TOpar> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AQualified> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TOpar(TOpar)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AQualified(AQualified)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -4819,8 +4680,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TOpar(TOpar)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TOpar(TOpar)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AQualified(AQualified)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AQualified(AQualified)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -4828,272 +4689,122 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#ASignature#n_cpar= for (self: ASignature, nullable TCpar) */
-void nit__parser_prod___ASignature___n_cpar_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TCpar */;
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var4 /* : Bool */;
+/* method parser_prod#AQid#n_id= for (self: AQid, TId) */
+void nitc__parser_prod___AQid___n_id_61d(val* self, val* p0) {
+val* var_node /* var node: TId */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ASignature___n_cpar].val = var_node; /* _n_cpar on <self:ASignature> */
-if (var_node == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TCpar> */
-var_other = ((val*)NULL);
+self->attrs[COLOR_nitc__parser_nodes__AQid___n_id].val = var_node; /* _n_id on <self:AQid> */
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TCpar(TCpar)>*/
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TId> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
+RET_LABEL1:(void)0;
 }
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
 }
-var = var1;
+RET_LABEL:;
 }
-if (var){
+/* method parser_prod#AQid#visit_all for (self: AQid, Visitor) */
+void nitc__parser_prod___AQid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
+val* var_v /* var v: Visitor */;
+val* var /* : nullable AQualified */;
+val* var1 /* : TId */;
+var_v = p0;
+var = self->attrs[COLOR_nitc__parser_nodes__AQid___n_qualified].val; /* _n_qualified on <self:AQid> */
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TCpar(TCpar)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TCpar(TCpar)> */
-RET_LABEL5:(void)0;
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
+var1 = self->attrs[COLOR_nitc__parser_nodes__AQid___n_id].val; /* _n_id on <self:AQid> */
+if (unlikely(var1 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2272);
+fatal_exit(1);
 }
-} else {
+{
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#ASignature#n_type= for (self: ASignature, nullable AType) */
-void nit__parser_prod___ASignature___n_type_61d(val* self, val* p0) {
-val* var_node /* var node: nullable AType */;
+/* method parser_prod#AQclassid#init_aqclassid for (self: AQclassid, nullable AQualified, nullable TClassid) */
+void nitc__parser_prod___AQclassid___init_aqclassid(val* self, val* p0, val* p1) {
+val* var_n_qualified /* var n_qualified: nullable AQualified */;
+val* var_n_id /* var n_id: nullable TClassid */;
 short int var /* : Bool */;
-short int var1 /* : Bool */;
+short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
 short int var4 /* : Bool */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ASignature___n_type].val = var_node; /* _n_type on <self:ASignature> */
-if (var_node == NULL) {
+short int var5 /* : Bool */;
+{
+{ /* Inline kernel#Object#init (self) on <self:AQclassid> */
+RET_LABEL1:(void)0;
+}
+}
+var_n_qualified = p0;
+var_n_id = p1;
+self->attrs[COLOR_nitc__parser_nodes__AQclassid___n_qualified].val = var_n_qualified; /* _n_qualified on <self:AQclassid> */
+if (var_n_qualified == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AType> */
+{ /* Inline kernel#Object#!= (var_n_qualified,((val*)NULL)) on <var_n_qualified:nullable AQualified> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AType(AType)>*/
+var4 = ((short int(*)(val* self, val* p0))(var_n_qualified->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_qualified, var_other); /* == on <var_n_qualified:nullable AQualified(AQualified)>*/
 }
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
+var5 = !var4;
+var2 = var5;
+goto RET_LABEL3;
+RET_LABEL3:(void)0;
 }
-var = var1;
+var = var2;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AType(AType)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AType(AType)> */
-RET_LABEL5:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_qualified,self) on <var_n_qualified:nullable AQualified(AQualified)> */
+var_n_qualified->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_qualified:nullable AQualified(AQualified)> */
+RET_LABEL6:(void)0;
 }
 }
 } else {
 }
-RET_LABEL:;
-}
-/* method parser_prod#ASignature#visit_all for (self: ASignature, Visitor) */
-void nit__parser_prod___ASignature___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
-val* var_v /* var v: Visitor */;
-val* var /* : nullable TOpar */;
-val* var1 /* : ANodes[AParam] */;
-val* var3 /* : ANodes[AParam] */;
-val* var4 /* : nullable TCpar */;
-val* var5 /* : nullable AType */;
-var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__ASignature___n_opar].val; /* _n_opar on <self:ASignature> */
-{
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-{
-{ /* Inline parser_nodes#ASignature#n_params (self) on <self:ASignature> */
-var3 = self->attrs[COLOR_nit__parser_nodes__ASignature___n_params].val; /* _n_params on <self:ASignature> */
-if (unlikely(var3 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_params");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1693);
-fatal_exit(1);
-}
-var1 = var3;
-RET_LABEL2:(void)0;
-}
-}
-{
-nit___nit__ANodes___visit_all(var1, var_v); /* Direct call parser_nodes#ANodes#visit_all on <var1:ANodes[AParam]>*/
-}
-var4 = self->attrs[COLOR_nit__parser_nodes__ASignature___n_cpar].val; /* _n_cpar on <self:ASignature> */
-{
-nit___nit__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var5 = self->attrs[COLOR_nit__parser_nodes__ASignature___n_type].val; /* _n_type on <self:ASignature> */
-{
-nit___nit__Visitor___enter_visit(var_v, var5); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-RET_LABEL:;
-}
-/* method parser_prod#AParam#init_aparam for (self: AParam, nullable TId, nullable AType, nullable TDotdotdot, nullable AAnnotations) */
-void nit__parser_prod___AParam___init_aparam(val* self, val* p0, val* p1, val* p2, val* p3) {
-val* var_n_id /* var n_id: nullable TId */;
-val* var_n_type /* var n_type: nullable AType */;
-val* var_n_dotdotdot /* var n_dotdotdot: nullable TDotdotdot */;
-val* var_n_annotations /* var n_annotations: nullable AAnnotations */;
-short int var /* : Bool */;
-short int var3 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var5 /* : Bool */;
-short int var6 /* : Bool */;
-short int var8 /* : Bool */;
-short int var9 /* : Bool */;
-short int var11 /* : Bool */;
-short int var12 /* : Bool */;
-short int var14 /* : Bool */;
-short int var15 /* : Bool */;
-short int var17 /* : Bool */;
-short int var18 /* : Bool */;
-{
-{ /* Inline kernel#Object#init (self) on <self:AParam> */
-RET_LABEL1:(void)0;
-}
-}
-var_n_id = p0;
-var_n_type = p1;
-var_n_dotdotdot = p2;
-var_n_annotations = p3;
 if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2300);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2283);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AParam___n_id].val = var_n_id; /* _n_id on <self:AParam> */
+self->attrs[COLOR_nitc__parser_nodes__AQclassid___n_id].val = var_n_id; /* _n_id on <self:AQclassid> */
 if (var_n_id == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2301);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2284);
 fatal_exit(1);
 } else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId> */
+{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TClassid> */
 if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_id->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
-RET_LABEL2:(void)0;
-}
-}
-self->attrs[COLOR_nit__parser_nodes__AParam___n_type].val = var_n_type; /* _n_type on <self:AParam> */
-if (var_n_type == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_type,((val*)NULL)) on <var_n_type:nullable AType> */
-var_other = ((val*)NULL);
-{
-var5 = ((short int(*)(val* self, val* p0))(var_n_type->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_type, var_other); /* == on <var_n_type:nullable AType(AType)>*/
-}
-var6 = !var5;
-var3 = var6;
-goto RET_LABEL4;
-RET_LABEL4:(void)0;
-}
-var = var3;
-}
-if (var){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_type,self) on <var_n_type:nullable AType(AType)> */
-var_n_type->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_type:nullable AType(AType)> */
+var_n_id->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TClassid> */
 RET_LABEL7:(void)0;
 }
 }
-} else {
-}
-self->attrs[COLOR_nit__parser_nodes__AParam___n_dotdotdot].val = var_n_dotdotdot; /* _n_dotdotdot on <self:AParam> */
-if (var_n_dotdotdot == NULL) {
-var8 = 0; /* is null */
-} else {
-var8 = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_dotdotdot,((val*)NULL)) on <var_n_dotdotdot:nullable TDotdotdot> */
-var_other = ((val*)NULL);
-{
-var11 = ((short int(*)(val* self, val* p0))(var_n_dotdotdot->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_dotdotdot, var_other); /* == on <var_n_dotdotdot:nullable TDotdotdot(TDotdotdot)>*/
-}
-var12 = !var11;
-var9 = var12;
-goto RET_LABEL10;
-RET_LABEL10:(void)0;
-}
-var8 = var9;
-}
-if (var8){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_dotdotdot,self) on <var_n_dotdotdot:nullable TDotdotdot(TDotdotdot)> */
-var_n_dotdotdot->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_dotdotdot:nullable TDotdotdot(TDotdotdot)> */
-RET_LABEL13:(void)0;
-}
-}
-} else {
-}
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_n_annotations; /* _n_annotations on <self:AParam> */
-if (var_n_annotations == NULL) {
-var14 = 0; /* is null */
-} else {
-var14 = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_annotations,((val*)NULL)) on <var_n_annotations:nullable AAnnotations> */
-var_other = ((val*)NULL);
-{
-var17 = ((short int(*)(val* self, val* p0))(var_n_annotations->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_annotations, var_other); /* == on <var_n_annotations:nullable AAnnotations(AAnnotations)>*/
-}
-var18 = !var17;
-var15 = var18;
-goto RET_LABEL16;
-RET_LABEL16:(void)0;
-}
-var14 = var15;
-}
-if (var14){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_annotations,self) on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
-var_n_annotations->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
-RET_LABEL19:(void)0;
-}
-}
-} else {
-}
 RET_LABEL:;
 }
-/* method parser_prod#AParam#replace_child for (self: AParam, ANode, nullable ANode) */
-void nit__parser_prod___AParam___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#AQclassid#replace_child for (self: AQclassid, ANode, nullable ANode) */
+void nitc__parser_prod___AQclassid___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : TId */;
+val* var /* : nullable AQualified */;
 short int var1 /* : Bool */;
+short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var5 /* : Bool */;
+short int var4 /* : Bool */;
 short int var6 /* : Bool */;
+short int var7 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-val* var7 /* : nullable AType */;
-short int var8 /* : Bool */;
+val* var8 /* : TClassid */;
 short int var9 /* : Bool */;
 short int var11 /* : Bool */;
 short int var13 /* : Bool */;
@@ -5101,82 +4812,65 @@ short int var14 /* : Bool */;
 int cltype15;
 int idtype16;
 const char* var_class_name17;
-val* var18 /* : nullable TDotdotdot */;
-short int var19 /* : Bool */;
-short int var20 /* : Bool */;
-short int var22 /* : Bool */;
-short int var24 /* : Bool */;
-short int var25 /* : Bool */;
-int cltype26;
-int idtype27;
-const char* var_class_name28;
-val* var29 /* : nullable AAnnotations */;
-short int var30 /* : Bool */;
-short int var31 /* : Bool */;
-short int var33 /* : Bool */;
-short int var35 /* : Bool */;
-short int var36 /* : Bool */;
-int cltype37;
-int idtype38;
-const char* var_class_name39;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AParam___n_id].val; /* _n_id on <self:AParam> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2312);
-fatal_exit(1);
-}
-{
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:TId> */
+var = self->attrs[COLOR_nitc__parser_nodes__AQclassid___n_qualified].val; /* _n_qualified on <self:AQclassid> */
+if (var == NULL) {
+var1 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable AQualified> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TId> */
-var5 = var == var_other;
-var3 = var5;
-goto RET_LABEL4;
-RET_LABEL4:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable AQualified(AQualified)> */
+var6 = var == var_other;
+var4 = var6;
+goto RET_LABEL5;
+RET_LABEL5:(void)0;
 }
 }
-var1 = var3;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
+var2 = var4;
+goto RET_LABEL3;
+RET_LABEL3:(void)0;
 }
+var1 = var2;
 }
 if (var1){
-/* <var_new_child:nullable ANode> isa TId */
-cltype = type_nit__TId.color;
-idtype = type_nit__TId.id;
+/* <var_new_child:nullable ANode> isa nullable AQualified */
+cltype = type_nullable__nitc__AQualified.color;
+idtype = type_nullable__nitc__AQualified.id;
 if(var_new_child == NULL) {
-var6 = 0;
+var7 = 1;
 } else {
 if(cltype >= var_new_child->type->table_size) {
-var6 = 0;
+var7 = 0;
 } else {
-var6 = var_new_child->type->type_table[cltype] == idtype;
+var7 = var_new_child->type->type_table[cltype] == idtype;
 }
 }
-if (unlikely(!var6)) {
+if (unlikely(!var7)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TId", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2313);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AQualified", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2290);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AParam___n_id_61d(self, var_new_child); /* Direct call parser_prod#AParam#n_id= on <self:AParam>*/
+nitc__parser_prod___AQclassid___n_qualified_61d(self, var_new_child); /* Direct call parser_prod#AQclassid#n_qualified= on <self:AQclassid>*/
 }
 goto RET_LABEL;
 } else {
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__AParam___n_type].val; /* _n_type on <self:AParam> */
-if (var7 == NULL) {
-var8 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:nullable AType> */
+var8 = self->attrs[COLOR_nitc__parser_nodes__AQclassid___n_id].val; /* _n_id on <self:AQclassid> */
+if (unlikely(var8 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2293);
+fatal_exit(1);
+}
+{
+{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:TClassid> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:nullable AType(AType)> */
-var13 = var7 == var_other;
+{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:TClassid> */
+var13 = var8 == var_other;
 var11 = var13;
 goto RET_LABEL12;
 RET_LABEL12:(void)0;
@@ -5186,14 +4880,13 @@ var9 = var11;
 goto RET_LABEL10;
 RET_LABEL10:(void)0;
 }
-var8 = var9;
 }
-if (var8){
-/* <var_new_child:nullable ANode> isa nullable AType */
-cltype15 = type_nullable__nit__AType.color;
-idtype16 = type_nullable__nit__AType.id;
+if (var9){
+/* <var_new_child:nullable ANode> isa TClassid */
+cltype15 = type_nitc__TClassid.color;
+idtype16 = type_nitc__TClassid.id;
 if(var_new_child == NULL) {
-var14 = 1;
+var14 = 0;
 } else {
 if(cltype15 >= var_new_child->type->table_size) {
 var14 = 0;
@@ -5203,180 +4896,38 @@ var14 = var_new_child->type->type_table[cltype15] == idtype16;
 }
 if (unlikely(!var14)) {
 var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AType", var_class_name17);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2317);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TClassid", var_class_name17);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2294);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AParam___n_type_61d(self, var_new_child); /* Direct call parser_prod#AParam#n_type= on <self:AParam>*/
+nitc__parser_prod___AQclassid___n_id_61d(self, var_new_child); /* Direct call parser_prod#AQclassid#n_id= on <self:AQclassid>*/
 }
 goto RET_LABEL;
 } else {
 }
-var18 = self->attrs[COLOR_nit__parser_nodes__AParam___n_dotdotdot].val; /* _n_dotdotdot on <self:AParam> */
-if (var18 == NULL) {
-var19 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var18,var_old_child) on <var18:nullable TDotdotdot> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var18,var_other) on <var18:nullable TDotdotdot(TDotdotdot)> */
-var24 = var18 == var_other;
-var22 = var24;
-goto RET_LABEL23;
-RET_LABEL23:(void)0;
-}
-}
-var20 = var22;
-goto RET_LABEL21;
-RET_LABEL21:(void)0;
-}
-var19 = var20;
-}
-if (var19){
-/* <var_new_child:nullable ANode> isa nullable TDotdotdot */
-cltype26 = type_nullable__nit__TDotdotdot.color;
-idtype27 = type_nullable__nit__TDotdotdot.id;
-if(var_new_child == NULL) {
-var25 = 1;
-} else {
-if(cltype26 >= var_new_child->type->table_size) {
-var25 = 0;
-} else {
-var25 = var_new_child->type->type_table[cltype26] == idtype27;
-}
-}
-if (unlikely(!var25)) {
-var_class_name28 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TDotdotdot", var_class_name28);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2321);
-fatal_exit(1);
-}
-{
-nit__parser_prod___AParam___n_dotdotdot_61d(self, var_new_child); /* Direct call parser_prod#AParam#n_dotdotdot= on <self:AParam>*/
-}
-goto RET_LABEL;
-} else {
-}
-var29 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AParam> */
-if (var29 == NULL) {
-var30 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var29,var_old_child) on <var29:nullable AAnnotations> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var29,var_other) on <var29:nullable AAnnotations(AAnnotations)> */
-var35 = var29 == var_other;
-var33 = var35;
-goto RET_LABEL34;
-RET_LABEL34:(void)0;
-}
-}
-var31 = var33;
-goto RET_LABEL32;
-RET_LABEL32:(void)0;
-}
-var30 = var31;
-}
-if (var30){
-/* <var_new_child:nullable ANode> isa nullable AAnnotations */
-cltype37 = type_nullable__nit__AAnnotations.color;
-idtype38 = type_nullable__nit__AAnnotations.id;
-if(var_new_child == NULL) {
-var36 = 1;
-} else {
-if(cltype37 >= var_new_child->type->table_size) {
-var36 = 0;
-} else {
-var36 = var_new_child->type->type_table[cltype37] == idtype38;
-}
-}
-if (unlikely(!var36)) {
-var_class_name39 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AAnnotations", var_class_name39);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2325);
-fatal_exit(1);
-}
-{
-nit__parser_prod___AParam___nit__parser_nodes__Prod__n_annotations_61d(self, var_new_child); /* Direct call parser_prod#AParam#n_annotations= on <self:AParam>*/
-}
-goto RET_LABEL;
-} else {
-}
-RET_LABEL:;
-}
-/* method parser_prod#AParam#n_id= for (self: AParam, TId) */
-void nit__parser_prod___AParam___n_id_61d(val* self, val* p0) {
-val* var_node /* var node: TId */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AParam___n_id].val = var_node; /* _n_id on <self:AParam> */
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TId> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
-RET_LABEL1:(void)0;
-}
-}
-RET_LABEL:;
-}
-/* method parser_prod#AParam#n_type= for (self: AParam, nullable AType) */
-void nit__parser_prod___AParam___n_type_61d(val* self, val* p0) {
-val* var_node /* var node: nullable AType */;
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var4 /* : Bool */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AParam___n_type].val = var_node; /* _n_type on <self:AParam> */
-if (var_node == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AType> */
-var_other = ((val*)NULL);
-{
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AType(AType)>*/
-}
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-var = var1;
-}
-if (var){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AType(AType)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AType(AType)> */
-RET_LABEL5:(void)0;
-}
-}
-} else {
-}
 RET_LABEL:;
 }
-/* method parser_prod#AParam#n_dotdotdot= for (self: AParam, nullable TDotdotdot) */
-void nit__parser_prod___AParam___n_dotdotdot_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TDotdotdot */;
+/* method parser_prod#AQclassid#n_qualified= for (self: AQclassid, nullable AQualified) */
+void nitc__parser_prod___AQclassid___n_qualified_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AQualified */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AParam___n_dotdotdot].val = var_node; /* _n_dotdotdot on <self:AParam> */
+self->attrs[COLOR_nitc__parser_nodes__AQclassid___n_qualified].val = var_node; /* _n_qualified on <self:AQclassid> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TDotdotdot> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AQualified> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TDotdotdot(TDotdotdot)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AQualified(AQualified)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -5387,8 +4938,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TDotdotdot(TDotdotdot)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TDotdotdot(TDotdotdot)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AQualified(AQualified)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AQualified(AQualified)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -5396,125 +4947,81 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AParam#n_annotations= for (self: AParam, nullable AAnnotations) */
-void nit__parser_prod___AParam___nit__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
-val* var_node /* var node: nullable AAnnotations */;
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var4 /* : Bool */;
+/* method parser_prod#AQclassid#n_id= for (self: AQclassid, TClassid) */
+void nitc__parser_prod___AQclassid___n_id_61d(val* self, val* p0) {
+val* var_node /* var node: TClassid */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:AParam> */
-if (var_node == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AAnnotations> */
-var_other = ((val*)NULL);
-{
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
-}
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-var = var1;
-}
-if (var){
+self->attrs[COLOR_nitc__parser_nodes__AQclassid___n_id].val = var_node; /* _n_id on <self:AQclassid> */
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AAnnotations(AAnnotations)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
-RET_LABEL5:(void)0;
-}
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TClassid> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TClassid> */
+RET_LABEL1:(void)0;
 }
-} else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AParam#visit_all for (self: AParam, Visitor) */
-void nit__parser_prod___AParam___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+/* method parser_prod#AQclassid#visit_all for (self: AQclassid, Visitor) */
+void nitc__parser_prod___AQclassid___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
-val* var /* : TId */;
-val* var1 /* : nullable AType */;
-val* var2 /* : nullable TDotdotdot */;
-val* var3 /* : nullable AAnnotations */;
+val* var /* : nullable AQualified */;
+val* var1 /* : TClassid */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AParam___n_id].val; /* _n_id on <self:AParam> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2354);
-fatal_exit(1);
-}
-{
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var1 = self->attrs[COLOR_nit__parser_nodes__AParam___n_type].val; /* _n_type on <self:AParam> */
+var = self->attrs[COLOR_nitc__parser_nodes__AQclassid___n_qualified].val; /* _n_qualified on <self:AQclassid> */
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var2 = self->attrs[COLOR_nit__parser_nodes__AParam___n_dotdotdot].val; /* _n_dotdotdot on <self:AParam> */
-{
-nit___nit__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+var1 = self->attrs[COLOR_nitc__parser_nodes__AQclassid___n_id].val; /* _n_id on <self:AQclassid> */
+if (unlikely(var1 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2314);
+fatal_exit(1);
 }
-var3 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AParam> */
 {
-nit___nit__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#AType#init_atype for (self: AType, nullable TKwnullable, nullable TClassid, nullable TObra, Collection[Object], nullable TCbra, nullable AAnnotations) */
-void nit__parser_prod___AType___init_atype(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5) {
-val* var_n_kwnullable /* var n_kwnullable: nullable TKwnullable */;
-val* var_n_id /* var n_id: nullable TClassid */;
-val* var_n_obra /* var n_obra: nullable TObra */;
-val* var_n_types /* var n_types: Collection[Object] */;
-val* var_n_cbra /* var n_cbra: nullable TCbra */;
-val* var_n_annotations /* var n_annotations: nullable AAnnotations */;
+/* method parser_prod#ASignature#init_asignature for (self: ASignature, nullable TOpar, Collection[Object], nullable TCpar, nullable AType) */
+void nitc__parser_prod___ASignature___init_asignature(val* self, val* p0, val* p1, val* p2, val* p3) {
+val* var_n_opar /* var n_opar: nullable TOpar */;
+val* var_n_params /* var n_params: Collection[Object] */;
+val* var_n_cpar /* var n_cpar: nullable TCpar */;
+val* var_n_type /* var n_type: nullable AType */;
 short int var /* : Bool */;
 short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var4 /* : Bool */;
 short int var5 /* : Bool */;
-short int var8 /* : Bool */;
-short int var9 /* : Bool */;
+val* var7 /* : ANodes[AParam] */;
+val* var9 /* : ANodes[AParam] */;
+short int var10 /* : Bool */;
 short int var11 /* : Bool */;
-short int var12 /* : Bool */;
-val* var14 /* : ANodes[AType] */;
-val* var16 /* : ANodes[AType] */;
+short int var13 /* : Bool */;
+short int var14 /* : Bool */;
+short int var16 /* : Bool */;
 short int var17 /* : Bool */;
-short int var18 /* : Bool */;
+short int var19 /* : Bool */;
 short int var20 /* : Bool */;
-short int var21 /* : Bool */;
-short int var23 /* : Bool */;
-short int var24 /* : Bool */;
-short int var26 /* : Bool */;
-short int var27 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:AType> */
+{ /* Inline kernel#Object#init (self) on <self:ASignature> */
 RET_LABEL1:(void)0;
 }
 }
-var_n_kwnullable = p0;
-var_n_id = p1;
-var_n_obra = p2;
-var_n_types = p3;
-var_n_cbra = p4;
-var_n_annotations = p5;
-self->attrs[COLOR_nit__parser_nodes__AType___n_kwnullable].val = var_n_kwnullable; /* _n_kwnullable on <self:AType> */
-if (var_n_kwnullable == NULL) {
+var_n_opar = p0;
+var_n_params = p1;
+var_n_cpar = p2;
+var_n_type = p3;
+self->attrs[COLOR_nitc__parser_nodes__ASignature___n_opar].val = var_n_opar; /* _n_opar on <self:ASignature> */
+if (var_n_opar == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_kwnullable,((val*)NULL)) on <var_n_kwnullable:nullable TKwnullable> */
+{ /* Inline kernel#Object#!= (var_n_opar,((val*)NULL)) on <var_n_opar:nullable TOpar> */
 var_other = ((val*)NULL);
 {
-var4 = ((short int(*)(val* self, val* p0))(var_n_kwnullable->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_kwnullable, var_other); /* == on <var_n_kwnullable:nullable TKwnullable(TKwnullable)>*/
+var4 = ((short int(*)(val* self, val* p0))(var_n_opar->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_opar, var_other); /* == on <var_n_opar:nullable TOpar(TOpar)>*/
 }
 var5 = !var4;
 var2 = var5;
@@ -5525,140 +5032,91 @@ var = var2;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwnullable,self) on <var_n_kwnullable:nullable TKwnullable(TKwnullable)> */
-var_n_kwnullable->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwnullable:nullable TKwnullable(TKwnullable)> */
+{ /* Inline parser_nodes#ANode#parent= (var_n_opar,self) on <var_n_opar:nullable TOpar(TOpar)> */
+var_n_opar->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_opar:nullable TOpar(TOpar)> */
 RET_LABEL6:(void)0;
 }
 }
 } else {
 }
-if (unlikely(var_n_id == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2372);
+{
+{ /* Inline parser_nodes#ASignature#n_params (self) on <self:ASignature> */
+var9 = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_params].val; /* _n_params on <self:ASignature> */
+if (unlikely(var9 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_params");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1679);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AType___n_id].val = var_n_id; /* _n_id on <self:AType> */
-if (var_n_id == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2373);
-fatal_exit(1);
-} else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TClassid> */
-if (unlikely(var_n_id == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
-fatal_exit(1);
+var7 = var9;
+RET_LABEL8:(void)0;
 }
-var_n_id->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TClassid> */
-RET_LABEL7:(void)0;
 }
+{
+nitc___nitc__ANodes___unsafe_add_all(var7, var_n_params); /* Direct call parser_nodes#ANodes#unsafe_add_all on <var7:ANodes[AParam]>*/
 }
-self->attrs[COLOR_nit__parser_nodes__AType___n_obra].val = var_n_obra; /* _n_obra on <self:AType> */
-if (var_n_obra == NULL) {
-var8 = 0; /* is null */
+self->attrs[COLOR_nitc__parser_nodes__ASignature___n_cpar].val = var_n_cpar; /* _n_cpar on <self:ASignature> */
+if (var_n_cpar == NULL) {
+var10 = 0; /* is null */
 } else {
-var8 = 1; /* arg is null and recv is not */
+var10 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_obra,((val*)NULL)) on <var_n_obra:nullable TObra> */
+{ /* Inline kernel#Object#!= (var_n_cpar,((val*)NULL)) on <var_n_cpar:nullable TCpar> */
 var_other = ((val*)NULL);
 {
-var11 = ((short int(*)(val* self, val* p0))(var_n_obra->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_obra, var_other); /* == on <var_n_obra:nullable TObra(TObra)>*/
+var13 = ((short int(*)(val* self, val* p0))(var_n_cpar->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_cpar, var_other); /* == on <var_n_cpar:nullable TCpar(TCpar)>*/
 }
-var12 = !var11;
-var9 = var12;
-goto RET_LABEL10;
-RET_LABEL10:(void)0;
+var14 = !var13;
+var11 = var14;
+goto RET_LABEL12;
+RET_LABEL12:(void)0;
 }
-var8 = var9;
+var10 = var11;
 }
-if (var8){
+if (var10){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_obra,self) on <var_n_obra:nullable TObra(TObra)> */
-var_n_obra->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_obra:nullable TObra(TObra)> */
-RET_LABEL13:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_cpar,self) on <var_n_cpar:nullable TCpar(TCpar)> */
+var_n_cpar->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cpar:nullable TCpar(TCpar)> */
+RET_LABEL15:(void)0;
 }
 }
 } else {
 }
-{
-{ /* Inline parser_nodes#AType#n_types (self) on <self:AType> */
-var16 = self->attrs[COLOR_nit__parser_nodes__AType___n_types].val; /* _n_types on <self:AType> */
-if (unlikely(var16 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_types");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1729);
-fatal_exit(1);
-}
-var14 = var16;
-RET_LABEL15:(void)0;
-}
-}
-{
-nit___nit__ANodes___unsafe_add_all(var14, var_n_types); /* Direct call parser_nodes#ANodes#unsafe_add_all on <var14:ANodes[AType]>*/
-}
-self->attrs[COLOR_nit__parser_nodes__AType___n_cbra].val = var_n_cbra; /* _n_cbra on <self:AType> */
-if (var_n_cbra == NULL) {
-var17 = 0; /* is null */
-} else {
-var17 = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_cbra,((val*)NULL)) on <var_n_cbra:nullable TCbra> */
-var_other = ((val*)NULL);
-{
-var20 = ((short int(*)(val* self, val* p0))(var_n_cbra->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_cbra, var_other); /* == on <var_n_cbra:nullable TCbra(TCbra)>*/
-}
-var21 = !var20;
-var18 = var21;
-goto RET_LABEL19;
-RET_LABEL19:(void)0;
-}
-var17 = var18;
-}
-if (var17){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_cbra,self) on <var_n_cbra:nullable TCbra(TCbra)> */
-var_n_cbra->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cbra:nullable TCbra(TCbra)> */
-RET_LABEL22:(void)0;
-}
-}
-} else {
-}
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_n_annotations; /* _n_annotations on <self:AType> */
-if (var_n_annotations == NULL) {
-var23 = 0; /* is null */
+self->attrs[COLOR_nitc__parser_nodes__ASignature___n_type].val = var_n_type; /* _n_type on <self:ASignature> */
+if (var_n_type == NULL) {
+var16 = 0; /* is null */
 } else {
-var23 = 1; /* arg is null and recv is not */
+var16 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_annotations,((val*)NULL)) on <var_n_annotations:nullable AAnnotations> */
+{ /* Inline kernel#Object#!= (var_n_type,((val*)NULL)) on <var_n_type:nullable AType> */
 var_other = ((val*)NULL);
 {
-var26 = ((short int(*)(val* self, val* p0))(var_n_annotations->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_annotations, var_other); /* == on <var_n_annotations:nullable AAnnotations(AAnnotations)>*/
+var19 = ((short int(*)(val* self, val* p0))(var_n_type->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_type, var_other); /* == on <var_n_type:nullable AType(AType)>*/
 }
-var27 = !var26;
-var24 = var27;
-goto RET_LABEL25;
-RET_LABEL25:(void)0;
+var20 = !var19;
+var17 = var20;
+goto RET_LABEL18;
+RET_LABEL18:(void)0;
 }
-var23 = var24;
+var16 = var17;
 }
-if (var23){
+if (var16){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_annotations,self) on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
-var_n_annotations->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
-RET_LABEL28:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_type,self) on <var_n_type:nullable AType(AType)> */
+var_n_type->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_type:nullable AType(AType)> */
+RET_LABEL21:(void)0;
 }
 }
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AType#replace_child for (self: AType, ANode, nullable ANode) */
-void nit__parser_prod___AType___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#ASignature#replace_child for (self: ASignature, ANode, nullable ANode) */
+void nitc__parser_prod___ASignature___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : nullable TKwnullable */;
+val* var /* : nullable TOpar */;
 short int var1 /* : Bool */;
 short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
@@ -5668,54 +5126,37 @@ short int var7 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-val* var8 /* : TClassid */;
-short int var9 /* : Bool */;
+val* var8 /* : ANodes[AParam] */;
+val* var10 /* : ANodes[AParam] */;
 short int var11 /* : Bool */;
+val* var12 /* : nullable TCpar */;
 short int var13 /* : Bool */;
 short int var14 /* : Bool */;
-int cltype15;
-int idtype16;
-const char* var_class_name17;
-val* var18 /* : nullable TObra */;
+short int var16 /* : Bool */;
+short int var18 /* : Bool */;
 short int var19 /* : Bool */;
-short int var20 /* : Bool */;
-short int var22 /* : Bool */;
+int cltype20;
+int idtype21;
+const char* var_class_name22;
+val* var23 /* : nullable AType */;
 short int var24 /* : Bool */;
 short int var25 /* : Bool */;
-int cltype26;
-int idtype27;
-const char* var_class_name28;
-val* var29 /* : ANodes[AType] */;
-val* var31 /* : ANodes[AType] */;
-short int var32 /* : Bool */;
-val* var33 /* : nullable TCbra */;
-short int var34 /* : Bool */;
-short int var35 /* : Bool */;
-short int var37 /* : Bool */;
-short int var39 /* : Bool */;
-short int var40 /* : Bool */;
-int cltype41;
-int idtype42;
-const char* var_class_name43;
-val* var44 /* : nullable AAnnotations */;
-short int var45 /* : Bool */;
-short int var46 /* : Bool */;
-short int var48 /* : Bool */;
-short int var50 /* : Bool */;
-short int var51 /* : Bool */;
-int cltype52;
-int idtype53;
-const char* var_class_name54;
+short int var27 /* : Bool */;
+short int var29 /* : Bool */;
+short int var30 /* : Bool */;
+int cltype31;
+int idtype32;
+const char* var_class_name33;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AType___n_kwnullable].val; /* _n_kwnullable on <self:AType> */
+var = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_opar].val; /* _n_opar on <self:ASignature> */
 if (var == NULL) {
 var1 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TKwnullable> */
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TOpar> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TKwnullable(TKwnullable)> */
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TOpar(TOpar)> */
 var6 = var == var_other;
 var4 = var6;
 goto RET_LABEL5;
@@ -5729,9 +5170,9 @@ RET_LABEL3:(void)0;
 var1 = var2;
 }
 if (var1){
-/* <var_new_child:nullable ANode> isa nullable TKwnullable */
-cltype = type_nullable__nit__TKwnullable.color;
-idtype = type_nullable__nit__TKwnullable.id;
+/* <var_new_child:nullable ANode> isa nullable TOpar */
+cltype = type_nullable__nitc__TOpar.color;
+idtype = type_nullable__nitc__TOpar.id;
 if(var_new_child == NULL) {
 var7 = 1;
 } else {
@@ -5743,330 +5184,186 @@ var7 = var_new_child->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var7)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwnullable", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2386);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TOpar", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2337);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AType___n_kwnullable_61d(self, var_new_child); /* Direct call parser_prod#AType#n_kwnullable= on <self:AType>*/
+nitc__parser_prod___ASignature___n_opar_61d(self, var_new_child); /* Direct call parser_prod#ASignature#n_opar= on <self:ASignature>*/
 }
 goto RET_LABEL;
 } else {
 }
-var8 = self->attrs[COLOR_nit__parser_nodes__AType___n_id].val; /* _n_id on <self:AType> */
-if (unlikely(var8 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2389);
+{
+{ /* Inline parser_nodes#ASignature#n_params (self) on <self:ASignature> */
+var10 = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_params].val; /* _n_params on <self:ASignature> */
+if (unlikely(var10 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_params");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1679);
 fatal_exit(1);
 }
+var8 = var10;
+RET_LABEL9:(void)0;
+}
+}
 {
-{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:TClassid> */
+var11 = nitc___nitc__ANodes___replace_child(var8, var_old_child, var_new_child);
+}
+if (var11){
+goto RET_LABEL;
+} else {
+}
+var12 = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_cpar].val; /* _n_cpar on <self:ASignature> */
+if (var12 == NULL) {
+var13 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var12,var_old_child) on <var12:nullable TCpar> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:TClassid> */
-var13 = var8 == var_other;
-var11 = var13;
-goto RET_LABEL12;
-RET_LABEL12:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var12,var_other) on <var12:nullable TCpar(TCpar)> */
+var18 = var12 == var_other;
+var16 = var18;
+goto RET_LABEL17;
+RET_LABEL17:(void)0;
 }
 }
-var9 = var11;
-goto RET_LABEL10;
-RET_LABEL10:(void)0;
+var14 = var16;
+goto RET_LABEL15;
+RET_LABEL15:(void)0;
 }
+var13 = var14;
 }
-if (var9){
-/* <var_new_child:nullable ANode> isa TClassid */
-cltype15 = type_nit__TClassid.color;
-idtype16 = type_nit__TClassid.id;
+if (var13){
+/* <var_new_child:nullable ANode> isa nullable TCpar */
+cltype20 = type_nullable__nitc__TCpar.color;
+idtype21 = type_nullable__nitc__TCpar.id;
 if(var_new_child == NULL) {
-var14 = 0;
+var19 = 1;
 } else {
-if(cltype15 >= var_new_child->type->table_size) {
-var14 = 0;
+if(cltype20 >= var_new_child->type->table_size) {
+var19 = 0;
 } else {
-var14 = var_new_child->type->type_table[cltype15] == idtype16;
+var19 = var_new_child->type->type_table[cltype20] == idtype21;
 }
 }
-if (unlikely(!var14)) {
-var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TClassid", var_class_name17);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2390);
+if (unlikely(!var19)) {
+var_class_name22 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TCpar", var_class_name22);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2342);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AType___n_id_61d(self, var_new_child); /* Direct call parser_prod#AType#n_id= on <self:AType>*/
+nitc__parser_prod___ASignature___n_cpar_61d(self, var_new_child); /* Direct call parser_prod#ASignature#n_cpar= on <self:ASignature>*/
 }
 goto RET_LABEL;
 } else {
 }
-var18 = self->attrs[COLOR_nit__parser_nodes__AType___n_obra].val; /* _n_obra on <self:AType> */
-if (var18 == NULL) {
-var19 = 0; /* <var_old_child:ANode> cannot be null */
+var23 = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_type].val; /* _n_type on <self:ASignature> */
+if (var23 == NULL) {
+var24 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var18,var_old_child) on <var18:nullable TObra> */
+{ /* Inline kernel#Object#== (var23,var_old_child) on <var23:nullable AType> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var18,var_other) on <var18:nullable TObra(TObra)> */
-var24 = var18 == var_other;
-var22 = var24;
-goto RET_LABEL23;
-RET_LABEL23:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var23,var_other) on <var23:nullable AType(AType)> */
+var29 = var23 == var_other;
+var27 = var29;
+goto RET_LABEL28;
+RET_LABEL28:(void)0;
 }
 }
-var20 = var22;
-goto RET_LABEL21;
-RET_LABEL21:(void)0;
+var25 = var27;
+goto RET_LABEL26;
+RET_LABEL26:(void)0;
 }
-var19 = var20;
+var24 = var25;
 }
-if (var19){
-/* <var_new_child:nullable ANode> isa nullable TObra */
-cltype26 = type_nullable__nit__TObra.color;
-idtype27 = type_nullable__nit__TObra.id;
+if (var24){
+/* <var_new_child:nullable ANode> isa nullable AType */
+cltype31 = type_nullable__nitc__AType.color;
+idtype32 = type_nullable__nitc__AType.id;
 if(var_new_child == NULL) {
-var25 = 1;
+var30 = 1;
 } else {
-if(cltype26 >= var_new_child->type->table_size) {
-var25 = 0;
+if(cltype31 >= var_new_child->type->table_size) {
+var30 = 0;
 } else {
-var25 = var_new_child->type->type_table[cltype26] == idtype27;
+var30 = var_new_child->type->type_table[cltype31] == idtype32;
 }
 }
-if (unlikely(!var25)) {
-var_class_name28 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TObra", var_class_name28);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2394);
+if (unlikely(!var30)) {
+var_class_name33 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AType", var_class_name33);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2346);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AType___n_obra_61d(self, var_new_child); /* Direct call parser_prod#AType#n_obra= on <self:AType>*/
+nitc__parser_prod___ASignature___n_type_61d(self, var_new_child); /* Direct call parser_prod#ASignature#n_type= on <self:ASignature>*/
 }
 goto RET_LABEL;
 } else {
 }
+RET_LABEL:;
+}
+/* method parser_prod#ASignature#n_opar= for (self: ASignature, nullable TOpar) */
+void nitc__parser_prod___ASignature___n_opar_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TOpar */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__ASignature___n_opar].val = var_node; /* _n_opar on <self:ASignature> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TOpar> */
+var_other = ((val*)NULL);
 {
-{ /* Inline parser_nodes#AType#n_types (self) on <self:AType> */
-var31 = self->attrs[COLOR_nit__parser_nodes__AType___n_types].val; /* _n_types on <self:AType> */
-if (unlikely(var31 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_types");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1729);
-fatal_exit(1);
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TOpar(TOpar)>*/
 }
-var29 = var31;
-RET_LABEL30:(void)0;
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
 }
+var = var1;
 }
+if (var){
 {
-var32 = nit___nit__ANodes___replace_child(var29, var_old_child, var_new_child);
-}
-if (var32){
-goto RET_LABEL;
-} else {
-}
-var33 = self->attrs[COLOR_nit__parser_nodes__AType___n_cbra].val; /* _n_cbra on <self:AType> */
-if (var33 == NULL) {
-var34 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var33,var_old_child) on <var33:nullable TCbra> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var33,var_other) on <var33:nullable TCbra(TCbra)> */
-var39 = var33 == var_other;
-var37 = var39;
-goto RET_LABEL38;
-RET_LABEL38:(void)0;
-}
-}
-var35 = var37;
-goto RET_LABEL36;
-RET_LABEL36:(void)0;
-}
-var34 = var35;
-}
-if (var34){
-/* <var_new_child:nullable ANode> isa nullable TCbra */
-cltype41 = type_nullable__nit__TCbra.color;
-idtype42 = type_nullable__nit__TCbra.id;
-if(var_new_child == NULL) {
-var40 = 1;
-} else {
-if(cltype41 >= var_new_child->type->table_size) {
-var40 = 0;
-} else {
-var40 = var_new_child->type->type_table[cltype41] == idtype42;
-}
-}
-if (unlikely(!var40)) {
-var_class_name43 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TCbra", var_class_name43);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2399);
-fatal_exit(1);
-}
-{
-nit__parser_prod___AType___n_cbra_61d(self, var_new_child); /* Direct call parser_prod#AType#n_cbra= on <self:AType>*/
-}
-goto RET_LABEL;
-} else {
-}
-var44 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AType> */
-if (var44 == NULL) {
-var45 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var44,var_old_child) on <var44:nullable AAnnotations> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var44,var_other) on <var44:nullable AAnnotations(AAnnotations)> */
-var50 = var44 == var_other;
-var48 = var50;
-goto RET_LABEL49;
-RET_LABEL49:(void)0;
-}
-}
-var46 = var48;
-goto RET_LABEL47;
-RET_LABEL47:(void)0;
-}
-var45 = var46;
-}
-if (var45){
-/* <var_new_child:nullable ANode> isa nullable AAnnotations */
-cltype52 = type_nullable__nit__AAnnotations.color;
-idtype53 = type_nullable__nit__AAnnotations.id;
-if(var_new_child == NULL) {
-var51 = 1;
-} else {
-if(cltype52 >= var_new_child->type->table_size) {
-var51 = 0;
-} else {
-var51 = var_new_child->type->type_table[cltype52] == idtype53;
-}
-}
-if (unlikely(!var51)) {
-var_class_name54 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AAnnotations", var_class_name54);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2403);
-fatal_exit(1);
-}
-{
-nit__parser_prod___AType___nit__parser_nodes__Prod__n_annotations_61d(self, var_new_child); /* Direct call parser_prod#AType#n_annotations= on <self:AType>*/
-}
-goto RET_LABEL;
-} else {
-}
-RET_LABEL:;
-}
-/* method parser_prod#AType#n_kwnullable= for (self: AType, nullable TKwnullable) */
-void nit__parser_prod___AType___n_kwnullable_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TKwnullable */;
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var4 /* : Bool */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AType___n_kwnullable].val = var_node; /* _n_kwnullable on <self:AType> */
-if (var_node == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwnullable> */
-var_other = ((val*)NULL);
-{
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwnullable(TKwnullable)>*/
-}
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-var = var1;
-}
-if (var){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwnullable(TKwnullable)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwnullable(TKwnullable)> */
-RET_LABEL5:(void)0;
-}
-}
-} else {
-}
-RET_LABEL:;
-}
-/* method parser_prod#AType#n_id= for (self: AType, TClassid) */
-void nit__parser_prod___AType___n_id_61d(val* self, val* p0) {
-val* var_node /* var node: TClassid */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AType___n_id].val = var_node; /* _n_id on <self:AType> */
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TClassid> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TClassid> */
-RET_LABEL1:(void)0;
-}
-}
-RET_LABEL:;
-}
-/* method parser_prod#AType#n_obra= for (self: AType, nullable TObra) */
-void nit__parser_prod___AType___n_obra_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TObra */;
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var4 /* : Bool */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AType___n_obra].val = var_node; /* _n_obra on <self:AType> */
-if (var_node == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TObra> */
-var_other = ((val*)NULL);
-{
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TObra(TObra)>*/
-}
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-var = var1;
-}
-if (var){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TObra(TObra)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TObra(TObra)> */
-RET_LABEL5:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TOpar(TOpar)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TOpar(TOpar)> */
+RET_LABEL5:(void)0;
 }
 }
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AType#n_cbra= for (self: AType, nullable TCbra) */
-void nit__parser_prod___AType___n_cbra_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TCbra */;
+/* method parser_prod#ASignature#n_cpar= for (self: ASignature, nullable TCpar) */
+void nitc__parser_prod___ASignature___n_cpar_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TCpar */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AType___n_cbra].val = var_node; /* _n_cbra on <self:AType> */
+self->attrs[COLOR_nitc__parser_nodes__ASignature___n_cpar].val = var_node; /* _n_cpar on <self:ASignature> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TCbra> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TCpar> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TCbra(TCbra)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TCpar(TCpar)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -6077,8 +5374,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TCbra(TCbra)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TCbra(TCbra)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TCpar(TCpar)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TCpar(TCpar)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -6086,26 +5383,26 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AType#n_annotations= for (self: AType, nullable AAnnotations) */
-void nit__parser_prod___AType___nit__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
-val* var_node /* var node: nullable AAnnotations */;
+/* method parser_prod#ASignature#n_type= for (self: ASignature, nullable AType) */
+void nitc__parser_prod___ASignature___n_type_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AType */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:AType> */
+self->attrs[COLOR_nitc__parser_nodes__ASignature___n_type].val = var_node; /* _n_type on <self:ASignature> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AAnnotations> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AType> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AType(AType)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -6116,8 +5413,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AAnnotations(AAnnotations)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AType(AType)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AType(AType)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -6125,107 +5422,104 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AType#visit_all for (self: AType, Visitor) */
-void nit__parser_prod___AType___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+/* method parser_prod#ASignature#visit_all for (self: ASignature, Visitor) */
+void nitc__parser_prod___ASignature___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
-val* var /* : nullable TKwnullable */;
-val* var1 /* : TClassid */;
-val* var2 /* : nullable TObra */;
-val* var3 /* : ANodes[AType] */;
-val* var5 /* : ANodes[AType] */;
-val* var6 /* : nullable TCbra */;
-val* var7 /* : nullable AAnnotations */;
+val* var /* : nullable TOpar */;
+val* var1 /* : ANodes[AParam] */;
+val* var3 /* : ANodes[AParam] */;
+val* var4 /* : nullable TCpar */;
+val* var5 /* : nullable AType */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AType___n_kwnullable].val; /* _n_kwnullable on <self:AType> */
-{
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var1 = self->attrs[COLOR_nit__parser_nodes__AType___n_id].val; /* _n_id on <self:AType> */
-if (unlikely(var1 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2438);
-fatal_exit(1);
-}
-{
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var2 = self->attrs[COLOR_nit__parser_nodes__AType___n_obra].val; /* _n_obra on <self:AType> */
+var = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_opar].val; /* _n_opar on <self:ASignature> */
 {
-nit___nit__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 {
-{ /* Inline parser_nodes#AType#n_types (self) on <self:AType> */
-var5 = self->attrs[COLOR_nit__parser_nodes__AType___n_types].val; /* _n_types on <self:AType> */
-if (unlikely(var5 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_types");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1729);
+{ /* Inline parser_nodes#ASignature#n_params (self) on <self:ASignature> */
+var3 = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_params].val; /* _n_params on <self:ASignature> */
+if (unlikely(var3 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_params");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1679);
 fatal_exit(1);
 }
-var3 = var5;
-RET_LABEL4:(void)0;
+var1 = var3;
+RET_LABEL2:(void)0;
 }
 }
 {
-nit___nit__ANodes___visit_all(var3, var_v); /* Direct call parser_nodes#ANodes#visit_all on <var3:ANodes[AType]>*/
+nitc___nitc__ANodes___visit_all(var1, var_v); /* Direct call parser_nodes#ANodes#visit_all on <var1:ANodes[AParam]>*/
 }
-var6 = self->attrs[COLOR_nit__parser_nodes__AType___n_cbra].val; /* _n_cbra on <self:AType> */
+var4 = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_cpar].val; /* _n_cpar on <self:ASignature> */
 {
-nit___nit__Visitor___enter_visit(var_v, var6); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AType> */
+var5 = self->attrs[COLOR_nitc__parser_nodes__ASignature___n_type].val; /* _n_type on <self:ASignature> */
 {
-nit___nit__Visitor___enter_visit(var_v, var7); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var5); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#ALabel#init_alabel for (self: ALabel, nullable TKwlabel, nullable TId) */
-void nit__parser_prod___ALabel___init_alabel(val* self, val* p0, val* p1) {
-val* var_n_kwlabel /* var n_kwlabel: nullable TKwlabel */;
+/* method parser_prod#AParam#init_aparam for (self: AParam, nullable TId, nullable AType, nullable TDotdotdot, nullable AAnnotations) */
+void nitc__parser_prod___AParam___init_aparam(val* self, val* p0, val* p1, val* p2, val* p3) {
 val* var_n_id /* var n_id: nullable TId */;
+val* var_n_type /* var n_type: nullable AType */;
+val* var_n_dotdotdot /* var n_dotdotdot: nullable TDotdotdot */;
+val* var_n_annotations /* var n_annotations: nullable AAnnotations */;
 short int var /* : Bool */;
 short int var3 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var5 /* : Bool */;
 short int var6 /* : Bool */;
+short int var8 /* : Bool */;
+short int var9 /* : Bool */;
+short int var11 /* : Bool */;
+short int var12 /* : Bool */;
+short int var14 /* : Bool */;
+short int var15 /* : Bool */;
+short int var17 /* : Bool */;
+short int var18 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:ALabel> */
+{ /* Inline kernel#Object#init (self) on <self:AParam> */
 RET_LABEL1:(void)0;
 }
 }
-var_n_kwlabel = p0;
-var_n_id = p1;
-if (unlikely(var_n_kwlabel == NULL)) {
+var_n_id = p0;
+var_n_type = p1;
+var_n_dotdotdot = p2;
+var_n_annotations = p3;
+if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2451);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2384);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__ALabel___n_kwlabel].val = var_n_kwlabel; /* _n_kwlabel on <self:ALabel> */
-if (var_n_kwlabel == NULL) {
+self->attrs[COLOR_nitc__parser_nodes__AParam___n_id].val = var_n_id; /* _n_id on <self:AParam> */
+if (var_n_id == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2452);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2385);
 fatal_exit(1);
 } else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwlabel,self) on <var_n_kwlabel:nullable TKwlabel> */
-if (unlikely(var_n_kwlabel == NULL)) {
+{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId> */
+if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_kwlabel->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwlabel:nullable TKwlabel> */
+var_n_id->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
 RET_LABEL2:(void)0;
 }
 }
-self->attrs[COLOR_nit__parser_nodes__ALabel___n_id].val = var_n_id; /* _n_id on <self:ALabel> */
-if (var_n_id == NULL) {
+self->attrs[COLOR_nitc__parser_nodes__AParam___n_type].val = var_n_type; /* _n_type on <self:AParam> */
+if (var_n_type == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_id,((val*)NULL)) on <var_n_id:nullable TId> */
+{ /* Inline kernel#Object#!= (var_n_type,((val*)NULL)) on <var_n_type:nullable AType> */
 var_other = ((val*)NULL);
 {
-var5 = ((short int(*)(val* self, val* p0))(var_n_id->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_id, var_other); /* == on <var_n_id:nullable TId(TId)>*/
+var5 = ((short int(*)(val* self, val* p0))(var_n_type->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_type, var_other); /* == on <var_n_type:nullable AType(AType)>*/
 }
 var6 = !var5;
 var3 = var6;
@@ -6236,30 +5530,86 @@ var = var3;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId(TId)> */
-var_n_id->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId(TId)> */
+{ /* Inline parser_nodes#ANode#parent= (var_n_type,self) on <var_n_type:nullable AType(AType)> */
+var_n_type->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_type:nullable AType(AType)> */
 RET_LABEL7:(void)0;
 }
 }
 } else {
 }
-RET_LABEL:;
+self->attrs[COLOR_nitc__parser_nodes__AParam___n_dotdotdot].val = var_n_dotdotdot; /* _n_dotdotdot on <self:AParam> */
+if (var_n_dotdotdot == NULL) {
+var8 = 0; /* is null */
+} else {
+var8 = 1; /* arg is null and recv is not */
 }
-/* method parser_prod#ALabel#replace_child for (self: ALabel, ANode, nullable ANode) */
-void nit__parser_prod___ALabel___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
-val* var_old_child /* var old_child: ANode */;
-val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : TKwlabel */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var5 /* : Bool */;
-short int var6 /* : Bool */;
-int cltype;
-int idtype;
-const char* var_class_name;
-val* var7 /* : nullable TId */;
-short int var8 /* : Bool */;
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_dotdotdot,((val*)NULL)) on <var_n_dotdotdot:nullable TDotdotdot> */
+var_other = ((val*)NULL);
+{
+var11 = ((short int(*)(val* self, val* p0))(var_n_dotdotdot->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_dotdotdot, var_other); /* == on <var_n_dotdotdot:nullable TDotdotdot(TDotdotdot)>*/
+}
+var12 = !var11;
+var9 = var12;
+goto RET_LABEL10;
+RET_LABEL10:(void)0;
+}
+var8 = var9;
+}
+if (var8){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_dotdotdot,self) on <var_n_dotdotdot:nullable TDotdotdot(TDotdotdot)> */
+var_n_dotdotdot->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_dotdotdot:nullable TDotdotdot(TDotdotdot)> */
+RET_LABEL13:(void)0;
+}
+}
+} else {
+}
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_n_annotations; /* _n_annotations on <self:AParam> */
+if (var_n_annotations == NULL) {
+var14 = 0; /* is null */
+} else {
+var14 = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_annotations,((val*)NULL)) on <var_n_annotations:nullable AAnnotations> */
+var_other = ((val*)NULL);
+{
+var17 = ((short int(*)(val* self, val* p0))(var_n_annotations->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_annotations, var_other); /* == on <var_n_annotations:nullable AAnnotations(AAnnotations)>*/
+}
+var18 = !var17;
+var15 = var18;
+goto RET_LABEL16;
+RET_LABEL16:(void)0;
+}
+var14 = var15;
+}
+if (var14){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_annotations,self) on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
+var_n_annotations->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
+RET_LABEL19:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#AParam#replace_child for (self: AParam, ANode, nullable ANode) */
+void nitc__parser_prod___AParam___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+val* var_old_child /* var old_child: ANode */;
+val* var_new_child /* var new_child: nullable ANode */;
+val* var /* : TId */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var5 /* : Bool */;
+short int var6 /* : Bool */;
+int cltype;
+int idtype;
+const char* var_class_name;
+val* var7 /* : nullable AType */;
+short int var8 /* : Bool */;
 short int var9 /* : Bool */;
 short int var11 /* : Bool */;
 short int var13 /* : Bool */;
@@ -6267,19 +5617,37 @@ short int var14 /* : Bool */;
 int cltype15;
 int idtype16;
 const char* var_class_name17;
+val* var18 /* : nullable TDotdotdot */;
+short int var19 /* : Bool */;
+short int var20 /* : Bool */;
+short int var22 /* : Bool */;
+short int var24 /* : Bool */;
+short int var25 /* : Bool */;
+int cltype26;
+int idtype27;
+const char* var_class_name28;
+val* var29 /* : nullable AAnnotations */;
+short int var30 /* : Bool */;
+short int var31 /* : Bool */;
+short int var33 /* : Bool */;
+short int var35 /* : Bool */;
+short int var36 /* : Bool */;
+int cltype37;
+int idtype38;
+const char* var_class_name39;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__ALabel___n_kwlabel].val; /* _n_kwlabel on <self:ALabel> */
+var = self->attrs[COLOR_nitc__parser_nodes__AParam___n_id].val; /* _n_id on <self:AParam> */
 if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwlabel");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2459);
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2396);
 fatal_exit(1);
 }
 {
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwlabel> */
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:TId> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwlabel> */
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TId> */
 var5 = var == var_other;
 var3 = var5;
 goto RET_LABEL4;
@@ -6292,9 +5660,9 @@ RET_LABEL2:(void)0;
 }
 }
 if (var1){
-/* <var_new_child:nullable ANode> isa TKwlabel */
-cltype = type_nit__TKwlabel.color;
-idtype = type_nit__TKwlabel.id;
+/* <var_new_child:nullable ANode> isa TId */
+cltype = type_nitc__TId.color;
+idtype = type_nitc__TId.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -6306,24 +5674,24 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwlabel", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2460);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TId", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2397);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ALabel___n_kwlabel_61d(self, var_new_child); /* Direct call parser_prod#ALabel#n_kwlabel= on <self:ALabel>*/
+nitc__parser_prod___AParam___n_id_61d(self, var_new_child); /* Direct call parser_prod#AParam#n_id= on <self:AParam>*/
 }
 goto RET_LABEL;
 } else {
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__ALabel___n_id].val; /* _n_id on <self:ALabel> */
+var7 = self->attrs[COLOR_nitc__parser_nodes__AParam___n_type].val; /* _n_type on <self:AParam> */
 if (var7 == NULL) {
 var8 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:nullable TId> */
+{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:nullable AType> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:nullable TId(TId)> */
+{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:nullable AType(AType)> */
 var13 = var7 == var_other;
 var11 = var13;
 goto RET_LABEL12;
@@ -6337,9 +5705,9 @@ RET_LABEL10:(void)0;
 var8 = var9;
 }
 if (var8){
-/* <var_new_child:nullable ANode> isa nullable TId */
-cltype15 = type_nullable__nit__TId.color;
-idtype16 = type_nullable__nit__TId.id;
+/* <var_new_child:nullable ANode> isa nullable AType */
+cltype15 = type_nullable__nitc__AType.color;
+idtype16 = type_nullable__nitc__AType.id;
 if(var_new_child == NULL) {
 var14 = 1;
 } else {
@@ -6351,51 +5719,141 @@ var14 = var_new_child->type->type_table[cltype15] == idtype16;
 }
 if (unlikely(!var14)) {
 var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TId", var_class_name17);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2464);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AType", var_class_name17);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2401);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AParam___n_type_61d(self, var_new_child); /* Direct call parser_prod#AParam#n_type= on <self:AParam>*/
+}
+goto RET_LABEL;
+} else {
+}
+var18 = self->attrs[COLOR_nitc__parser_nodes__AParam___n_dotdotdot].val; /* _n_dotdotdot on <self:AParam> */
+if (var18 == NULL) {
+var19 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var18,var_old_child) on <var18:nullable TDotdotdot> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var18,var_other) on <var18:nullable TDotdotdot(TDotdotdot)> */
+var24 = var18 == var_other;
+var22 = var24;
+goto RET_LABEL23;
+RET_LABEL23:(void)0;
+}
+}
+var20 = var22;
+goto RET_LABEL21;
+RET_LABEL21:(void)0;
+}
+var19 = var20;
+}
+if (var19){
+/* <var_new_child:nullable ANode> isa nullable TDotdotdot */
+cltype26 = type_nullable__nitc__TDotdotdot.color;
+idtype27 = type_nullable__nitc__TDotdotdot.id;
+if(var_new_child == NULL) {
+var25 = 1;
+} else {
+if(cltype26 >= var_new_child->type->table_size) {
+var25 = 0;
+} else {
+var25 = var_new_child->type->type_table[cltype26] == idtype27;
+}
+}
+if (unlikely(!var25)) {
+var_class_name28 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TDotdotdot", var_class_name28);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2405);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AParam___n_dotdotdot_61d(self, var_new_child); /* Direct call parser_prod#AParam#n_dotdotdot= on <self:AParam>*/
+}
+goto RET_LABEL;
+} else {
+}
+var29 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AParam> */
+if (var29 == NULL) {
+var30 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var29,var_old_child) on <var29:nullable AAnnotations> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var29,var_other) on <var29:nullable AAnnotations(AAnnotations)> */
+var35 = var29 == var_other;
+var33 = var35;
+goto RET_LABEL34;
+RET_LABEL34:(void)0;
+}
+}
+var31 = var33;
+goto RET_LABEL32;
+RET_LABEL32:(void)0;
+}
+var30 = var31;
+}
+if (var30){
+/* <var_new_child:nullable ANode> isa nullable AAnnotations */
+cltype37 = type_nullable__nitc__AAnnotations.color;
+idtype38 = type_nullable__nitc__AAnnotations.id;
+if(var_new_child == NULL) {
+var36 = 1;
+} else {
+if(cltype37 >= var_new_child->type->table_size) {
+var36 = 0;
+} else {
+var36 = var_new_child->type->type_table[cltype37] == idtype38;
+}
+}
+if (unlikely(!var36)) {
+var_class_name39 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AAnnotations", var_class_name39);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2409);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ALabel___n_id_61d(self, var_new_child); /* Direct call parser_prod#ALabel#n_id= on <self:ALabel>*/
+nitc__parser_prod___AParam___nitc__parser_nodes__Prod__n_annotations_61d(self, var_new_child); /* Direct call parser_prod#AParam#n_annotations= on <self:AParam>*/
 }
 goto RET_LABEL;
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#ALabel#n_kwlabel= for (self: ALabel, TKwlabel) */
-void nit__parser_prod___ALabel___n_kwlabel_61d(val* self, val* p0) {
-val* var_node /* var node: TKwlabel */;
+/* method parser_prod#AParam#n_id= for (self: AParam, TId) */
+void nitc__parser_prod___AParam___n_id_61d(val* self, val* p0) {
+val* var_node /* var node: TId */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ALabel___n_kwlabel].val = var_node; /* _n_kwlabel on <self:ALabel> */
+self->attrs[COLOR_nitc__parser_nodes__AParam___n_id].val = var_node; /* _n_id on <self:AParam> */
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwlabel> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwlabel> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TId> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
-/* method parser_prod#ALabel#n_id= for (self: ALabel, nullable TId) */
-void nit__parser_prod___ALabel___n_id_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TId */;
+/* method parser_prod#AParam#n_type= for (self: AParam, nullable AType) */
+void nitc__parser_prod___AParam___n_type_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AType */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ALabel___n_id].val = var_node; /* _n_id on <self:ALabel> */
+self->attrs[COLOR_nitc__parser_nodes__AParam___n_type].val = var_node; /* _n_type on <self:AParam> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TId> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AType> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TId(TId)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AType(AType)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -6406,8 +5864,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TId(TId)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TId(TId)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AType(AType)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AType(AType)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -6415,195 +5873,65 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#ALabel#visit_all for (self: ALabel, Visitor) */
-void nit__parser_prod___ALabel___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
-val* var_v /* var v: Visitor */;
-val* var /* : TKwlabel */;
-val* var1 /* : nullable TId */;
-var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__ALabel___n_kwlabel].val; /* _n_kwlabel on <self:ALabel> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwlabel");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2483);
-fatal_exit(1);
-}
-{
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var1 = self->attrs[COLOR_nit__parser_nodes__ALabel___n_id].val; /* _n_id on <self:ALabel> */
-{
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-RET_LABEL:;
-}
-/* method parser_prod#ABlockExpr#init_ablockexpr for (self: ABlockExpr, Collection[Object], nullable TKwend) */
-void nit__parser_prod___ABlockExpr___init_ablockexpr(val* self, val* p0, val* p1) {
-val* var_n_expr /* var n_expr: Collection[Object] */;
-val* var_n_kwend /* var n_kwend: nullable TKwend */;
-val* var /* : ANodes[AExpr] */;
-val* var3 /* : ANodes[AExpr] */;
-short int var4 /* : Bool */;
-short int var5 /* : Bool */;
+/* method parser_prod#AParam#n_dotdotdot= for (self: AParam, nullable TDotdotdot) */
+void nitc__parser_prod___AParam___n_dotdotdot_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TDotdotdot */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var7 /* : Bool */;
-short int var8 /* : Bool */;
-{
-{ /* Inline kernel#Object#init (self) on <self:ABlockExpr> */
-RET_LABEL1:(void)0;
-}
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AParam___n_dotdotdot].val = var_node; /* _n_dotdotdot on <self:AParam> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
 }
-var_n_expr = p0;
-var_n_kwend = p1;
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TDotdotdot> */
+var_other = ((val*)NULL);
 {
-{ /* Inline parser_nodes#ABlockExpr#n_expr (self) on <self:ABlockExpr> */
-var3 = self->attrs[COLOR_nit__parser_nodes__ABlockExpr___n_expr].val; /* _n_expr on <self:ABlockExpr> */
-if (unlikely(var3 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1758);
-fatal_exit(1);
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TDotdotdot(TDotdotdot)>*/
 }
-var = var3;
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
 RET_LABEL2:(void)0;
 }
+var = var1;
 }
+if (var){
 {
-nit___nit__ANodes___unsafe_add_all(var, var_n_expr); /* Direct call parser_nodes#ANodes#unsafe_add_all on <var:ANodes[AExpr]>*/
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TDotdotdot(TDotdotdot)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TDotdotdot(TDotdotdot)> */
+RET_LABEL5:(void)0;
+}
 }
-self->attrs[COLOR_nit__parser_nodes__ABlockExpr___n_kwend].val = var_n_kwend; /* _n_kwend on <self:ABlockExpr> */
-if (var_n_kwend == NULL) {
-var4 = 0; /* is null */
 } else {
-var4 = 1; /* arg is null and recv is not */
 }
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_kwend,((val*)NULL)) on <var_n_kwend:nullable TKwend> */
-var_other = ((val*)NULL);
-{
-var7 = ((short int(*)(val* self, val* p0))(var_n_kwend->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_kwend, var_other); /* == on <var_n_kwend:nullable TKwend(TKwend)>*/
+RET_LABEL:;
 }
-var8 = !var7;
-var5 = var8;
-goto RET_LABEL6;
-RET_LABEL6:(void)0;
-}
-var4 = var5;
-}
-if (var4){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwend,self) on <var_n_kwend:nullable TKwend(TKwend)> */
-var_n_kwend->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwend:nullable TKwend(TKwend)> */
-RET_LABEL9:(void)0;
-}
-}
-} else {
-}
-RET_LABEL:;
-}
-/* method parser_prod#ABlockExpr#replace_child for (self: ABlockExpr, ANode, nullable ANode) */
-void nit__parser_prod___ABlockExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
-val* var_old_child /* var old_child: ANode */;
-val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : ANodes[AExpr] */;
-val* var2 /* : ANodes[AExpr] */;
-short int var3 /* : Bool */;
-val* var4 /* : nullable TKwend */;
-short int var5 /* : Bool */;
-short int var6 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var8 /* : Bool */;
-short int var10 /* : Bool */;
-short int var11 /* : Bool */;
-int cltype;
-int idtype;
-const char* var_class_name;
-var_old_child = p0;
-var_new_child = p1;
-{
-{ /* Inline parser_nodes#ABlockExpr#n_expr (self) on <self:ABlockExpr> */
-var2 = self->attrs[COLOR_nit__parser_nodes__ABlockExpr___n_expr].val; /* _n_expr on <self:ABlockExpr> */
-if (unlikely(var2 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1758);
-fatal_exit(1);
-}
-var = var2;
-RET_LABEL1:(void)0;
-}
-}
-{
-var3 = nit___nit__ANodes___replace_child(var, var_old_child, var_new_child);
-}
-if (var3){
-goto RET_LABEL;
-} else {
-}
-var4 = self->attrs[COLOR_nit__parser_nodes__ABlockExpr___n_kwend].val; /* _n_kwend on <self:ABlockExpr> */
-if (var4 == NULL) {
-var5 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var4,var_old_child) on <var4:nullable TKwend> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var4,var_other) on <var4:nullable TKwend(TKwend)> */
-var10 = var4 == var_other;
-var8 = var10;
-goto RET_LABEL9;
-RET_LABEL9:(void)0;
-}
-}
-var6 = var8;
-goto RET_LABEL7;
-RET_LABEL7:(void)0;
-}
-var5 = var6;
-}
-if (var5){
-/* <var_new_child:nullable ANode> isa nullable TKwend */
-cltype = type_nullable__nit__TKwend.color;
-idtype = type_nullable__nit__TKwend.id;
-if(var_new_child == NULL) {
-var11 = 1;
-} else {
-if(cltype >= var_new_child->type->table_size) {
-var11 = 0;
-} else {
-var11 = var_new_child->type->type_table[cltype] == idtype;
-}
-}
-if (unlikely(!var11)) {
-var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwend", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2502);
-fatal_exit(1);
-}
-{
-nit__parser_prod___ABlockExpr___n_kwend_61d(self, var_new_child); /* Direct call parser_prod#ABlockExpr#n_kwend= on <self:ABlockExpr>*/
-}
-goto RET_LABEL;
-} else {
-}
-RET_LABEL:;
-}
-/* method parser_prod#ABlockExpr#n_kwend= for (self: ABlockExpr, nullable TKwend) */
-void nit__parser_prod___ABlockExpr___n_kwend_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TKwend */;
+/* method parser_prod#AParam#n_annotations= for (self: AParam, nullable AAnnotations) */
+void nitc__parser_prod___AParam___nitc__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AAnnotations */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ABlockExpr___n_kwend].val = var_node; /* _n_kwend on <self:ABlockExpr> */
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:AParam> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwend> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AAnnotations> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwend(TKwend)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -6614,8 +5942,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwend(TKwend)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwend(TKwend)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AAnnotations(AAnnotations)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -6623,41 +5951,44 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#ABlockExpr#visit_all for (self: ABlockExpr, Visitor) */
-void nit__parser_prod___ABlockExpr___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+/* method parser_prod#AParam#visit_all for (self: AParam, Visitor) */
+void nitc__parser_prod___AParam___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
-val* var /* : ANodes[AExpr] */;
-val* var2 /* : ANodes[AExpr] */;
-val* var3 /* : nullable TKwend */;
+val* var /* : TId */;
+val* var1 /* : nullable AType */;
+val* var2 /* : nullable TDotdotdot */;
+val* var3 /* : nullable AAnnotations */;
 var_v = p0;
-{
-{ /* Inline parser_nodes#ABlockExpr#n_expr (self) on <self:ABlockExpr> */
-var2 = self->attrs[COLOR_nit__parser_nodes__ABlockExpr___n_expr].val; /* _n_expr on <self:ABlockExpr> */
-if (unlikely(var2 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 1758);
+var = self->attrs[COLOR_nitc__parser_nodes__AParam___n_id].val; /* _n_id on <self:AParam> */
+if (unlikely(var == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2438);
 fatal_exit(1);
 }
-var = var2;
-RET_LABEL1:(void)0;
+{
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
+var1 = self->attrs[COLOR_nitc__parser_nodes__AParam___n_type].val; /* _n_type on <self:AParam> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
+var2 = self->attrs[COLOR_nitc__parser_nodes__AParam___n_dotdotdot].val; /* _n_dotdotdot on <self:AParam> */
 {
-nit___nit__ANodes___visit_all(var, var_v); /* Direct call parser_nodes#ANodes#visit_all on <var:ANodes[AExpr]>*/
+nitc___nitc__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var3 = self->attrs[COLOR_nit__parser_nodes__ABlockExpr___n_kwend].val; /* _n_kwend on <self:ABlockExpr> */
+var3 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AParam> */
 {
-nit___nit__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#AVardeclExpr#init_avardeclexpr for (self: AVardeclExpr, nullable TKwvar, nullable TId, nullable AType, nullable TAssign, nullable AExpr, nullable AAnnotations) */
-void nit__parser_prod___AVardeclExpr___init_avardeclexpr(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5) {
-val* var_n_kwvar /* var n_kwvar: nullable TKwvar */;
-val* var_n_id /* var n_id: nullable TId */;
-val* var_n_type /* var n_type: nullable AType */;
-val* var_n_assign /* var n_assign: nullable TAssign */;
-val* var_n_expr /* var n_expr: nullable AExpr */;
+/* method parser_prod#AType#init_atype for (self: AType, nullable TKwnullable, nullable AQclassid, nullable TObra, Collection[Object], nullable TCbra, nullable AAnnotations) */
+void nitc__parser_prod___AType___init_atype(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5) {
+val* var_n_kwnullable /* var n_kwnullable: nullable TKwnullable */;
+val* var_n_qid /* var n_qid: nullable AQclassid */;
+val* var_n_obra /* var n_obra: nullable TObra */;
+val* var_n_types /* var n_types: Collection[Object] */;
+val* var_n_cbra /* var n_cbra: nullable TCbra */;
 val* var_n_annotations /* var n_annotations: nullable AAnnotations */;
 short int var /* : Bool */;
 short int var2 /* : Bool */;
@@ -6668,8 +5999,8 @@ short int var8 /* : Bool */;
 short int var9 /* : Bool */;
 short int var11 /* : Bool */;
 short int var12 /* : Bool */;
-short int var14 /* : Bool */;
-short int var15 /* : Bool */;
+val* var14 /* : ANodes[AType] */;
+val* var16 /* : ANodes[AType] */;
 short int var17 /* : Bool */;
 short int var18 /* : Bool */;
 short int var20 /* : Bool */;
@@ -6678,30 +6009,28 @@ short int var23 /* : Bool */;
 short int var24 /* : Bool */;
 short int var26 /* : Bool */;
 short int var27 /* : Bool */;
-short int var29 /* : Bool */;
-short int var30 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:AVardeclExpr> */
+{ /* Inline kernel#Object#init (self) on <self:AType> */
 RET_LABEL1:(void)0;
 }
 }
-var_n_kwvar = p0;
-var_n_id = p1;
-var_n_type = p2;
-var_n_assign = p3;
-var_n_expr = p4;
+var_n_kwnullable = p0;
+var_n_qid = p1;
+var_n_obra = p2;
+var_n_types = p3;
+var_n_cbra = p4;
 var_n_annotations = p5;
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_kwvar].val = var_n_kwvar; /* _n_kwvar on <self:AVardeclExpr> */
-if (var_n_kwvar == NULL) {
+self->attrs[COLOR_nitc__parser_nodes__AType___n_kwnullable].val = var_n_kwnullable; /* _n_kwnullable on <self:AType> */
+if (var_n_kwnullable == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_kwvar,((val*)NULL)) on <var_n_kwvar:nullable TKwvar> */
+{ /* Inline kernel#Object#!= (var_n_kwnullable,((val*)NULL)) on <var_n_kwnullable:nullable TKwnullable> */
 var_other = ((val*)NULL);
 {
-var4 = ((short int(*)(val* self, val* p0))(var_n_kwvar->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_kwvar, var_other); /* == on <var_n_kwvar:nullable TKwvar(TKwvar)>*/
+var4 = ((short int(*)(val* self, val* p0))(var_n_kwnullable->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_kwnullable, var_other); /* == on <var_n_kwnullable:nullable TKwnullable(TKwnullable)>*/
 }
 var5 = !var4;
 var2 = var5;
@@ -6712,45 +6041,45 @@ var = var2;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwvar,self) on <var_n_kwvar:nullable TKwvar(TKwvar)> */
-var_n_kwvar->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwvar:nullable TKwvar(TKwvar)> */
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwnullable,self) on <var_n_kwnullable:nullable TKwnullable(TKwnullable)> */
+var_n_kwnullable->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwnullable:nullable TKwnullable(TKwnullable)> */
 RET_LABEL6:(void)0;
 }
 }
 } else {
 }
-if (unlikely(var_n_id == NULL)) {
+if (unlikely(var_n_qid == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2532);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2456);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_id].val = var_n_id; /* _n_id on <self:AVardeclExpr> */
-if (var_n_id == NULL) {
+self->attrs[COLOR_nitc__parser_nodes__AType___n_qid].val = var_n_qid; /* _n_qid on <self:AType> */
+if (var_n_qid == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2533);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2457);
 fatal_exit(1);
 } else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId> */
-if (unlikely(var_n_id == NULL)) {
+{ /* Inline parser_nodes#ANode#parent= (var_n_qid,self) on <var_n_qid:nullable AQclassid> */
+if (unlikely(var_n_qid == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_id->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
+var_n_qid->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_qid:nullable AQclassid> */
 RET_LABEL7:(void)0;
 }
 }
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_type].val = var_n_type; /* _n_type on <self:AVardeclExpr> */
-if (var_n_type == NULL) {
+self->attrs[COLOR_nitc__parser_nodes__AType___n_obra].val = var_n_obra; /* _n_obra on <self:AType> */
+if (var_n_obra == NULL) {
 var8 = 0; /* is null */
 } else {
 var8 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_type,((val*)NULL)) on <var_n_type:nullable AType> */
+{ /* Inline kernel#Object#!= (var_n_obra,((val*)NULL)) on <var_n_obra:nullable TObra> */
 var_other = ((val*)NULL);
 {
-var11 = ((short int(*)(val* self, val* p0))(var_n_type->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_type, var_other); /* == on <var_n_type:nullable AType(AType)>*/
+var11 = ((short int(*)(val* self, val* p0))(var_n_obra->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_obra, var_other); /* == on <var_n_obra:nullable TObra(TObra)>*/
 }
 var12 = !var11;
 var9 = var12;
@@ -6761,104 +6090,91 @@ var8 = var9;
 }
 if (var8){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_type,self) on <var_n_type:nullable AType(AType)> */
-var_n_type->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_type:nullable AType(AType)> */
+{ /* Inline parser_nodes#ANode#parent= (var_n_obra,self) on <var_n_obra:nullable TObra(TObra)> */
+var_n_obra->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_obra:nullable TObra(TObra)> */
 RET_LABEL13:(void)0;
 }
 }
 } else {
 }
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_assign].val = var_n_assign; /* _n_assign on <self:AVardeclExpr> */
-if (var_n_assign == NULL) {
-var14 = 0; /* is null */
-} else {
-var14 = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_assign,((val*)NULL)) on <var_n_assign:nullable TAssign> */
-var_other = ((val*)NULL);
 {
-var17 = ((short int(*)(val* self, val* p0))(var_n_assign->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_assign, var_other); /* == on <var_n_assign:nullable TAssign(TAssign)>*/
+{ /* Inline parser_nodes#AType#n_types (self) on <self:AType> */
+var16 = self->attrs[COLOR_nitc__parser_nodes__AType___n_types].val; /* _n_types on <self:AType> */
+if (unlikely(var16 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_types");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1715);
+fatal_exit(1);
 }
-var18 = !var17;
-var15 = var18;
-goto RET_LABEL16;
-RET_LABEL16:(void)0;
+var14 = var16;
+RET_LABEL15:(void)0;
 }
-var14 = var15;
 }
-if (var14){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_assign,self) on <var_n_assign:nullable TAssign(TAssign)> */
-var_n_assign->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_assign:nullable TAssign(TAssign)> */
-RET_LABEL19:(void)0;
-}
-}
-} else {
+nitc___nitc__ANodes___unsafe_add_all(var14, var_n_types); /* Direct call parser_nodes#ANodes#unsafe_add_all on <var14:ANodes[AType]>*/
 }
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_expr].val = var_n_expr; /* _n_expr on <self:AVardeclExpr> */
-if (var_n_expr == NULL) {
-var20 = 0; /* is null */
+self->attrs[COLOR_nitc__parser_nodes__AType___n_cbra].val = var_n_cbra; /* _n_cbra on <self:AType> */
+if (var_n_cbra == NULL) {
+var17 = 0; /* is null */
 } else {
-var20 = 1; /* arg is null and recv is not */
+var17 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_expr,((val*)NULL)) on <var_n_expr:nullable AExpr> */
+{ /* Inline kernel#Object#!= (var_n_cbra,((val*)NULL)) on <var_n_cbra:nullable TCbra> */
 var_other = ((val*)NULL);
 {
-var23 = ((short int(*)(val* self, val* p0))(var_n_expr->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_expr, var_other); /* == on <var_n_expr:nullable AExpr(AExpr)>*/
+var20 = ((short int(*)(val* self, val* p0))(var_n_cbra->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_cbra, var_other); /* == on <var_n_cbra:nullable TCbra(TCbra)>*/
 }
-var24 = !var23;
-var21 = var24;
-goto RET_LABEL22;
-RET_LABEL22:(void)0;
+var21 = !var20;
+var18 = var21;
+goto RET_LABEL19;
+RET_LABEL19:(void)0;
 }
-var20 = var21;
+var17 = var18;
 }
-if (var20){
+if (var17){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_expr,self) on <var_n_expr:nullable AExpr(AExpr)> */
-var_n_expr->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_expr:nullable AExpr(AExpr)> */
-RET_LABEL25:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_cbra,self) on <var_n_cbra:nullable TCbra(TCbra)> */
+var_n_cbra->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_cbra:nullable TCbra(TCbra)> */
+RET_LABEL22:(void)0;
 }
 }
 } else {
 }
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_n_annotations; /* _n_annotations on <self:AVardeclExpr> */
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_n_annotations; /* _n_annotations on <self:AType> */
 if (var_n_annotations == NULL) {
-var26 = 0; /* is null */
+var23 = 0; /* is null */
 } else {
-var26 = 1; /* arg is null and recv is not */
+var23 = 1; /* arg is null and recv is not */
 }
 if (0) {
 { /* Inline kernel#Object#!= (var_n_annotations,((val*)NULL)) on <var_n_annotations:nullable AAnnotations> */
 var_other = ((val*)NULL);
 {
-var29 = ((short int(*)(val* self, val* p0))(var_n_annotations->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_annotations, var_other); /* == on <var_n_annotations:nullable AAnnotations(AAnnotations)>*/
+var26 = ((short int(*)(val* self, val* p0))(var_n_annotations->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_annotations, var_other); /* == on <var_n_annotations:nullable AAnnotations(AAnnotations)>*/
 }
-var30 = !var29;
-var27 = var30;
-goto RET_LABEL28;
-RET_LABEL28:(void)0;
+var27 = !var26;
+var24 = var27;
+goto RET_LABEL25;
+RET_LABEL25:(void)0;
 }
-var26 = var27;
+var23 = var24;
 }
-if (var26){
+if (var23){
 {
 { /* Inline parser_nodes#ANode#parent= (var_n_annotations,self) on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
-var_n_annotations->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
-RET_LABEL31:(void)0;
+var_n_annotations->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
+RET_LABEL28:(void)0;
 }
 }
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AVardeclExpr#replace_child for (self: AVardeclExpr, ANode, nullable ANode) */
-void nit__parser_prod___AVardeclExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#AType#replace_child for (self: AType, ANode, nullable ANode) */
+void nitc__parser_prod___AType___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : nullable TKwvar */;
+val* var /* : nullable TKwnullable */;
 short int var1 /* : Bool */;
 short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
@@ -6868,7 +6184,7 @@ short int var7 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-val* var8 /* : TId */;
+val* var8 /* : AQclassid */;
 short int var9 /* : Bool */;
 short int var11 /* : Bool */;
 short int var13 /* : Bool */;
@@ -6876,7 +6192,7 @@ short int var14 /* : Bool */;
 int cltype15;
 int idtype16;
 const char* var_class_name17;
-val* var18 /* : nullable AType */;
+val* var18 /* : nullable TObra */;
 short int var19 /* : Bool */;
 short int var20 /* : Bool */;
 short int var22 /* : Bool */;
@@ -6885,43 +6201,37 @@ short int var25 /* : Bool */;
 int cltype26;
 int idtype27;
 const char* var_class_name28;
-val* var29 /* : nullable TAssign */;
-short int var30 /* : Bool */;
-short int var31 /* : Bool */;
-short int var33 /* : Bool */;
+val* var29 /* : ANodes[AType] */;
+val* var31 /* : ANodes[AType] */;
+short int var32 /* : Bool */;
+val* var33 /* : nullable TCbra */;
+short int var34 /* : Bool */;
 short int var35 /* : Bool */;
-short int var36 /* : Bool */;
-int cltype37;
-int idtype38;
-const char* var_class_name39;
-val* var40 /* : nullable AExpr */;
-short int var41 /* : Bool */;
-short int var42 /* : Bool */;
-short int var44 /* : Bool */;
-short int var46 /* : Bool */;
-short int var47 /* : Bool */;
-int cltype48;
-int idtype49;
-const char* var_class_name50;
-val* var51 /* : nullable AAnnotations */;
-short int var52 /* : Bool */;
-short int var53 /* : Bool */;
-short int var55 /* : Bool */;
-short int var57 /* : Bool */;
-short int var58 /* : Bool */;
-int cltype59;
-int idtype60;
-const char* var_class_name61;
+short int var37 /* : Bool */;
+short int var39 /* : Bool */;
+short int var40 /* : Bool */;
+int cltype41;
+int idtype42;
+const char* var_class_name43;
+val* var44 /* : nullable AAnnotations */;
+short int var45 /* : Bool */;
+short int var46 /* : Bool */;
+short int var48 /* : Bool */;
+short int var50 /* : Bool */;
+short int var51 /* : Bool */;
+int cltype52;
+int idtype53;
+const char* var_class_name54;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_kwvar].val; /* _n_kwvar on <self:AVardeclExpr> */
+var = self->attrs[COLOR_nitc__parser_nodes__AType___n_kwnullable].val; /* _n_kwnullable on <self:AType> */
 if (var == NULL) {
 var1 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TKwvar> */
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TKwnullable> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TKwvar(TKwvar)> */
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TKwnullable(TKwnullable)> */
 var6 = var == var_other;
 var4 = var6;
 goto RET_LABEL5;
@@ -6935,9 +6245,9 @@ RET_LABEL3:(void)0;
 var1 = var2;
 }
 if (var1){
-/* <var_new_child:nullable ANode> isa nullable TKwvar */
-cltype = type_nullable__nit__TKwvar.color;
-idtype = type_nullable__nit__TKwvar.id;
+/* <var_new_child:nullable ANode> isa nullable TKwnullable */
+cltype = type_nullable__nitc__TKwnullable.color;
+idtype = type_nullable__nitc__TKwnullable.id;
 if(var_new_child == NULL) {
 var7 = 1;
 } else {
@@ -6949,27 +6259,27 @@ var7 = var_new_child->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var7)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwvar", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2547);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwnullable", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2470);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AVardeclExpr___n_kwvar_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_kwvar= on <self:AVardeclExpr>*/
+nitc__parser_prod___AType___n_kwnullable_61d(self, var_new_child); /* Direct call parser_prod#AType#n_kwnullable= on <self:AType>*/
 }
 goto RET_LABEL;
 } else {
 }
-var8 = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_id].val; /* _n_id on <self:AVardeclExpr> */
+var8 = self->attrs[COLOR_nitc__parser_nodes__AType___n_qid].val; /* _n_qid on <self:AType> */
 if (unlikely(var8 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2550);
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_qid");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2473);
 fatal_exit(1);
 }
 {
-{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:TId> */
+{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:AQclassid> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:TId> */
+{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:AQclassid> */
 var13 = var8 == var_other;
 var11 = var13;
 goto RET_LABEL12;
@@ -6982,9 +6292,9 @@ RET_LABEL10:(void)0;
 }
 }
 if (var9){
-/* <var_new_child:nullable ANode> isa TId */
-cltype15 = type_nit__TId.color;
-idtype16 = type_nit__TId.id;
+/* <var_new_child:nullable ANode> isa AQclassid */
+cltype15 = type_nitc__AQclassid.color;
+idtype16 = type_nitc__AQclassid.id;
 if(var_new_child == NULL) {
 var14 = 0;
 } else {
@@ -6996,24 +6306,24 @@ var14 = var_new_child->type->type_table[cltype15] == idtype16;
 }
 if (unlikely(!var14)) {
 var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TId", var_class_name17);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2551);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "AQclassid", var_class_name17);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2474);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AVardeclExpr___n_id_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_id= on <self:AVardeclExpr>*/
+nitc__parser_prod___AType___n_qid_61d(self, var_new_child); /* Direct call parser_prod#AType#n_qid= on <self:AType>*/
 }
 goto RET_LABEL;
 } else {
 }
-var18 = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_type].val; /* _n_type on <self:AVardeclExpr> */
+var18 = self->attrs[COLOR_nitc__parser_nodes__AType___n_obra].val; /* _n_obra on <self:AType> */
 if (var18 == NULL) {
 var19 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var18,var_old_child) on <var18:nullable AType> */
+{ /* Inline kernel#Object#== (var18,var_old_child) on <var18:nullable TObra> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var18,var_other) on <var18:nullable AType(AType)> */
+{ /* Inline kernel#Object#is_same_instance (var18,var_other) on <var18:nullable TObra(TObra)> */
 var24 = var18 == var_other;
 var22 = var24;
 goto RET_LABEL23;
@@ -7027,9 +6337,9 @@ RET_LABEL21:(void)0;
 var19 = var20;
 }
 if (var19){
-/* <var_new_child:nullable ANode> isa nullable AType */
-cltype26 = type_nullable__nit__AType.color;
-idtype27 = type_nullable__nit__AType.id;
+/* <var_new_child:nullable ANode> isa nullable TObra */
+cltype26 = type_nullable__nitc__TObra.color;
+idtype27 = type_nullable__nitc__TObra.id;
 if(var_new_child == NULL) {
 var25 = 1;
 } else {
@@ -7041,173 +6351,147 @@ var25 = var_new_child->type->type_table[cltype26] == idtype27;
 }
 if (unlikely(!var25)) {
 var_class_name28 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AType", var_class_name28);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2555);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TObra", var_class_name28);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2478);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AVardeclExpr___n_type_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_type= on <self:AVardeclExpr>*/
+nitc__parser_prod___AType___n_obra_61d(self, var_new_child); /* Direct call parser_prod#AType#n_obra= on <self:AType>*/
 }
 goto RET_LABEL;
 } else {
 }
-var29 = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_assign].val; /* _n_assign on <self:AVardeclExpr> */
-if (var29 == NULL) {
-var30 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var29,var_old_child) on <var29:nullable TAssign> */
-var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var29,var_other) on <var29:nullable TAssign(TAssign)> */
-var35 = var29 == var_other;
-var33 = var35;
-goto RET_LABEL34;
-RET_LABEL34:(void)0;
-}
-}
-var31 = var33;
-goto RET_LABEL32;
-RET_LABEL32:(void)0;
-}
-var30 = var31;
-}
-if (var30){
-/* <var_new_child:nullable ANode> isa nullable TAssign */
-cltype37 = type_nullable__nit__TAssign.color;
-idtype38 = type_nullable__nit__TAssign.id;
-if(var_new_child == NULL) {
-var36 = 1;
-} else {
-if(cltype37 >= var_new_child->type->table_size) {
-var36 = 0;
-} else {
-var36 = var_new_child->type->type_table[cltype37] == idtype38;
+{ /* Inline parser_nodes#AType#n_types (self) on <self:AType> */
+var31 = self->attrs[COLOR_nitc__parser_nodes__AType___n_types].val; /* _n_types on <self:AType> */
+if (unlikely(var31 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_types");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1715);
+fatal_exit(1);
 }
+var29 = var31;
+RET_LABEL30:(void)0;
 }
-if (unlikely(!var36)) {
-var_class_name39 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TAssign", var_class_name39);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2559);
-fatal_exit(1);
 }
 {
-nit__parser_prod___AVardeclExpr___n_assign_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_assign= on <self:AVardeclExpr>*/
+var32 = nitc___nitc__ANodes___replace_child(var29, var_old_child, var_new_child);
 }
+if (var32){
 goto RET_LABEL;
 } else {
 }
-var40 = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_expr].val; /* _n_expr on <self:AVardeclExpr> */
-if (var40 == NULL) {
-var41 = 0; /* <var_old_child:ANode> cannot be null */
+var33 = self->attrs[COLOR_nitc__parser_nodes__AType___n_cbra].val; /* _n_cbra on <self:AType> */
+if (var33 == NULL) {
+var34 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var40,var_old_child) on <var40:nullable AExpr> */
+{ /* Inline kernel#Object#== (var33,var_old_child) on <var33:nullable TCbra> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var40,var_other) on <var40:nullable AExpr(AExpr)> */
-var46 = var40 == var_other;
-var44 = var46;
-goto RET_LABEL45;
-RET_LABEL45:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var33,var_other) on <var33:nullable TCbra(TCbra)> */
+var39 = var33 == var_other;
+var37 = var39;
+goto RET_LABEL38;
+RET_LABEL38:(void)0;
 }
 }
-var42 = var44;
-goto RET_LABEL43;
-RET_LABEL43:(void)0;
+var35 = var37;
+goto RET_LABEL36;
+RET_LABEL36:(void)0;
 }
-var41 = var42;
+var34 = var35;
 }
-if (var41){
-/* <var_new_child:nullable ANode> isa nullable AExpr */
-cltype48 = type_nullable__nit__AExpr.color;
-idtype49 = type_nullable__nit__AExpr.id;
+if (var34){
+/* <var_new_child:nullable ANode> isa nullable TCbra */
+cltype41 = type_nullable__nitc__TCbra.color;
+idtype42 = type_nullable__nitc__TCbra.id;
 if(var_new_child == NULL) {
-var47 = 1;
+var40 = 1;
 } else {
-if(cltype48 >= var_new_child->type->table_size) {
-var47 = 0;
+if(cltype41 >= var_new_child->type->table_size) {
+var40 = 0;
 } else {
-var47 = var_new_child->type->type_table[cltype48] == idtype49;
+var40 = var_new_child->type->type_table[cltype41] == idtype42;
 }
 }
-if (unlikely(!var47)) {
-var_class_name50 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name50);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2563);
+if (unlikely(!var40)) {
+var_class_name43 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TCbra", var_class_name43);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2483);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AVardeclExpr___n_expr_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_expr= on <self:AVardeclExpr>*/
+nitc__parser_prod___AType___n_cbra_61d(self, var_new_child); /* Direct call parser_prod#AType#n_cbra= on <self:AType>*/
 }
 goto RET_LABEL;
 } else {
 }
-var51 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AVardeclExpr> */
-if (var51 == NULL) {
-var52 = 0; /* <var_old_child:ANode> cannot be null */
+var44 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AType> */
+if (var44 == NULL) {
+var45 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var51,var_old_child) on <var51:nullable AAnnotations> */
+{ /* Inline kernel#Object#== (var44,var_old_child) on <var44:nullable AAnnotations> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var51,var_other) on <var51:nullable AAnnotations(AAnnotations)> */
-var57 = var51 == var_other;
-var55 = var57;
-goto RET_LABEL56;
-RET_LABEL56:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var44,var_other) on <var44:nullable AAnnotations(AAnnotations)> */
+var50 = var44 == var_other;
+var48 = var50;
+goto RET_LABEL49;
+RET_LABEL49:(void)0;
 }
 }
-var53 = var55;
-goto RET_LABEL54;
-RET_LABEL54:(void)0;
+var46 = var48;
+goto RET_LABEL47;
+RET_LABEL47:(void)0;
 }
-var52 = var53;
+var45 = var46;
 }
-if (var52){
+if (var45){
 /* <var_new_child:nullable ANode> isa nullable AAnnotations */
-cltype59 = type_nullable__nit__AAnnotations.color;
-idtype60 = type_nullable__nit__AAnnotations.id;
+cltype52 = type_nullable__nitc__AAnnotations.color;
+idtype53 = type_nullable__nitc__AAnnotations.id;
 if(var_new_child == NULL) {
-var58 = 1;
+var51 = 1;
 } else {
-if(cltype59 >= var_new_child->type->table_size) {
-var58 = 0;
+if(cltype52 >= var_new_child->type->table_size) {
+var51 = 0;
 } else {
-var58 = var_new_child->type->type_table[cltype59] == idtype60;
+var51 = var_new_child->type->type_table[cltype52] == idtype53;
 }
 }
-if (unlikely(!var58)) {
-var_class_name61 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AAnnotations", var_class_name61);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2567);
+if (unlikely(!var51)) {
+var_class_name54 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AAnnotations", var_class_name54);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2487);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AVardeclExpr___nit__parser_nodes__Prod__n_annotations_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_annotations= on <self:AVardeclExpr>*/
+nitc__parser_prod___AType___nitc__parser_nodes__Prod__n_annotations_61d(self, var_new_child); /* Direct call parser_prod#AType#n_annotations= on <self:AType>*/
 }
 goto RET_LABEL;
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AVardeclExpr#n_kwvar= for (self: AVardeclExpr, nullable TKwvar) */
-void nit__parser_prod___AVardeclExpr___n_kwvar_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TKwvar */;
+/* method parser_prod#AType#n_kwnullable= for (self: AType, nullable TKwnullable) */
+void nitc__parser_prod___AType___n_kwnullable_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TKwnullable */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_kwvar].val = var_node; /* _n_kwvar on <self:AVardeclExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AType___n_kwnullable].val = var_node; /* _n_kwnullable on <self:AType> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwvar> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwnullable> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwvar(TKwvar)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwnullable(TKwnullable)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -7218,8 +6502,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwvar(TKwvar)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwvar(TKwvar)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwnullable(TKwnullable)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwnullable(TKwnullable)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -7227,78 +6511,39 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AVardeclExpr#n_id= for (self: AVardeclExpr, TId) */
-void nit__parser_prod___AVardeclExpr___n_id_61d(val* self, val* p0) {
-val* var_node /* var node: TId */;
+/* method parser_prod#AType#n_qid= for (self: AType, AQclassid) */
+void nitc__parser_prod___AType___n_qid_61d(val* self, val* p0) {
+val* var_node /* var node: AQclassid */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_id].val = var_node; /* _n_id on <self:AVardeclExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AType___n_qid].val = var_node; /* _n_qid on <self:AType> */
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TId> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:AQclassid> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:AQclassid> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
-/* method parser_prod#AVardeclExpr#n_type= for (self: AVardeclExpr, nullable AType) */
-void nit__parser_prod___AVardeclExpr___n_type_61d(val* self, val* p0) {
-val* var_node /* var node: nullable AType */;
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var4 /* : Bool */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_type].val = var_node; /* _n_type on <self:AVardeclExpr> */
-if (var_node == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AType> */
-var_other = ((val*)NULL);
-{
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AType(AType)>*/
-}
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-var = var1;
-}
-if (var){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AType(AType)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AType(AType)> */
-RET_LABEL5:(void)0;
-}
-}
-} else {
-}
-RET_LABEL:;
-}
-/* method parser_prod#AVardeclExpr#n_assign= for (self: AVardeclExpr, nullable TAssign) */
-void nit__parser_prod___AVardeclExpr___n_assign_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TAssign */;
+/* method parser_prod#AType#n_obra= for (self: AType, nullable TObra) */
+void nitc__parser_prod___AType___n_obra_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TObra */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_assign].val = var_node; /* _n_assign on <self:AVardeclExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AType___n_obra].val = var_node; /* _n_obra on <self:AType> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TAssign> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TObra> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TAssign(TAssign)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TObra(TObra)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -7309,8 +6554,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TAssign(TAssign)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TAssign(TAssign)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TObra(TObra)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TObra(TObra)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -7318,26 +6563,26 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AVardeclExpr#n_expr= for (self: AVardeclExpr, nullable AExpr) */
-void nit__parser_prod___AVardeclExpr___n_expr_61d(val* self, val* p0) {
-val* var_node /* var node: nullable AExpr */;
+/* method parser_prod#AType#n_cbra= for (self: AType, nullable TCbra) */
+void nitc__parser_prod___AType___n_cbra_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TCbra */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_expr].val = var_node; /* _n_expr on <self:AVardeclExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AType___n_cbra].val = var_node; /* _n_cbra on <self:AType> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AExpr> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TCbra> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TCbra(TCbra)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -7348,8 +6593,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AExpr(AExpr)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TCbra(TCbra)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TCbra(TCbra)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -7357,8 +6602,8 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AVardeclExpr#n_annotations= for (self: AVardeclExpr, nullable AAnnotations) */
-void nit__parser_prod___AVardeclExpr___nit__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
+/* method parser_prod#AType#n_annotations= for (self: AType, nullable AAnnotations) */
+void nitc__parser_prod___AType___nitc__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
 val* var_node /* var node: nullable AAnnotations */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -7366,7 +6611,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:AVardeclExpr> */
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:AType> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -7376,7 +6621,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AAnnotations> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -7388,7 +6633,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AAnnotations(AAnnotations)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -7396,301 +6641,277 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AVardeclExpr#visit_all for (self: AVardeclExpr, Visitor) */
-void nit__parser_prod___AVardeclExpr___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+/* method parser_prod#AType#visit_all for (self: AType, Visitor) */
+void nitc__parser_prod___AType___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
-val* var /* : nullable TKwvar */;
-val* var1 /* : TId */;
-val* var2 /* : nullable AType */;
-val* var3 /* : nullable TAssign */;
-val* var4 /* : nullable AExpr */;
-val* var5 /* : nullable AAnnotations */;
+val* var /* : nullable TKwnullable */;
+val* var1 /* : AQclassid */;
+val* var2 /* : nullable TObra */;
+val* var3 /* : ANodes[AType] */;
+val* var5 /* : ANodes[AType] */;
+val* var6 /* : nullable TCbra */;
+val* var7 /* : nullable AAnnotations */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_kwvar].val; /* _n_kwvar on <self:AVardeclExpr> */
+var = self->attrs[COLOR_nitc__parser_nodes__AType___n_kwnullable].val; /* _n_kwnullable on <self:AType> */
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_id].val; /* _n_id on <self:AVardeclExpr> */
+var1 = self->attrs[COLOR_nitc__parser_nodes__AType___n_qid].val; /* _n_qid on <self:AType> */
 if (unlikely(var1 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2607);
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_qid");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2522);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var2 = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_type].val; /* _n_type on <self:AVardeclExpr> */
+var2 = self->attrs[COLOR_nitc__parser_nodes__AType___n_obra].val; /* _n_obra on <self:AType> */
 {
-nit___nit__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var3 = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_assign].val; /* _n_assign on <self:AVardeclExpr> */
 {
-nit___nit__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+{ /* Inline parser_nodes#AType#n_types (self) on <self:AType> */
+var5 = self->attrs[COLOR_nitc__parser_nodes__AType___n_types].val; /* _n_types on <self:AType> */
+if (unlikely(var5 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_types");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1715);
+fatal_exit(1);
+}
+var3 = var5;
+RET_LABEL4:(void)0;
+}
 }
-var4 = self->attrs[COLOR_nit__parser_nodes__AVardeclExpr___n_expr].val; /* _n_expr on <self:AVardeclExpr> */
 {
-nit___nit__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__ANodes___visit_all(var3, var_v); /* Direct call parser_nodes#ANodes#visit_all on <var3:ANodes[AType]>*/
 }
-var5 = self->attrs[COLOR_nit__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AVardeclExpr> */
+var6 = self->attrs[COLOR_nitc__parser_nodes__AType___n_cbra].val; /* _n_cbra on <self:AType> */
 {
-nit___nit__Visitor___enter_visit(var_v, var5); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var6); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-RET_LABEL:;
+var7 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AType> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var7); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-/* method parser_prod#AReturnExpr#init_areturnexpr for (self: AReturnExpr, nullable TKwreturn, nullable AExpr) */
-void nit__parser_prod___AReturnExpr___init_areturnexpr(val* self, val* p0, val* p1) {
-val* var_n_kwreturn /* var n_kwreturn: nullable TKwreturn */;
-val* var_n_expr /* var n_expr: nullable AExpr */;
+RET_LABEL:;
+}
+/* method parser_prod#ALabel#init_alabel for (self: ALabel, nullable TKwlabel, nullable TId) */
+void nitc__parser_prod___ALabel___init_alabel(val* self, val* p0, val* p1) {
+val* var_n_kwlabel /* var n_kwlabel: nullable TKwlabel */;
+val* var_n_id /* var n_id: nullable TId */;
 short int var /* : Bool */;
-short int var2 /* : Bool */;
+short int var3 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var4 /* : Bool */;
 short int var5 /* : Bool */;
-short int var7 /* : Bool */;
-short int var8 /* : Bool */;
-short int var10 /* : Bool */;
-short int var11 /* : Bool */;
+short int var6 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:AReturnExpr> */
+{ /* Inline kernel#Object#init (self) on <self:ALabel> */
 RET_LABEL1:(void)0;
 }
 }
-var_n_kwreturn = p0;
-var_n_expr = p1;
-self->attrs[COLOR_nit__parser_nodes__AReturnExpr___n_kwreturn].val = var_n_kwreturn; /* _n_kwreturn on <self:AReturnExpr> */
-if (var_n_kwreturn == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_kwreturn,((val*)NULL)) on <var_n_kwreturn:nullable TKwreturn> */
-var_other = ((val*)NULL);
-{
-var4 = ((short int(*)(val* self, val* p0))(var_n_kwreturn->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_kwreturn, var_other); /* == on <var_n_kwreturn:nullable TKwreturn(TKwreturn)>*/
-}
-var5 = !var4;
-var2 = var5;
-goto RET_LABEL3;
-RET_LABEL3:(void)0;
-}
-var = var2;
+var_n_kwlabel = p0;
+var_n_id = p1;
+if (unlikely(var_n_kwlabel == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Cast failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2535);
+fatal_exit(1);
 }
-if (var){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwreturn,self) on <var_n_kwreturn:nullable TKwreturn(TKwreturn)> */
-var_n_kwreturn->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwreturn:nullable TKwreturn(TKwreturn)> */
-RET_LABEL6:(void)0;
+self->attrs[COLOR_nitc__parser_nodes__ALabel___n_kwlabel].val = var_n_kwlabel; /* _n_kwlabel on <self:ALabel> */
+if (var_n_kwlabel == NULL) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2536);
+fatal_exit(1);
+} else {
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwlabel,self) on <var_n_kwlabel:nullable TKwlabel> */
+if (unlikely(var_n_kwlabel == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
+fatal_exit(1);
 }
+var_n_kwlabel->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwlabel:nullable TKwlabel> */
+RET_LABEL2:(void)0;
 }
-} else {
 }
-self->attrs[COLOR_nit__parser_nodes__AReturnExpr___n_expr].val = var_n_expr; /* _n_expr on <self:AReturnExpr> */
-if (var_n_expr == NULL) {
-var7 = 0; /* is null */
+self->attrs[COLOR_nitc__parser_nodes__ALabel___n_id].val = var_n_id; /* _n_id on <self:ALabel> */
+if (var_n_id == NULL) {
+var = 0; /* is null */
 } else {
-var7 = 1; /* arg is null and recv is not */
+var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_expr,((val*)NULL)) on <var_n_expr:nullable AExpr> */
+{ /* Inline kernel#Object#!= (var_n_id,((val*)NULL)) on <var_n_id:nullable TId> */
 var_other = ((val*)NULL);
 {
-var10 = ((short int(*)(val* self, val* p0))(var_n_expr->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_expr, var_other); /* == on <var_n_expr:nullable AExpr(AExpr)>*/
+var5 = ((short int(*)(val* self, val* p0))(var_n_id->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_id, var_other); /* == on <var_n_id:nullable TId(TId)>*/
 }
-var11 = !var10;
-var8 = var11;
-goto RET_LABEL9;
-RET_LABEL9:(void)0;
+var6 = !var5;
+var3 = var6;
+goto RET_LABEL4;
+RET_LABEL4:(void)0;
 }
-var7 = var8;
+var = var3;
 }
-if (var7){
+if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_expr,self) on <var_n_expr:nullable AExpr(AExpr)> */
-var_n_expr->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_expr:nullable AExpr(AExpr)> */
-RET_LABEL12:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId(TId)> */
+var_n_id->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId(TId)> */
+RET_LABEL7:(void)0;
 }
 }
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AReturnExpr#replace_child for (self: AReturnExpr, ANode, nullable ANode) */
-void nit__parser_prod___AReturnExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#ALabel#replace_child for (self: ALabel, ANode, nullable ANode) */
+void nitc__parser_prod___ALabel___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : nullable TKwreturn */;
+val* var /* : TKwlabel */;
 short int var1 /* : Bool */;
-short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var4 /* : Bool */;
+short int var3 /* : Bool */;
+short int var5 /* : Bool */;
 short int var6 /* : Bool */;
-short int var7 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-val* var8 /* : nullable AExpr */;
+val* var7 /* : nullable TId */;
+short int var8 /* : Bool */;
 short int var9 /* : Bool */;
-short int var10 /* : Bool */;
-short int var12 /* : Bool */;
+short int var11 /* : Bool */;
+short int var13 /* : Bool */;
 short int var14 /* : Bool */;
-short int var15 /* : Bool */;
-int cltype16;
-int idtype17;
-const char* var_class_name18;
+int cltype15;
+int idtype16;
+const char* var_class_name17;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AReturnExpr___n_kwreturn].val; /* _n_kwreturn on <self:AReturnExpr> */
-if (var == NULL) {
-var1 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TKwreturn> */
+var = self->attrs[COLOR_nitc__parser_nodes__ALabel___n_kwlabel].val; /* _n_kwlabel on <self:ALabel> */
+if (unlikely(var == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwlabel");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2543);
+fatal_exit(1);
+}
+{
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwlabel> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TKwreturn(TKwreturn)> */
-var6 = var == var_other;
-var4 = var6;
-goto RET_LABEL5;
-RET_LABEL5:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwlabel> */
+var5 = var == var_other;
+var3 = var5;
+goto RET_LABEL4;
+RET_LABEL4:(void)0;
 }
 }
-var2 = var4;
-goto RET_LABEL3;
-RET_LABEL3:(void)0;
+var1 = var3;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
 }
-var1 = var2;
 }
 if (var1){
-/* <var_new_child:nullable ANode> isa nullable TKwreturn */
-cltype = type_nullable__nit__TKwreturn.color;
-idtype = type_nullable__nit__TKwreturn.id;
+/* <var_new_child:nullable ANode> isa TKwlabel */
+cltype = type_nitc__TKwlabel.color;
+idtype = type_nitc__TKwlabel.id;
 if(var_new_child == NULL) {
-var7 = 1;
+var6 = 0;
 } else {
 if(cltype >= var_new_child->type->table_size) {
-var7 = 0;
+var6 = 0;
 } else {
-var7 = var_new_child->type->type_table[cltype] == idtype;
+var6 = var_new_child->type->type_table[cltype] == idtype;
 }
 }
-if (unlikely(!var7)) {
+if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwreturn", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2629);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwlabel", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2544);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AReturnExpr___n_kwreturn_61d(self, var_new_child); /* Direct call parser_prod#AReturnExpr#n_kwreturn= on <self:AReturnExpr>*/
+nitc__parser_prod___ALabel___n_kwlabel_61d(self, var_new_child); /* Direct call parser_prod#ALabel#n_kwlabel= on <self:ALabel>*/
 }
 goto RET_LABEL;
 } else {
 }
-var8 = self->attrs[COLOR_nit__parser_nodes__AReturnExpr___n_expr].val; /* _n_expr on <self:AReturnExpr> */
-if (var8 == NULL) {
-var9 = 0; /* <var_old_child:ANode> cannot be null */
+var7 = self->attrs[COLOR_nitc__parser_nodes__ALabel___n_id].val; /* _n_id on <self:ALabel> */
+if (var7 == NULL) {
+var8 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:nullable AExpr> */
+{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:nullable TId> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:nullable AExpr(AExpr)> */
-var14 = var8 == var_other;
-var12 = var14;
-goto RET_LABEL13;
-RET_LABEL13:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:nullable TId(TId)> */
+var13 = var7 == var_other;
+var11 = var13;
+goto RET_LABEL12;
+RET_LABEL12:(void)0;
 }
 }
-var10 = var12;
-goto RET_LABEL11;
-RET_LABEL11:(void)0;
+var9 = var11;
+goto RET_LABEL10;
+RET_LABEL10:(void)0;
 }
-var9 = var10;
+var8 = var9;
 }
-if (var9){
-/* <var_new_child:nullable ANode> isa nullable AExpr */
-cltype16 = type_nullable__nit__AExpr.color;
-idtype17 = type_nullable__nit__AExpr.id;
+if (var8){
+/* <var_new_child:nullable ANode> isa nullable TId */
+cltype15 = type_nullable__nitc__TId.color;
+idtype16 = type_nullable__nitc__TId.id;
 if(var_new_child == NULL) {
-var15 = 1;
+var14 = 1;
 } else {
-if(cltype16 >= var_new_child->type->table_size) {
-var15 = 0;
+if(cltype15 >= var_new_child->type->table_size) {
+var14 = 0;
 } else {
-var15 = var_new_child->type->type_table[cltype16] == idtype17;
+var14 = var_new_child->type->type_table[cltype15] == idtype16;
 }
 }
-if (unlikely(!var15)) {
-var_class_name18 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name18);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2633);
+if (unlikely(!var14)) {
+var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TId", var_class_name17);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2548);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AReturnExpr___n_expr_61d(self, var_new_child); /* Direct call parser_prod#AReturnExpr#n_expr= on <self:AReturnExpr>*/
+nitc__parser_prod___ALabel___n_id_61d(self, var_new_child); /* Direct call parser_prod#ALabel#n_id= on <self:ALabel>*/
 }
 goto RET_LABEL;
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AReturnExpr#n_kwreturn= for (self: AReturnExpr, nullable TKwreturn) */
-void nit__parser_prod___AReturnExpr___n_kwreturn_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TKwreturn */;
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var4 /* : Bool */;
+/* method parser_prod#ALabel#n_kwlabel= for (self: ALabel, TKwlabel) */
+void nitc__parser_prod___ALabel___n_kwlabel_61d(val* self, val* p0) {
+val* var_node /* var node: TKwlabel */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AReturnExpr___n_kwreturn].val = var_node; /* _n_kwreturn on <self:AReturnExpr> */
-if (var_node == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwreturn> */
-var_other = ((val*)NULL);
-{
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwreturn(TKwreturn)>*/
-}
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-var = var1;
-}
-if (var){
+self->attrs[COLOR_nitc__parser_nodes__ALabel___n_kwlabel].val = var_node; /* _n_kwlabel on <self:ALabel> */
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwreturn(TKwreturn)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwreturn(TKwreturn)> */
-RET_LABEL5:(void)0;
-}
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwlabel> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwlabel> */
+RET_LABEL1:(void)0;
 }
-} else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AReturnExpr#n_expr= for (self: AReturnExpr, nullable AExpr) */
-void nit__parser_prod___AReturnExpr___n_expr_61d(val* self, val* p0) {
-val* var_node /* var node: nullable AExpr */;
+/* method parser_prod#ALabel#n_id= for (self: ALabel, nullable TId) */
+void nitc__parser_prod___ALabel___n_id_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TId */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AReturnExpr___n_expr].val = var_node; /* _n_expr on <self:AReturnExpr> */
+self->attrs[COLOR_nitc__parser_nodes__ALabel___n_id].val = var_node; /* _n_id on <self:ALabel> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AExpr> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TId> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TId(TId)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -7701,8 +6922,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AExpr(AExpr)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TId(TId)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TId(TId)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -7710,240 +6931,195 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AReturnExpr#visit_all for (self: AReturnExpr, Visitor) */
-void nit__parser_prod___AReturnExpr___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+/* method parser_prod#ALabel#visit_all for (self: ALabel, Visitor) */
+void nitc__parser_prod___ALabel___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
-val* var /* : nullable TKwreturn */;
-val* var1 /* : nullable AExpr */;
+val* var /* : TKwlabel */;
+val* var1 /* : nullable TId */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AReturnExpr___n_kwreturn].val; /* _n_kwreturn on <self:AReturnExpr> */
+var = self->attrs[COLOR_nitc__parser_nodes__ALabel___n_kwlabel].val; /* _n_kwlabel on <self:ALabel> */
+if (unlikely(var == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwlabel");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2567);
+fatal_exit(1);
+}
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__AReturnExpr___n_expr].val; /* _n_expr on <self:AReturnExpr> */
+var1 = self->attrs[COLOR_nitc__parser_nodes__ALabel___n_id].val; /* _n_id on <self:ALabel> */
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#ABreakExpr#init_abreakexpr for (self: ABreakExpr, nullable TKwbreak, nullable ALabel) */
-void nit__parser_prod___ABreakExpr___init_abreakexpr(val* self, val* p0, val* p1) {
-val* var_n_kwbreak /* var n_kwbreak: nullable TKwbreak */;
-val* var_n_label /* var n_label: nullable ALabel */;
-short int var /* : Bool */;
-short int var3 /* : Bool */;
-val* var_other /* var other: nullable Object */;
+/* method parser_prod#ABlockExpr#init_ablockexpr for (self: ABlockExpr, Collection[Object], nullable TKwend) */
+void nitc__parser_prod___ABlockExpr___init_ablockexpr(val* self, val* p0, val* p1) {
+val* var_n_expr /* var n_expr: Collection[Object] */;
+val* var_n_kwend /* var n_kwend: nullable TKwend */;
+val* var /* : ANodes[AExpr] */;
+val* var3 /* : ANodes[AExpr] */;
+short int var4 /* : Bool */;
 short int var5 /* : Bool */;
-short int var6 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var7 /* : Bool */;
+short int var8 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:ABreakExpr> */
+{ /* Inline kernel#Object#init (self) on <self:ABlockExpr> */
 RET_LABEL1:(void)0;
 }
 }
-var_n_kwbreak = p0;
-var_n_label = p1;
-if (unlikely(var_n_kwbreak == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2662);
-fatal_exit(1);
-}
-self->attrs[COLOR_nit__parser_nodes__ABreakExpr___n_kwbreak].val = var_n_kwbreak; /* _n_kwbreak on <self:ABreakExpr> */
-if (var_n_kwbreak == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2663);
-fatal_exit(1);
-} else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwbreak,self) on <var_n_kwbreak:nullable TKwbreak> */
-if (unlikely(var_n_kwbreak == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+var_n_expr = p0;
+var_n_kwend = p1;
+{
+{ /* Inline parser_nodes#ABlockExpr#n_expr (self) on <self:ABlockExpr> */
+var3 = self->attrs[COLOR_nitc__parser_nodes__ABlockExpr___n_expr].val; /* _n_expr on <self:ABlockExpr> */
+if (unlikely(var3 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1744);
 fatal_exit(1);
 }
-var_n_kwbreak->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwbreak:nullable TKwbreak> */
+var = var3;
 RET_LABEL2:(void)0;
 }
 }
-self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val = var_n_label; /* _n_label on <self:ABreakExpr> */
-if (var_n_label == NULL) {
-var = 0; /* is null */
+{
+nitc___nitc__ANodes___unsafe_add_all(var, var_n_expr); /* Direct call parser_nodes#ANodes#unsafe_add_all on <var:ANodes[AExpr]>*/
+}
+self->attrs[COLOR_nitc__parser_nodes__ABlockExpr___n_kwend].val = var_n_kwend; /* _n_kwend on <self:ABlockExpr> */
+if (var_n_kwend == NULL) {
+var4 = 0; /* is null */
 } else {
-var = 1; /* arg is null and recv is not */
+var4 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_label,((val*)NULL)) on <var_n_label:nullable ALabel> */
+{ /* Inline kernel#Object#!= (var_n_kwend,((val*)NULL)) on <var_n_kwend:nullable TKwend> */
 var_other = ((val*)NULL);
 {
-var5 = ((short int(*)(val* self, val* p0))(var_n_label->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_label, var_other); /* == on <var_n_label:nullable ALabel(ALabel)>*/
+var7 = ((short int(*)(val* self, val* p0))(var_n_kwend->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_kwend, var_other); /* == on <var_n_kwend:nullable TKwend(TKwend)>*/
 }
-var6 = !var5;
-var3 = var6;
-goto RET_LABEL4;
-RET_LABEL4:(void)0;
+var8 = !var7;
+var5 = var8;
+goto RET_LABEL6;
+RET_LABEL6:(void)0;
 }
-var = var3;
+var4 = var5;
 }
-if (var){
+if (var4){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_label,self) on <var_n_label:nullable ALabel(ALabel)> */
-var_n_label->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_label:nullable ALabel(ALabel)> */
-RET_LABEL7:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwend,self) on <var_n_kwend:nullable TKwend(TKwend)> */
+var_n_kwend->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwend:nullable TKwend(TKwend)> */
+RET_LABEL9:(void)0;
 }
 }
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#ABreakExpr#replace_child for (self: ABreakExpr, ANode, nullable ANode) */
-void nit__parser_prod___ABreakExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#ABlockExpr#replace_child for (self: ABlockExpr, ANode, nullable ANode) */
+void nitc__parser_prod___ABlockExpr___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : TKwbreak */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
+val* var /* : ANodes[AExpr] */;
+val* var2 /* : ANodes[AExpr] */;
 short int var3 /* : Bool */;
+val* var4 /* : nullable TKwend */;
 short int var5 /* : Bool */;
 short int var6 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var8 /* : Bool */;
+short int var10 /* : Bool */;
+short int var11 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-val* var7 /* : nullable ALabel */;
-short int var8 /* : Bool */;
-short int var9 /* : Bool */;
-short int var11 /* : Bool */;
-short int var13 /* : Bool */;
-short int var14 /* : Bool */;
-int cltype15;
-int idtype16;
-const char* var_class_name17;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__ABreakExpr___n_kwbreak].val; /* _n_kwbreak on <self:ABreakExpr> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwbreak");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2670);
-fatal_exit(1);
-}
 {
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwbreak> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwbreak> */
-var5 = var == var_other;
-var3 = var5;
-goto RET_LABEL4;
-RET_LABEL4:(void)0;
-}
-}
-var1 = var3;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-}
-if (var1){
-/* <var_new_child:nullable ANode> isa TKwbreak */
-cltype = type_nit__TKwbreak.color;
-idtype = type_nit__TKwbreak.id;
-if(var_new_child == NULL) {
-var6 = 0;
-} else {
-if(cltype >= var_new_child->type->table_size) {
-var6 = 0;
-} else {
-var6 = var_new_child->type->type_table[cltype] == idtype;
+{ /* Inline parser_nodes#ABlockExpr#n_expr (self) on <self:ABlockExpr> */
+var2 = self->attrs[COLOR_nitc__parser_nodes__ABlockExpr___n_expr].val; /* _n_expr on <self:ABlockExpr> */
+if (unlikely(var2 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1744);
+fatal_exit(1);
 }
+var = var2;
+RET_LABEL1:(void)0;
 }
-if (unlikely(!var6)) {
-var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwbreak", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2671);
-fatal_exit(1);
 }
 {
-nit__parser_prod___ABreakExpr___n_kwbreak_61d(self, var_new_child); /* Direct call parser_prod#ABreakExpr#n_kwbreak= on <self:ABreakExpr>*/
+var3 = nitc___nitc__ANodes___replace_child(var, var_old_child, var_new_child);
 }
+if (var3){
 goto RET_LABEL;
 } else {
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:ABreakExpr> */
-if (var7 == NULL) {
-var8 = 0; /* <var_old_child:ANode> cannot be null */
+var4 = self->attrs[COLOR_nitc__parser_nodes__ABlockExpr___n_kwend].val; /* _n_kwend on <self:ABlockExpr> */
+if (var4 == NULL) {
+var5 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:nullable ALabel> */
+{ /* Inline kernel#Object#== (var4,var_old_child) on <var4:nullable TKwend> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:nullable ALabel(ALabel)> */
-var13 = var7 == var_other;
-var11 = var13;
-goto RET_LABEL12;
-RET_LABEL12:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var4,var_other) on <var4:nullable TKwend(TKwend)> */
+var10 = var4 == var_other;
+var8 = var10;
+goto RET_LABEL9;
+RET_LABEL9:(void)0;
 }
 }
-var9 = var11;
-goto RET_LABEL10;
-RET_LABEL10:(void)0;
+var6 = var8;
+goto RET_LABEL7;
+RET_LABEL7:(void)0;
 }
-var8 = var9;
+var5 = var6;
 }
-if (var8){
-/* <var_new_child:nullable ANode> isa nullable ALabel */
-cltype15 = type_nullable__nit__ALabel.color;
-idtype16 = type_nullable__nit__ALabel.id;
+if (var5){
+/* <var_new_child:nullable ANode> isa nullable TKwend */
+cltype = type_nullable__nitc__TKwend.color;
+idtype = type_nullable__nitc__TKwend.id;
 if(var_new_child == NULL) {
-var14 = 1;
+var11 = 1;
 } else {
-if(cltype15 >= var_new_child->type->table_size) {
-var14 = 0;
+if(cltype >= var_new_child->type->table_size) {
+var11 = 0;
 } else {
-var14 = var_new_child->type->type_table[cltype15] == idtype16;
+var11 = var_new_child->type->type_table[cltype] == idtype;
 }
 }
-if (unlikely(!var14)) {
-var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable ALabel", var_class_name17);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2675);
+if (unlikely(!var11)) {
+var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwend", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2586);
 fatal_exit(1);
 }
 {
-nit__parser_prod___ABreakExpr___nit__parser_nodes__ALabelable__n_label_61d(self, var_new_child); /* Direct call parser_prod#ABreakExpr#n_label= on <self:ABreakExpr>*/
+nitc__parser_prod___ABlockExpr___n_kwend_61d(self, var_new_child); /* Direct call parser_prod#ABlockExpr#n_kwend= on <self:ABlockExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#ABreakExpr#n_kwbreak= for (self: ABreakExpr, TKwbreak) */
-void nit__parser_prod___ABreakExpr___n_kwbreak_61d(val* self, val* p0) {
-val* var_node /* var node: TKwbreak */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ABreakExpr___n_kwbreak].val = var_node; /* _n_kwbreak on <self:ABreakExpr> */
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwbreak> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwbreak> */
-RET_LABEL1:(void)0;
-}
-}
-RET_LABEL:;
-}
-/* method parser_prod#ABreakExpr#n_label= for (self: ABreakExpr, nullable ALabel) */
-void nit__parser_prod___ABreakExpr___nit__parser_nodes__ALabelable__n_label_61d(val* self, val* p0) {
-val* var_node /* var node: nullable ALabel */;
+/* method parser_prod#ABlockExpr#n_kwend= for (self: ABlockExpr, nullable TKwend) */
+void nitc__parser_prod___ABlockExpr___n_kwend_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TKwend */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val = var_node; /* _n_label on <self:ABreakExpr> */
+self->attrs[COLOR_nitc__parser_nodes__ABlockExpr___n_kwend].val = var_node; /* _n_kwend on <self:ABlockExpr> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable ALabel> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwend> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ALabel(ALabel)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwend(TKwend)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -7954,8 +7130,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable ALabel(ALabel)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ALabel(ALabel)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwend(TKwend)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwend(TKwend)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -7963,235 +7139,242 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#ABreakExpr#visit_all for (self: ABreakExpr, Visitor) */
-void nit__parser_prod___ABreakExpr___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+/* method parser_prod#ABlockExpr#visit_all for (self: ABlockExpr, Visitor) */
+void nitc__parser_prod___ABlockExpr___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
-val* var /* : TKwbreak */;
-val* var1 /* : nullable ALabel */;
+val* var /* : ANodes[AExpr] */;
+val* var2 /* : ANodes[AExpr] */;
+val* var3 /* : nullable TKwend */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__ABreakExpr___n_kwbreak].val; /* _n_kwbreak on <self:ABreakExpr> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwbreak");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2694);
+{
+{ /* Inline parser_nodes#ABlockExpr#n_expr (self) on <self:ABlockExpr> */
+var2 = self->attrs[COLOR_nitc__parser_nodes__ABlockExpr___n_expr].val; /* _n_expr on <self:ABlockExpr> */
+if (unlikely(var2 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 1744);
 fatal_exit(1);
 }
+var = var2;
+RET_LABEL1:(void)0;
+}
+}
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__ANodes___visit_all(var, var_v); /* Direct call parser_nodes#ANodes#visit_all on <var:ANodes[AExpr]>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:ABreakExpr> */
+var3 = self->attrs[COLOR_nitc__parser_nodes__ABlockExpr___n_kwend].val; /* _n_kwend on <self:ABlockExpr> */
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#AAbortExpr#init_aabortexpr for (self: AAbortExpr, nullable TKwabort) */
-void nit__parser_prod___AAbortExpr___init_aabortexpr(val* self, val* p0) {
-val* var_n_kwabort /* var n_kwabort: nullable TKwabort */;
+/* method parser_prod#AVardeclExpr#init_avardeclexpr for (self: AVardeclExpr, nullable TKwvar, nullable TId, nullable AType, nullable TAssign, nullable AExpr, nullable AAnnotations) */
+void nitc__parser_prod___AVardeclExpr___init_avardeclexpr(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5) {
+val* var_n_kwvar /* var n_kwvar: nullable TKwvar */;
+val* var_n_id /* var n_id: nullable TId */;
+val* var_n_type /* var n_type: nullable AType */;
+val* var_n_assign /* var n_assign: nullable TAssign */;
+val* var_n_expr /* var n_expr: nullable AExpr */;
+val* var_n_annotations /* var n_annotations: nullable AAnnotations */;
+short int var /* : Bool */;
+short int var2 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var4 /* : Bool */;
+short int var5 /* : Bool */;
+short int var8 /* : Bool */;
+short int var9 /* : Bool */;
+short int var11 /* : Bool */;
+short int var12 /* : Bool */;
+short int var14 /* : Bool */;
+short int var15 /* : Bool */;
+short int var17 /* : Bool */;
+short int var18 /* : Bool */;
+short int var20 /* : Bool */;
+short int var21 /* : Bool */;
+short int var23 /* : Bool */;
+short int var24 /* : Bool */;
+short int var26 /* : Bool */;
+short int var27 /* : Bool */;
+short int var29 /* : Bool */;
+short int var30 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:AAbortExpr> */
+{ /* Inline kernel#Object#init (self) on <self:AVardeclExpr> */
 RET_LABEL1:(void)0;
 }
 }
-var_n_kwabort = p0;
-if (unlikely(var_n_kwabort == NULL)) {
+var_n_kwvar = p0;
+var_n_id = p1;
+var_n_type = p2;
+var_n_assign = p3;
+var_n_expr = p4;
+var_n_annotations = p5;
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_kwvar].val = var_n_kwvar; /* _n_kwvar on <self:AVardeclExpr> */
+if (var_n_kwvar == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_kwvar,((val*)NULL)) on <var_n_kwvar:nullable TKwvar> */
+var_other = ((val*)NULL);
+{
+var4 = ((short int(*)(val* self, val* p0))(var_n_kwvar->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_kwvar, var_other); /* == on <var_n_kwvar:nullable TKwvar(TKwvar)>*/
+}
+var5 = !var4;
+var2 = var5;
+goto RET_LABEL3;
+RET_LABEL3:(void)0;
+}
+var = var2;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwvar,self) on <var_n_kwvar:nullable TKwvar(TKwvar)> */
+var_n_kwvar->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwvar:nullable TKwvar(TKwvar)> */
+RET_LABEL6:(void)0;
+}
+}
+} else {
+}
+if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2703);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2616);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AAbortExpr___n_kwabort].val = var_n_kwabort; /* _n_kwabort on <self:AAbortExpr> */
-if (var_n_kwabort == NULL) {
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_id].val = var_n_id; /* _n_id on <self:AVardeclExpr> */
+if (var_n_id == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2704);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2617);
 fatal_exit(1);
 } else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwabort,self) on <var_n_kwabort:nullable TKwabort> */
-if (unlikely(var_n_kwabort == NULL)) {
+{ /* Inline parser_nodes#ANode#parent= (var_n_id,self) on <var_n_id:nullable TId> */
+if (unlikely(var_n_id == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_kwabort->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwabort:nullable TKwabort> */
-RET_LABEL2:(void)0;
-}
+var_n_id->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_id:nullable TId> */
+RET_LABEL7:(void)0;
 }
-RET_LABEL:;
 }
-/* method parser_prod#AAbortExpr#replace_child for (self: AAbortExpr, ANode, nullable ANode) */
-void nit__parser_prod___AAbortExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
-val* var_old_child /* var old_child: ANode */;
-val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : TKwabort */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var5 /* : Bool */;
-short int var6 /* : Bool */;
-int cltype;
-int idtype;
-const char* var_class_name;
-var_old_child = p0;
-var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AAbortExpr___n_kwabort].val; /* _n_kwabort on <self:AAbortExpr> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwabort");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2709);
-fatal_exit(1);
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_type].val = var_n_type; /* _n_type on <self:AVardeclExpr> */
+if (var_n_type == NULL) {
+var8 = 0; /* is null */
+} else {
+var8 = 1; /* arg is null and recv is not */
 }
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_type,((val*)NULL)) on <var_n_type:nullable AType> */
+var_other = ((val*)NULL);
 {
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwabort> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwabort> */
-var5 = var == var_other;
-var3 = var5;
-goto RET_LABEL4;
-RET_LABEL4:(void)0;
-}
-}
-var1 = var3;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-}
-if (var1){
-/* <var_new_child:nullable ANode> isa TKwabort */
-cltype = type_nit__TKwabort.color;
-idtype = type_nit__TKwabort.id;
-if(var_new_child == NULL) {
-var6 = 0;
-} else {
-if(cltype >= var_new_child->type->table_size) {
-var6 = 0;
-} else {
-var6 = var_new_child->type->type_table[cltype] == idtype;
+var11 = ((short int(*)(val* self, val* p0))(var_n_type->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_type, var_other); /* == on <var_n_type:nullable AType(AType)>*/
 }
+var12 = !var11;
+var9 = var12;
+goto RET_LABEL10;
+RET_LABEL10:(void)0;
 }
-if (unlikely(!var6)) {
-var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwabort", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2710);
-fatal_exit(1);
+var8 = var9;
 }
+if (var8){
 {
-nit__parser_prod___AAbortExpr___n_kwabort_61d(self, var_new_child); /* Direct call parser_prod#AAbortExpr#n_kwabort= on <self:AAbortExpr>*/
+{ /* Inline parser_nodes#ANode#parent= (var_n_type,self) on <var_n_type:nullable AType(AType)> */
+var_n_type->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_type:nullable AType(AType)> */
+RET_LABEL13:(void)0;
+}
 }
-goto RET_LABEL;
 } else {
 }
-RET_LABEL:;
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_assign].val = var_n_assign; /* _n_assign on <self:AVardeclExpr> */
+if (var_n_assign == NULL) {
+var14 = 0; /* is null */
+} else {
+var14 = 1; /* arg is null and recv is not */
 }
-/* method parser_prod#AAbortExpr#n_kwabort= for (self: AAbortExpr, TKwabort) */
-void nit__parser_prod___AAbortExpr___n_kwabort_61d(val* self, val* p0) {
-val* var_node /* var node: TKwabort */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AAbortExpr___n_kwabort].val = var_node; /* _n_kwabort on <self:AAbortExpr> */
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_assign,((val*)NULL)) on <var_n_assign:nullable TAssign> */
+var_other = ((val*)NULL);
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwabort> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwabort> */
-RET_LABEL1:(void)0;
-}
+var17 = ((short int(*)(val* self, val* p0))(var_n_assign->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_assign, var_other); /* == on <var_n_assign:nullable TAssign(TAssign)>*/
 }
-RET_LABEL:;
+var18 = !var17;
+var15 = var18;
+goto RET_LABEL16;
+RET_LABEL16:(void)0;
 }
-/* method parser_prod#AAbortExpr#visit_all for (self: AAbortExpr, Visitor) */
-void nit__parser_prod___AAbortExpr___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
-val* var_v /* var v: Visitor */;
-val* var /* : TKwabort */;
-var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AAbortExpr___n_kwabort].val; /* _n_kwabort on <self:AAbortExpr> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwabort");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2724);
-fatal_exit(1);
+var14 = var15;
 }
+if (var14){
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-RET_LABEL:;
+{ /* Inline parser_nodes#ANode#parent= (var_n_assign,self) on <var_n_assign:nullable TAssign(TAssign)> */
+var_n_assign->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_assign:nullable TAssign(TAssign)> */
+RET_LABEL19:(void)0;
 }
-/* method parser_prod#AContinueExpr#init_acontinueexpr for (self: AContinueExpr, nullable TKwcontinue, nullable ALabel) */
-void nit__parser_prod___AContinueExpr___init_acontinueexpr(val* self, val* p0, val* p1) {
-val* var_n_kwcontinue /* var n_kwcontinue: nullable TKwcontinue */;
-val* var_n_label /* var n_label: nullable ALabel */;
-short int var /* : Bool */;
-short int var2 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var4 /* : Bool */;
-short int var5 /* : Bool */;
-short int var7 /* : Bool */;
-short int var8 /* : Bool */;
-short int var10 /* : Bool */;
-short int var11 /* : Bool */;
-{
-{ /* Inline kernel#Object#init (self) on <self:AContinueExpr> */
-RET_LABEL1:(void)0;
 }
+} else {
 }
-var_n_kwcontinue = p0;
-var_n_label = p1;
-self->attrs[COLOR_nit__parser_nodes__AContinueExpr___n_kwcontinue].val = var_n_kwcontinue; /* _n_kwcontinue on <self:AContinueExpr> */
-if (var_n_kwcontinue == NULL) {
-var = 0; /* is null */
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_expr].val = var_n_expr; /* _n_expr on <self:AVardeclExpr> */
+if (var_n_expr == NULL) {
+var20 = 0; /* is null */
 } else {
-var = 1; /* arg is null and recv is not */
+var20 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_kwcontinue,((val*)NULL)) on <var_n_kwcontinue:nullable TKwcontinue> */
+{ /* Inline kernel#Object#!= (var_n_expr,((val*)NULL)) on <var_n_expr:nullable AExpr> */
 var_other = ((val*)NULL);
 {
-var4 = ((short int(*)(val* self, val* p0))(var_n_kwcontinue->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_kwcontinue, var_other); /* == on <var_n_kwcontinue:nullable TKwcontinue(TKwcontinue)>*/
+var23 = ((short int(*)(val* self, val* p0))(var_n_expr->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_expr, var_other); /* == on <var_n_expr:nullable AExpr(AExpr)>*/
 }
-var5 = !var4;
-var2 = var5;
-goto RET_LABEL3;
-RET_LABEL3:(void)0;
+var24 = !var23;
+var21 = var24;
+goto RET_LABEL22;
+RET_LABEL22:(void)0;
 }
-var = var2;
+var20 = var21;
 }
-if (var){
+if (var20){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwcontinue,self) on <var_n_kwcontinue:nullable TKwcontinue(TKwcontinue)> */
-var_n_kwcontinue->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwcontinue:nullable TKwcontinue(TKwcontinue)> */
-RET_LABEL6:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_expr,self) on <var_n_expr:nullable AExpr(AExpr)> */
+var_n_expr->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_expr:nullable AExpr(AExpr)> */
+RET_LABEL25:(void)0;
 }
 }
 } else {
 }
-self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val = var_n_label; /* _n_label on <self:AContinueExpr> */
-if (var_n_label == NULL) {
-var7 = 0; /* is null */
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_n_annotations; /* _n_annotations on <self:AVardeclExpr> */
+if (var_n_annotations == NULL) {
+var26 = 0; /* is null */
 } else {
-var7 = 1; /* arg is null and recv is not */
+var26 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_label,((val*)NULL)) on <var_n_label:nullable ALabel> */
+{ /* Inline kernel#Object#!= (var_n_annotations,((val*)NULL)) on <var_n_annotations:nullable AAnnotations> */
 var_other = ((val*)NULL);
 {
-var10 = ((short int(*)(val* self, val* p0))(var_n_label->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_label, var_other); /* == on <var_n_label:nullable ALabel(ALabel)>*/
+var29 = ((short int(*)(val* self, val* p0))(var_n_annotations->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_annotations, var_other); /* == on <var_n_annotations:nullable AAnnotations(AAnnotations)>*/
 }
-var11 = !var10;
-var8 = var11;
-goto RET_LABEL9;
-RET_LABEL9:(void)0;
+var30 = !var29;
+var27 = var30;
+goto RET_LABEL28;
+RET_LABEL28:(void)0;
 }
-var7 = var8;
+var26 = var27;
 }
-if (var7){
+if (var26){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_label,self) on <var_n_label:nullable ALabel(ALabel)> */
-var_n_label->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_label:nullable ALabel(ALabel)> */
-RET_LABEL12:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_annotations,self) on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
+var_n_annotations->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_annotations:nullable AAnnotations(AAnnotations)> */
+RET_LABEL31:(void)0;
 }
 }
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AContinueExpr#replace_child for (self: AContinueExpr, ANode, nullable ANode) */
-void nit__parser_prod___AContinueExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#AVardeclExpr#replace_child for (self: AVardeclExpr, ANode, nullable ANode) */
+void nitc__parser_prod___AVardeclExpr___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : nullable TKwcontinue */;
+val* var /* : nullable TKwvar */;
 short int var1 /* : Bool */;
 short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
@@ -8201,25 +7384,60 @@ short int var7 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-val* var8 /* : nullable ALabel */;
+val* var8 /* : TId */;
 short int var9 /* : Bool */;
-short int var10 /* : Bool */;
-short int var12 /* : Bool */;
+short int var11 /* : Bool */;
+short int var13 /* : Bool */;
 short int var14 /* : Bool */;
-short int var15 /* : Bool */;
-int cltype16;
-int idtype17;
-const char* var_class_name18;
+int cltype15;
+int idtype16;
+const char* var_class_name17;
+val* var18 /* : nullable AType */;
+short int var19 /* : Bool */;
+short int var20 /* : Bool */;
+short int var22 /* : Bool */;
+short int var24 /* : Bool */;
+short int var25 /* : Bool */;
+int cltype26;
+int idtype27;
+const char* var_class_name28;
+val* var29 /* : nullable TAssign */;
+short int var30 /* : Bool */;
+short int var31 /* : Bool */;
+short int var33 /* : Bool */;
+short int var35 /* : Bool */;
+short int var36 /* : Bool */;
+int cltype37;
+int idtype38;
+const char* var_class_name39;
+val* var40 /* : nullable AExpr */;
+short int var41 /* : Bool */;
+short int var42 /* : Bool */;
+short int var44 /* : Bool */;
+short int var46 /* : Bool */;
+short int var47 /* : Bool */;
+int cltype48;
+int idtype49;
+const char* var_class_name50;
+val* var51 /* : nullable AAnnotations */;
+short int var52 /* : Bool */;
+short int var53 /* : Bool */;
+short int var55 /* : Bool */;
+short int var57 /* : Bool */;
+short int var58 /* : Bool */;
+int cltype59;
+int idtype60;
+const char* var_class_name61;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AContinueExpr___n_kwcontinue].val; /* _n_kwcontinue on <self:AContinueExpr> */
+var = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_kwvar].val; /* _n_kwvar on <self:AVardeclExpr> */
 if (var == NULL) {
 var1 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TKwcontinue> */
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TKwvar> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TKwcontinue(TKwcontinue)> */
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TKwvar(TKwvar)> */
 var6 = var == var_other;
 var4 = var6;
 goto RET_LABEL5;
@@ -8233,9 +7451,9 @@ RET_LABEL3:(void)0;
 var1 = var2;
 }
 if (var1){
-/* <var_new_child:nullable ANode> isa nullable TKwcontinue */
-cltype = type_nullable__nit__TKwcontinue.color;
-idtype = type_nullable__nit__TKwcontinue.id;
+/* <var_new_child:nullable ANode> isa nullable TKwvar */
+cltype = type_nullable__nitc__TKwvar.color;
+idtype = type_nullable__nitc__TKwvar.id;
 if(var_new_child == NULL) {
 var7 = 1;
 } else {
@@ -8247,83 +7465,265 @@ var7 = var_new_child->type->type_table[cltype] == idtype;
 }
 if (unlikely(!var7)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwcontinue", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2742);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwvar", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2631);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AContinueExpr___n_kwcontinue_61d(self, var_new_child); /* Direct call parser_prod#AContinueExpr#n_kwcontinue= on <self:AContinueExpr>*/
+nitc__parser_prod___AVardeclExpr___n_kwvar_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_kwvar= on <self:AVardeclExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var8 = self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:AContinueExpr> */
-if (var8 == NULL) {
-var9 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:nullable ALabel> */
+var8 = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_id].val; /* _n_id on <self:AVardeclExpr> */
+if (unlikely(var8 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2634);
+fatal_exit(1);
+}
+{
+{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:TId> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:nullable ALabel(ALabel)> */
-var14 = var8 == var_other;
-var12 = var14;
-goto RET_LABEL13;
-RET_LABEL13:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:TId> */
+var13 = var8 == var_other;
+var11 = var13;
+goto RET_LABEL12;
+RET_LABEL12:(void)0;
 }
 }
-var10 = var12;
-goto RET_LABEL11;
-RET_LABEL11:(void)0;
+var9 = var11;
+goto RET_LABEL10;
+RET_LABEL10:(void)0;
 }
-var9 = var10;
 }
 if (var9){
-/* <var_new_child:nullable ANode> isa nullable ALabel */
-cltype16 = type_nullable__nit__ALabel.color;
-idtype17 = type_nullable__nit__ALabel.id;
+/* <var_new_child:nullable ANode> isa TId */
+cltype15 = type_nitc__TId.color;
+idtype16 = type_nitc__TId.id;
 if(var_new_child == NULL) {
-var15 = 1;
+var14 = 0;
 } else {
-if(cltype16 >= var_new_child->type->table_size) {
-var15 = 0;
+if(cltype15 >= var_new_child->type->table_size) {
+var14 = 0;
 } else {
-var15 = var_new_child->type->type_table[cltype16] == idtype17;
+var14 = var_new_child->type->type_table[cltype15] == idtype16;
 }
 }
-if (unlikely(!var15)) {
-var_class_name18 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable ALabel", var_class_name18);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2746);
+if (unlikely(!var14)) {
+var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TId", var_class_name17);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2635);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AVardeclExpr___n_id_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_id= on <self:AVardeclExpr>*/
+}
+goto RET_LABEL;
+} else {
+}
+var18 = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_type].val; /* _n_type on <self:AVardeclExpr> */
+if (var18 == NULL) {
+var19 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var18,var_old_child) on <var18:nullable AType> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var18,var_other) on <var18:nullable AType(AType)> */
+var24 = var18 == var_other;
+var22 = var24;
+goto RET_LABEL23;
+RET_LABEL23:(void)0;
+}
+}
+var20 = var22;
+goto RET_LABEL21;
+RET_LABEL21:(void)0;
+}
+var19 = var20;
+}
+if (var19){
+/* <var_new_child:nullable ANode> isa nullable AType */
+cltype26 = type_nullable__nitc__AType.color;
+idtype27 = type_nullable__nitc__AType.id;
+if(var_new_child == NULL) {
+var25 = 1;
+} else {
+if(cltype26 >= var_new_child->type->table_size) {
+var25 = 0;
+} else {
+var25 = var_new_child->type->type_table[cltype26] == idtype27;
+}
+}
+if (unlikely(!var25)) {
+var_class_name28 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AType", var_class_name28);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2639);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AVardeclExpr___n_type_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_type= on <self:AVardeclExpr>*/
+}
+goto RET_LABEL;
+} else {
+}
+var29 = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_assign].val; /* _n_assign on <self:AVardeclExpr> */
+if (var29 == NULL) {
+var30 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var29,var_old_child) on <var29:nullable TAssign> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var29,var_other) on <var29:nullable TAssign(TAssign)> */
+var35 = var29 == var_other;
+var33 = var35;
+goto RET_LABEL34;
+RET_LABEL34:(void)0;
+}
+}
+var31 = var33;
+goto RET_LABEL32;
+RET_LABEL32:(void)0;
+}
+var30 = var31;
+}
+if (var30){
+/* <var_new_child:nullable ANode> isa nullable TAssign */
+cltype37 = type_nullable__nitc__TAssign.color;
+idtype38 = type_nullable__nitc__TAssign.id;
+if(var_new_child == NULL) {
+var36 = 1;
+} else {
+if(cltype37 >= var_new_child->type->table_size) {
+var36 = 0;
+} else {
+var36 = var_new_child->type->type_table[cltype37] == idtype38;
+}
+}
+if (unlikely(!var36)) {
+var_class_name39 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TAssign", var_class_name39);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2643);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AVardeclExpr___n_assign_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_assign= on <self:AVardeclExpr>*/
+}
+goto RET_LABEL;
+} else {
+}
+var40 = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_expr].val; /* _n_expr on <self:AVardeclExpr> */
+if (var40 == NULL) {
+var41 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var40,var_old_child) on <var40:nullable AExpr> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var40,var_other) on <var40:nullable AExpr(AExpr)> */
+var46 = var40 == var_other;
+var44 = var46;
+goto RET_LABEL45;
+RET_LABEL45:(void)0;
+}
+}
+var42 = var44;
+goto RET_LABEL43;
+RET_LABEL43:(void)0;
+}
+var41 = var42;
+}
+if (var41){
+/* <var_new_child:nullable ANode> isa nullable AExpr */
+cltype48 = type_nullable__nitc__AExpr.color;
+idtype49 = type_nullable__nitc__AExpr.id;
+if(var_new_child == NULL) {
+var47 = 1;
+} else {
+if(cltype48 >= var_new_child->type->table_size) {
+var47 = 0;
+} else {
+var47 = var_new_child->type->type_table[cltype48] == idtype49;
+}
+}
+if (unlikely(!var47)) {
+var_class_name50 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name50);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2647);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AContinueExpr___nit__parser_nodes__ALabelable__n_label_61d(self, var_new_child); /* Direct call parser_prod#AContinueExpr#n_label= on <self:AContinueExpr>*/
+nitc__parser_prod___AVardeclExpr___n_expr_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_expr= on <self:AVardeclExpr>*/
+}
+goto RET_LABEL;
+} else {
+}
+var51 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AVardeclExpr> */
+if (var51 == NULL) {
+var52 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var51,var_old_child) on <var51:nullable AAnnotations> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var51,var_other) on <var51:nullable AAnnotations(AAnnotations)> */
+var57 = var51 == var_other;
+var55 = var57;
+goto RET_LABEL56;
+RET_LABEL56:(void)0;
+}
+}
+var53 = var55;
+goto RET_LABEL54;
+RET_LABEL54:(void)0;
+}
+var52 = var53;
+}
+if (var52){
+/* <var_new_child:nullable ANode> isa nullable AAnnotations */
+cltype59 = type_nullable__nitc__AAnnotations.color;
+idtype60 = type_nullable__nitc__AAnnotations.id;
+if(var_new_child == NULL) {
+var58 = 1;
+} else {
+if(cltype59 >= var_new_child->type->table_size) {
+var58 = 0;
+} else {
+var58 = var_new_child->type->type_table[cltype59] == idtype60;
+}
+}
+if (unlikely(!var58)) {
+var_class_name61 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AAnnotations", var_class_name61);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2651);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AVardeclExpr___nitc__parser_nodes__Prod__n_annotations_61d(self, var_new_child); /* Direct call parser_prod#AVardeclExpr#n_annotations= on <self:AVardeclExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AContinueExpr#n_kwcontinue= for (self: AContinueExpr, nullable TKwcontinue) */
-void nit__parser_prod___AContinueExpr___n_kwcontinue_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TKwcontinue */;
+/* method parser_prod#AVardeclExpr#n_kwvar= for (self: AVardeclExpr, nullable TKwvar) */
+void nitc__parser_prod___AVardeclExpr___n_kwvar_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TKwvar */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AContinueExpr___n_kwcontinue].val = var_node; /* _n_kwcontinue on <self:AContinueExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_kwvar].val = var_node; /* _n_kwvar on <self:AVardeclExpr> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwcontinue> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwvar> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwcontinue(TKwcontinue)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwvar(TKwvar)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -8334,8 +7734,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwcontinue(TKwcontinue)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwcontinue(TKwcontinue)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwvar(TKwvar)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwvar(TKwvar)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -8343,26 +7743,39 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AContinueExpr#n_label= for (self: AContinueExpr, nullable ALabel) */
-void nit__parser_prod___AContinueExpr___nit__parser_nodes__ALabelable__n_label_61d(val* self, val* p0) {
-val* var_node /* var node: nullable ALabel */;
+/* method parser_prod#AVardeclExpr#n_id= for (self: AVardeclExpr, TId) */
+void nitc__parser_prod___AVardeclExpr___n_id_61d(val* self, val* p0) {
+val* var_node /* var node: TId */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_id].val = var_node; /* _n_id on <self:AVardeclExpr> */
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TId> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TId> */
+RET_LABEL1:(void)0;
+}
+}
+RET_LABEL:;
+}
+/* method parser_prod#AVardeclExpr#n_type= for (self: AVardeclExpr, nullable AType) */
+void nitc__parser_prod___AVardeclExpr___n_type_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AType */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val = var_node; /* _n_label on <self:AContinueExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_type].val = var_node; /* _n_type on <self:AVardeclExpr> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable ALabel> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AType> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ALabel(ALabel)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AType(AType)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -8373,8 +7786,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable ALabel(ALabel)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ALabel(ALabel)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AType(AType)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AType(AType)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -8382,310 +7795,47 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AContinueExpr#visit_all for (self: AContinueExpr, Visitor) */
-void nit__parser_prod___AContinueExpr___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
-val* var_v /* var v: Visitor */;
-val* var /* : nullable TKwcontinue */;
-val* var1 /* : nullable ALabel */;
-var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AContinueExpr___n_kwcontinue].val; /* _n_kwcontinue on <self:AContinueExpr> */
-{
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var1 = self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:AContinueExpr> */
-{
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-RET_LABEL:;
-}
-/* method parser_prod#ADoExpr#init_adoexpr for (self: ADoExpr, nullable TKwdo, nullable AExpr, nullable ALabel) */
-void nit__parser_prod___ADoExpr___init_adoexpr(val* self, val* p0, val* p1, val* p2) {
-val* var_n_kwdo /* var n_kwdo: nullable TKwdo */;
-val* var_n_block /* var n_block: nullable AExpr */;
-val* var_n_label /* var n_label: nullable ALabel */;
+/* method parser_prod#AVardeclExpr#n_assign= for (self: AVardeclExpr, nullable TAssign) */
+void nitc__parser_prod___AVardeclExpr___n_assign_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TAssign */;
 short int var /* : Bool */;
-short int var3 /* : Bool */;
+short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var5 /* : Bool */;
-short int var6 /* : Bool */;
-short int var8 /* : Bool */;
-short int var9 /* : Bool */;
-short int var11 /* : Bool */;
-short int var12 /* : Bool */;
-{
-{ /* Inline kernel#Object#init (self) on <self:ADoExpr> */
-RET_LABEL1:(void)0;
-}
-}
-var_n_kwdo = p0;
-var_n_block = p1;
-var_n_label = p2;
-if (unlikely(var_n_kwdo == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2776);
-fatal_exit(1);
-}
-self->attrs[COLOR_nit__parser_nodes__ADoExpr___n_kwdo].val = var_n_kwdo; /* _n_kwdo on <self:ADoExpr> */
-if (var_n_kwdo == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2777);
-fatal_exit(1);
-} else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwdo,self) on <var_n_kwdo:nullable TKwdo> */
-if (unlikely(var_n_kwdo == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
-fatal_exit(1);
-}
-var_n_kwdo->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwdo:nullable TKwdo> */
-RET_LABEL2:(void)0;
-}
-}
-self->attrs[COLOR_nit__parser_nodes__ADoExpr___n_block].val = var_n_block; /* _n_block on <self:ADoExpr> */
-if (var_n_block == NULL) {
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_assign].val = var_node; /* _n_assign on <self:AVardeclExpr> */
+if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_block,((val*)NULL)) on <var_n_block:nullable AExpr> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TAssign> */
 var_other = ((val*)NULL);
 {
-var5 = ((short int(*)(val* self, val* p0))(var_n_block->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_block, var_other); /* == on <var_n_block:nullable AExpr(AExpr)>*/
-}
-var6 = !var5;
-var3 = var6;
-goto RET_LABEL4;
-RET_LABEL4:(void)0;
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TAssign(TAssign)>*/
 }
-var = var3;
-}
-if (var){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_block,self) on <var_n_block:nullable AExpr(AExpr)> */
-var_n_block->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_block:nullable AExpr(AExpr)> */
-RET_LABEL7:(void)0;
-}
-}
-} else {
-}
-self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val = var_n_label; /* _n_label on <self:ADoExpr> */
-if (var_n_label == NULL) {
-var8 = 0; /* is null */
-} else {
-var8 = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_label,((val*)NULL)) on <var_n_label:nullable ALabel> */
-var_other = ((val*)NULL);
-{
-var11 = ((short int(*)(val* self, val* p0))(var_n_label->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_label, var_other); /* == on <var_n_label:nullable ALabel(ALabel)>*/
-}
-var12 = !var11;
-var9 = var12;
-goto RET_LABEL10;
-RET_LABEL10:(void)0;
-}
-var8 = var9;
-}
-if (var8){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_label,self) on <var_n_label:nullable ALabel(ALabel)> */
-var_n_label->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_label:nullable ALabel(ALabel)> */
-RET_LABEL13:(void)0;
-}
-}
-} else {
-}
-RET_LABEL:;
-}
-/* method parser_prod#ADoExpr#replace_child for (self: ADoExpr, ANode, nullable ANode) */
-void nit__parser_prod___ADoExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
-val* var_old_child /* var old_child: ANode */;
-val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : TKwdo */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var5 /* : Bool */;
-short int var6 /* : Bool */;
-int cltype;
-int idtype;
-const char* var_class_name;
-val* var7 /* : nullable AExpr */;
-short int var8 /* : Bool */;
-short int var9 /* : Bool */;
-short int var11 /* : Bool */;
-short int var13 /* : Bool */;
-short int var14 /* : Bool */;
-int cltype15;
-int idtype16;
-const char* var_class_name17;
-val* var18 /* : nullable ALabel */;
-short int var19 /* : Bool */;
-short int var20 /* : Bool */;
-short int var22 /* : Bool */;
-short int var24 /* : Bool */;
-short int var25 /* : Bool */;
-int cltype26;
-int idtype27;
-const char* var_class_name28;
-var_old_child = p0;
-var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__ADoExpr___n_kwdo].val; /* _n_kwdo on <self:ADoExpr> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwdo");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2786);
-fatal_exit(1);
-}
-{
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwdo> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwdo> */
-var5 = var == var_other;
-var3 = var5;
-goto RET_LABEL4;
-RET_LABEL4:(void)0;
-}
-}
-var1 = var3;
+var4 = !var3;
+var1 = var4;
 goto RET_LABEL2;
 RET_LABEL2:(void)0;
 }
+var = var1;
 }
-if (var1){
-/* <var_new_child:nullable ANode> isa TKwdo */
-cltype = type_nit__TKwdo.color;
-idtype = type_nit__TKwdo.id;
-if(var_new_child == NULL) {
-var6 = 0;
-} else {
-if(cltype >= var_new_child->type->table_size) {
-var6 = 0;
-} else {
-var6 = var_new_child->type->type_table[cltype] == idtype;
-}
-}
-if (unlikely(!var6)) {
-var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwdo", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2787);
-fatal_exit(1);
-}
-{
-nit__parser_prod___ADoExpr___n_kwdo_61d(self, var_new_child); /* Direct call parser_prod#ADoExpr#n_kwdo= on <self:ADoExpr>*/
-}
-goto RET_LABEL;
-} else {
-}
-var7 = self->attrs[COLOR_nit__parser_nodes__ADoExpr___n_block].val; /* _n_block on <self:ADoExpr> */
-if (var7 == NULL) {
-var8 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:nullable AExpr> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:nullable AExpr(AExpr)> */
-var13 = var7 == var_other;
-var11 = var13;
-goto RET_LABEL12;
-RET_LABEL12:(void)0;
-}
-}
-var9 = var11;
-goto RET_LABEL10;
-RET_LABEL10:(void)0;
-}
-var8 = var9;
-}
-if (var8){
-/* <var_new_child:nullable ANode> isa nullable AExpr */
-cltype15 = type_nullable__nit__AExpr.color;
-idtype16 = type_nullable__nit__AExpr.id;
-if(var_new_child == NULL) {
-var14 = 1;
-} else {
-if(cltype15 >= var_new_child->type->table_size) {
-var14 = 0;
-} else {
-var14 = var_new_child->type->type_table[cltype15] == idtype16;
-}
-}
-if (unlikely(!var14)) {
-var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name17);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2791);
-fatal_exit(1);
-}
-{
-nit__parser_prod___ADoExpr___n_block_61d(self, var_new_child); /* Direct call parser_prod#ADoExpr#n_block= on <self:ADoExpr>*/
-}
-goto RET_LABEL;
-} else {
-}
-var18 = self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:ADoExpr> */
-if (var18 == NULL) {
-var19 = 0; /* <var_old_child:ANode> cannot be null */
-} else {
-{ /* Inline kernel#Object#== (var18,var_old_child) on <var18:nullable ALabel> */
-var_other = var_old_child;
+if (var){
 {
-{ /* Inline kernel#Object#is_same_instance (var18,var_other) on <var18:nullable ALabel(ALabel)> */
-var24 = var18 == var_other;
-var22 = var24;
-goto RET_LABEL23;
-RET_LABEL23:(void)0;
-}
-}
-var20 = var22;
-goto RET_LABEL21;
-RET_LABEL21:(void)0;
-}
-var19 = var20;
-}
-if (var19){
-/* <var_new_child:nullable ANode> isa nullable ALabel */
-cltype26 = type_nullable__nit__ALabel.color;
-idtype27 = type_nullable__nit__ALabel.id;
-if(var_new_child == NULL) {
-var25 = 1;
-} else {
-if(cltype26 >= var_new_child->type->table_size) {
-var25 = 0;
-} else {
-var25 = var_new_child->type->type_table[cltype26] == idtype27;
-}
-}
-if (unlikely(!var25)) {
-var_class_name28 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable ALabel", var_class_name28);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2795);
-fatal_exit(1);
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TAssign(TAssign)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TAssign(TAssign)> */
+RET_LABEL5:(void)0;
 }
-{
-nit__parser_prod___ADoExpr___nit__parser_nodes__ALabelable__n_label_61d(self, var_new_child); /* Direct call parser_prod#ADoExpr#n_label= on <self:ADoExpr>*/
 }
-goto RET_LABEL;
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#ADoExpr#n_kwdo= for (self: ADoExpr, TKwdo) */
-void nit__parser_prod___ADoExpr___n_kwdo_61d(val* self, val* p0) {
-val* var_node /* var node: TKwdo */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ADoExpr___n_kwdo].val = var_node; /* _n_kwdo on <self:ADoExpr> */
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwdo> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwdo> */
-RET_LABEL1:(void)0;
-}
-}
-RET_LABEL:;
-}
-/* method parser_prod#ADoExpr#n_block= for (self: ADoExpr, nullable AExpr) */
-void nit__parser_prod___ADoExpr___n_block_61d(val* self, val* p0) {
+/* method parser_prod#AVardeclExpr#n_expr= for (self: AVardeclExpr, nullable AExpr) */
+void nitc__parser_prod___AVardeclExpr___n_expr_61d(val* self, val* p0) {
 val* var_node /* var node: nullable AExpr */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -8693,7 +7843,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ADoExpr___n_block].val = var_node; /* _n_block on <self:ADoExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_expr].val = var_node; /* _n_expr on <self:AVardeclExpr> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -8703,7 +7853,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AExpr> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -8715,7 +7865,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AExpr(AExpr)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -8723,26 +7873,26 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#ADoExpr#n_label= for (self: ADoExpr, nullable ALabel) */
-void nit__parser_prod___ADoExpr___nit__parser_nodes__ALabelable__n_label_61d(val* self, val* p0) {
-val* var_node /* var node: nullable ALabel */;
+/* method parser_prod#AVardeclExpr#n_annotations= for (self: AVardeclExpr, nullable AAnnotations) */
+void nitc__parser_prod___AVardeclExpr___nitc__parser_nodes__Prod__n_annotations_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AAnnotations */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val = var_node; /* _n_label on <self:ADoExpr> */
+self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val = var_node; /* _n_annotations on <self:AVardeclExpr> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable ALabel> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AAnnotations> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ALabel(ALabel)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AAnnotations(AAnnotations)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -8753,8 +7903,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable ALabel(ALabel)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ALabel(ALabel)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AAnnotations(AAnnotations)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AAnnotations(AAnnotations)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -8762,590 +7912,1296 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#ADoExpr#visit_all for (self: ADoExpr, Visitor) */
-void nit__parser_prod___ADoExpr___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+/* method parser_prod#AVardeclExpr#visit_all for (self: AVardeclExpr, Visitor) */
+void nitc__parser_prod___AVardeclExpr___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
-val* var /* : TKwdo */;
-val* var1 /* : nullable AExpr */;
-val* var2 /* : nullable ALabel */;
+val* var /* : nullable TKwvar */;
+val* var1 /* : TId */;
+val* var2 /* : nullable AType */;
+val* var3 /* : nullable TAssign */;
+val* var4 /* : nullable AExpr */;
+val* var5 /* : nullable AAnnotations */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__ADoExpr___n_kwdo].val; /* _n_kwdo on <self:ADoExpr> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwdo");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2819);
+var = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_kwvar].val; /* _n_kwvar on <self:AVardeclExpr> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+var1 = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_id].val; /* _n_id on <self:AVardeclExpr> */
+if (unlikely(var1 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_id");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2691);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+var2 = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_type].val; /* _n_type on <self:AVardeclExpr> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+var3 = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_assign].val; /* _n_assign on <self:AVardeclExpr> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var1 = self->attrs[COLOR_nit__parser_nodes__ADoExpr___n_block].val; /* _n_block on <self:ADoExpr> */
+var4 = self->attrs[COLOR_nitc__parser_nodes__AVardeclExpr___n_expr].val; /* _n_expr on <self:AVardeclExpr> */
 {
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var2 = self->attrs[COLOR_nit__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:ADoExpr> */
+var5 = self->attrs[COLOR_nitc__parser_nodes__Prod___n_annotations].val; /* _n_annotations on <self:AVardeclExpr> */
 {
-nit___nit__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var5); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#AIfExpr#init_aifexpr for (self: AIfExpr, nullable TKwif, nullable AExpr, nullable TKwthen, nullable AExpr, nullable TKwelse, nullable AExpr) */
-void nit__parser_prod___AIfExpr___init_aifexpr(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5) {
-val* var_n_kwif /* var n_kwif: nullable TKwif */;
+/* method parser_prod#AReturnExpr#init_areturnexpr for (self: AReturnExpr, nullable TKwreturn, nullable AExpr) */
+void nitc__parser_prod___AReturnExpr___init_areturnexpr(val* self, val* p0, val* p1) {
+val* var_n_kwreturn /* var n_kwreturn: nullable TKwreturn */;
 val* var_n_expr /* var n_expr: nullable AExpr */;
-val* var_n_kwthen /* var n_kwthen: nullable TKwthen */;
-val* var_n_then /* var n_then: nullable AExpr */;
-val* var_n_kwelse /* var n_kwelse: nullable TKwelse */;
-val* var_n_else /* var n_else: nullable AExpr */;
 short int var /* : Bool */;
-short int var5 /* : Bool */;
+short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
+short int var4 /* : Bool */;
+short int var5 /* : Bool */;
 short int var7 /* : Bool */;
 short int var8 /* : Bool */;
 short int var10 /* : Bool */;
 short int var11 /* : Bool */;
-short int var13 /* : Bool */;
-short int var14 /* : Bool */;
-short int var16 /* : Bool */;
-short int var17 /* : Bool */;
-short int var19 /* : Bool */;
-short int var20 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:AIfExpr> */
+{ /* Inline kernel#Object#init (self) on <self:AReturnExpr> */
 RET_LABEL1:(void)0;
 }
 }
-var_n_kwif = p0;
+var_n_kwreturn = p0;
 var_n_expr = p1;
-var_n_kwthen = p2;
-var_n_then = p3;
-var_n_kwelse = p4;
-var_n_else = p5;
-if (unlikely(var_n_kwif == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2834);
-fatal_exit(1);
-}
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwif].val = var_n_kwif; /* _n_kwif on <self:AIfExpr> */
-if (var_n_kwif == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2835);
-fatal_exit(1);
-} else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwif,self) on <var_n_kwif:nullable TKwif> */
-if (unlikely(var_n_kwif == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
-fatal_exit(1);
-}
-var_n_kwif->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwif:nullable TKwif> */
-RET_LABEL2:(void)0;
-}
-}
-if (unlikely(var_n_expr == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2836);
-fatal_exit(1);
-}
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_expr].val = var_n_expr; /* _n_expr on <self:AIfExpr> */
-if (var_n_expr == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2837);
-fatal_exit(1);
-} else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_expr,self) on <var_n_expr:nullable AExpr> */
-if (unlikely(var_n_expr == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
-fatal_exit(1);
-}
-var_n_expr->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_expr:nullable AExpr> */
-RET_LABEL3:(void)0;
-}
-}
-if (unlikely(var_n_kwthen == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2838);
-fatal_exit(1);
-}
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwthen].val = var_n_kwthen; /* _n_kwthen on <self:AIfExpr> */
-if (var_n_kwthen == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2839);
-fatal_exit(1);
-} else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwthen,self) on <var_n_kwthen:nullable TKwthen> */
-if (unlikely(var_n_kwthen == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
-fatal_exit(1);
-}
-var_n_kwthen->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwthen:nullable TKwthen> */
-RET_LABEL4:(void)0;
-}
-}
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_then].val = var_n_then; /* _n_then on <self:AIfExpr> */
-if (var_n_then == NULL) {
+self->attrs[COLOR_nitc__parser_nodes__AReturnExpr___n_kwreturn].val = var_n_kwreturn; /* _n_kwreturn on <self:AReturnExpr> */
+if (var_n_kwreturn == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_then,((val*)NULL)) on <var_n_then:nullable AExpr> */
+{ /* Inline kernel#Object#!= (var_n_kwreturn,((val*)NULL)) on <var_n_kwreturn:nullable TKwreturn> */
 var_other = ((val*)NULL);
 {
-var7 = ((short int(*)(val* self, val* p0))(var_n_then->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_then, var_other); /* == on <var_n_then:nullable AExpr(AExpr)>*/
+var4 = ((short int(*)(val* self, val* p0))(var_n_kwreturn->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_kwreturn, var_other); /* == on <var_n_kwreturn:nullable TKwreturn(TKwreturn)>*/
 }
-var8 = !var7;
-var5 = var8;
-goto RET_LABEL6;
-RET_LABEL6:(void)0;
+var5 = !var4;
+var2 = var5;
+goto RET_LABEL3;
+RET_LABEL3:(void)0;
 }
-var = var5;
+var = var2;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_then,self) on <var_n_then:nullable AExpr(AExpr)> */
-var_n_then->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_then:nullable AExpr(AExpr)> */
-RET_LABEL9:(void)0;
-}
-}
-} else {
-}
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwelse].val = var_n_kwelse; /* _n_kwelse on <self:AIfExpr> */
-if (var_n_kwelse == NULL) {
-var10 = 0; /* is null */
-} else {
-var10 = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_n_kwelse,((val*)NULL)) on <var_n_kwelse:nullable TKwelse> */
-var_other = ((val*)NULL);
-{
-var13 = ((short int(*)(val* self, val* p0))(var_n_kwelse->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_kwelse, var_other); /* == on <var_n_kwelse:nullable TKwelse(TKwelse)>*/
-}
-var14 = !var13;
-var11 = var14;
-goto RET_LABEL12;
-RET_LABEL12:(void)0;
-}
-var10 = var11;
-}
-if (var10){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwelse,self) on <var_n_kwelse:nullable TKwelse(TKwelse)> */
-var_n_kwelse->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwelse:nullable TKwelse(TKwelse)> */
-RET_LABEL15:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwreturn,self) on <var_n_kwreturn:nullable TKwreturn(TKwreturn)> */
+var_n_kwreturn->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwreturn:nullable TKwreturn(TKwreturn)> */
+RET_LABEL6:(void)0;
 }
 }
 } else {
 }
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_else].val = var_n_else; /* _n_else on <self:AIfExpr> */
-if (var_n_else == NULL) {
-var16 = 0; /* is null */
+self->attrs[COLOR_nitc__parser_nodes__AReturnExpr___n_expr].val = var_n_expr; /* _n_expr on <self:AReturnExpr> */
+if (var_n_expr == NULL) {
+var7 = 0; /* is null */
 } else {
-var16 = 1; /* arg is null and recv is not */
+var7 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_n_else,((val*)NULL)) on <var_n_else:nullable AExpr> */
+{ /* Inline kernel#Object#!= (var_n_expr,((val*)NULL)) on <var_n_expr:nullable AExpr> */
 var_other = ((val*)NULL);
 {
-var19 = ((short int(*)(val* self, val* p0))(var_n_else->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_n_else, var_other); /* == on <var_n_else:nullable AExpr(AExpr)>*/
+var10 = ((short int(*)(val* self, val* p0))(var_n_expr->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_expr, var_other); /* == on <var_n_expr:nullable AExpr(AExpr)>*/
 }
-var20 = !var19;
-var17 = var20;
-goto RET_LABEL18;
-RET_LABEL18:(void)0;
+var11 = !var10;
+var8 = var11;
+goto RET_LABEL9;
+RET_LABEL9:(void)0;
 }
-var16 = var17;
+var7 = var8;
 }
-if (var16){
+if (var7){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_n_else,self) on <var_n_else:nullable AExpr(AExpr)> */
-var_n_else->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_else:nullable AExpr(AExpr)> */
-RET_LABEL21:(void)0;
+{ /* Inline parser_nodes#ANode#parent= (var_n_expr,self) on <var_n_expr:nullable AExpr(AExpr)> */
+var_n_expr->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_expr:nullable AExpr(AExpr)> */
+RET_LABEL12:(void)0;
 }
 }
 } else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AIfExpr#replace_child for (self: AIfExpr, ANode, nullable ANode) */
-void nit__parser_prod___AIfExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#AReturnExpr#replace_child for (self: AReturnExpr, ANode, nullable ANode) */
+void nitc__parser_prod___AReturnExpr___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
-val* var /* : TKwif */;
+val* var /* : nullable TKwreturn */;
 short int var1 /* : Bool */;
+short int var2 /* : Bool */;
 val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var5 /* : Bool */;
+short int var4 /* : Bool */;
 short int var6 /* : Bool */;
+short int var7 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-val* var7 /* : AExpr */;
-short int var8 /* : Bool */;
+val* var8 /* : nullable AExpr */;
+short int var9 /* : Bool */;
 short int var10 /* : Bool */;
 short int var12 /* : Bool */;
-short int var13 /* : Bool */;
-int cltype14;
-int idtype15;
-const char* var_class_name16;
-val* var17 /* : TKwthen */;
-short int var18 /* : Bool */;
-short int var20 /* : Bool */;
-short int var22 /* : Bool */;
-short int var23 /* : Bool */;
-int cltype24;
-int idtype25;
-const char* var_class_name26;
-val* var27 /* : nullable AExpr */;
-short int var28 /* : Bool */;
-short int var29 /* : Bool */;
-short int var31 /* : Bool */;
-short int var33 /* : Bool */;
-short int var34 /* : Bool */;
-int cltype35;
-int idtype36;
-const char* var_class_name37;
-val* var38 /* : nullable TKwelse */;
-short int var39 /* : Bool */;
-short int var40 /* : Bool */;
-short int var42 /* : Bool */;
-short int var44 /* : Bool */;
-short int var45 /* : Bool */;
-int cltype46;
-int idtype47;
-const char* var_class_name48;
-val* var49 /* : nullable AExpr */;
-short int var50 /* : Bool */;
-short int var51 /* : Bool */;
-short int var53 /* : Bool */;
-short int var55 /* : Bool */;
-short int var56 /* : Bool */;
-int cltype57;
-int idtype58;
-const char* var_class_name59;
+short int var14 /* : Bool */;
+short int var15 /* : Bool */;
+int cltype16;
+int idtype17;
+const char* var_class_name18;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwif].val; /* _n_kwif on <self:AIfExpr> */
-if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwif");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2850);
-fatal_exit(1);
-}
-{
-{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwif> */
+var = self->attrs[COLOR_nitc__parser_nodes__AReturnExpr___n_kwreturn].val; /* _n_kwreturn on <self:AReturnExpr> */
+if (var == NULL) {
+var1 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TKwreturn> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwif> */
-var5 = var == var_other;
-var3 = var5;
-goto RET_LABEL4;
-RET_LABEL4:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TKwreturn(TKwreturn)> */
+var6 = var == var_other;
+var4 = var6;
+goto RET_LABEL5;
+RET_LABEL5:(void)0;
 }
 }
-var1 = var3;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
+var2 = var4;
+goto RET_LABEL3;
+RET_LABEL3:(void)0;
 }
+var1 = var2;
 }
 if (var1){
-/* <var_new_child:nullable ANode> isa TKwif */
-cltype = type_nit__TKwif.color;
-idtype = type_nit__TKwif.id;
+/* <var_new_child:nullable ANode> isa nullable TKwreturn */
+cltype = type_nullable__nitc__TKwreturn.color;
+idtype = type_nullable__nitc__TKwreturn.id;
 if(var_new_child == NULL) {
-var6 = 0;
+var7 = 1;
 } else {
 if(cltype >= var_new_child->type->table_size) {
-var6 = 0;
+var7 = 0;
 } else {
-var6 = var_new_child->type->type_table[cltype] == idtype;
+var7 = var_new_child->type->type_table[cltype] == idtype;
 }
 }
-if (unlikely(!var6)) {
+if (unlikely(!var7)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwif", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2851);
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwreturn", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2713);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfExpr___n_kwif_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_kwif= on <self:AIfExpr>*/
+nitc__parser_prod___AReturnExpr___n_kwreturn_61d(self, var_new_child); /* Direct call parser_prod#AReturnExpr#n_kwreturn= on <self:AReturnExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_expr].val; /* _n_expr on <self:AIfExpr> */
-if (unlikely(var7 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2854);
-fatal_exit(1);
-}
-{
-{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:AExpr> */
+var8 = self->attrs[COLOR_nitc__parser_nodes__AReturnExpr___n_expr].val; /* _n_expr on <self:AReturnExpr> */
+if (var8 == NULL) {
+var9 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:nullable AExpr> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:AExpr> */
-var12 = var7 == var_other;
+{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:nullable AExpr(AExpr)> */
+var14 = var8 == var_other;
+var12 = var14;
+goto RET_LABEL13;
+RET_LABEL13:(void)0;
+}
+}
 var10 = var12;
 goto RET_LABEL11;
 RET_LABEL11:(void)0;
 }
+var9 = var10;
 }
-var8 = var10;
-goto RET_LABEL9;
-RET_LABEL9:(void)0;
-}
-}
-if (var8){
-/* <var_new_child:nullable ANode> isa AExpr */
-cltype14 = type_nit__AExpr.color;
-idtype15 = type_nit__AExpr.id;
+if (var9){
+/* <var_new_child:nullable ANode> isa nullable AExpr */
+cltype16 = type_nullable__nitc__AExpr.color;
+idtype17 = type_nullable__nitc__AExpr.id;
 if(var_new_child == NULL) {
-var13 = 0;
+var15 = 1;
 } else {
-if(cltype14 >= var_new_child->type->table_size) {
-var13 = 0;
+if(cltype16 >= var_new_child->type->table_size) {
+var15 = 0;
 } else {
-var13 = var_new_child->type->type_table[cltype14] == idtype15;
+var15 = var_new_child->type->type_table[cltype16] == idtype17;
 }
 }
-if (unlikely(!var13)) {
-var_class_name16 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "AExpr", var_class_name16);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2855);
+if (unlikely(!var15)) {
+var_class_name18 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name18);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2717);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfExpr___n_expr_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_expr= on <self:AIfExpr>*/
+nitc__parser_prod___AReturnExpr___n_expr_61d(self, var_new_child); /* Direct call parser_prod#AReturnExpr#n_expr= on <self:AReturnExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var17 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwthen].val; /* _n_kwthen on <self:AIfExpr> */
-if (unlikely(var17 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwthen");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2858);
-fatal_exit(1);
+RET_LABEL:;
 }
+/* method parser_prod#AReturnExpr#n_kwreturn= for (self: AReturnExpr, nullable TKwreturn) */
+void nitc__parser_prod___AReturnExpr___n_kwreturn_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TKwreturn */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AReturnExpr___n_kwreturn].val = var_node; /* _n_kwreturn on <self:AReturnExpr> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwreturn> */
+var_other = ((val*)NULL);
 {
-{ /* Inline kernel#Object#== (var17,var_old_child) on <var17:TKwthen> */
-var_other = var_old_child;
-{
-{ /* Inline kernel#Object#is_same_instance (var17,var_other) on <var17:TKwthen> */
-var22 = var17 == var_other;
-var20 = var22;
-goto RET_LABEL21;
-RET_LABEL21:(void)0;
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwreturn(TKwreturn)>*/
+}
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
 }
+var = var1;
 }
-var18 = var20;
-goto RET_LABEL19;
-RET_LABEL19:(void)0;
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwreturn(TKwreturn)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwreturn(TKwreturn)> */
+RET_LABEL5:(void)0;
 }
 }
-if (var18){
-/* <var_new_child:nullable ANode> isa TKwthen */
-cltype24 = type_nit__TKwthen.color;
-idtype25 = type_nit__TKwthen.id;
-if(var_new_child == NULL) {
-var23 = 0;
 } else {
-if(cltype24 >= var_new_child->type->table_size) {
-var23 = 0;
+}
+RET_LABEL:;
+}
+/* method parser_prod#AReturnExpr#n_expr= for (self: AReturnExpr, nullable AExpr) */
+void nitc__parser_prod___AReturnExpr___n_expr_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AExpr */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AReturnExpr___n_expr].val = var_node; /* _n_expr on <self:AReturnExpr> */
+if (var_node == NULL) {
+var = 0; /* is null */
 } else {
-var23 = var_new_child->type->type_table[cltype24] == idtype25;
+var = 1; /* arg is null and recv is not */
 }
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AExpr> */
+var_other = ((val*)NULL);
+{
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
 }
-if (unlikely(!var23)) {
-var_class_name26 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwthen", var_class_name26);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2859);
-fatal_exit(1);
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+var = var1;
 }
+if (var){
 {
-nit__parser_prod___AIfExpr___n_kwthen_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_kwthen= on <self:AIfExpr>*/
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AExpr(AExpr)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
+RET_LABEL5:(void)0;
+}
 }
-goto RET_LABEL;
 } else {
 }
-var27 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_then].val; /* _n_then on <self:AIfExpr> */
-if (var27 == NULL) {
-var28 = 0; /* <var_old_child:ANode> cannot be null */
+RET_LABEL:;
+}
+/* method parser_prod#AReturnExpr#visit_all for (self: AReturnExpr, Visitor) */
+void nitc__parser_prod___AReturnExpr___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
+val* var_v /* var v: Visitor */;
+val* var /* : nullable TKwreturn */;
+val* var1 /* : nullable AExpr */;
+var_v = p0;
+var = self->attrs[COLOR_nitc__parser_nodes__AReturnExpr___n_kwreturn].val; /* _n_kwreturn on <self:AReturnExpr> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+var1 = self->attrs[COLOR_nitc__parser_nodes__AReturnExpr___n_expr].val; /* _n_expr on <self:AReturnExpr> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+RET_LABEL:;
+}
+/* method parser_prod#ABreakExpr#init_abreakexpr for (self: ABreakExpr, nullable TKwbreak, nullable ALabel) */
+void nitc__parser_prod___ABreakExpr___init_abreakexpr(val* self, val* p0, val* p1) {
+val* var_n_kwbreak /* var n_kwbreak: nullable TKwbreak */;
+val* var_n_label /* var n_label: nullable ALabel */;
+short int var /* : Bool */;
+short int var3 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var5 /* : Bool */;
+short int var6 /* : Bool */;
+{
+{ /* Inline kernel#Object#init (self) on <self:ABreakExpr> */
+RET_LABEL1:(void)0;
+}
+}
+var_n_kwbreak = p0;
+var_n_label = p1;
+if (unlikely(var_n_kwbreak == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Cast failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2746);
+fatal_exit(1);
+}
+self->attrs[COLOR_nitc__parser_nodes__ABreakExpr___n_kwbreak].val = var_n_kwbreak; /* _n_kwbreak on <self:ABreakExpr> */
+if (var_n_kwbreak == NULL) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2747);
+fatal_exit(1);
 } else {
-{ /* Inline kernel#Object#== (var27,var_old_child) on <var27:nullable AExpr> */
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwbreak,self) on <var_n_kwbreak:nullable TKwbreak> */
+if (unlikely(var_n_kwbreak == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
+fatal_exit(1);
+}
+var_n_kwbreak->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwbreak:nullable TKwbreak> */
+RET_LABEL2:(void)0;
+}
+}
+self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val = var_n_label; /* _n_label on <self:ABreakExpr> */
+if (var_n_label == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_label,((val*)NULL)) on <var_n_label:nullable ALabel> */
+var_other = ((val*)NULL);
+{
+var5 = ((short int(*)(val* self, val* p0))(var_n_label->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_label, var_other); /* == on <var_n_label:nullable ALabel(ALabel)>*/
+}
+var6 = !var5;
+var3 = var6;
+goto RET_LABEL4;
+RET_LABEL4:(void)0;
+}
+var = var3;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_label,self) on <var_n_label:nullable ALabel(ALabel)> */
+var_n_label->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_label:nullable ALabel(ALabel)> */
+RET_LABEL7:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#ABreakExpr#replace_child for (self: ABreakExpr, ANode, nullable ANode) */
+void nitc__parser_prod___ABreakExpr___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+val* var_old_child /* var old_child: ANode */;
+val* var_new_child /* var new_child: nullable ANode */;
+val* var /* : TKwbreak */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var5 /* : Bool */;
+short int var6 /* : Bool */;
+int cltype;
+int idtype;
+const char* var_class_name;
+val* var7 /* : nullable ALabel */;
+short int var8 /* : Bool */;
+short int var9 /* : Bool */;
+short int var11 /* : Bool */;
+short int var13 /* : Bool */;
+short int var14 /* : Bool */;
+int cltype15;
+int idtype16;
+const char* var_class_name17;
+var_old_child = p0;
+var_new_child = p1;
+var = self->attrs[COLOR_nitc__parser_nodes__ABreakExpr___n_kwbreak].val; /* _n_kwbreak on <self:ABreakExpr> */
+if (unlikely(var == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwbreak");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2754);
+fatal_exit(1);
+}
+{
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwbreak> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var27,var_other) on <var27:nullable AExpr(AExpr)> */
-var33 = var27 == var_other;
-var31 = var33;
-goto RET_LABEL32;
-RET_LABEL32:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwbreak> */
+var5 = var == var_other;
+var3 = var5;
+goto RET_LABEL4;
+RET_LABEL4:(void)0;
 }
 }
-var29 = var31;
-goto RET_LABEL30;
-RET_LABEL30:(void)0;
+var1 = var3;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
 }
-var28 = var29;
 }
-if (var28){
-/* <var_new_child:nullable ANode> isa nullable AExpr */
-cltype35 = type_nullable__nit__AExpr.color;
-idtype36 = type_nullable__nit__AExpr.id;
+if (var1){
+/* <var_new_child:nullable ANode> isa TKwbreak */
+cltype = type_nitc__TKwbreak.color;
+idtype = type_nitc__TKwbreak.id;
 if(var_new_child == NULL) {
-var34 = 1;
+var6 = 0;
 } else {
-if(cltype35 >= var_new_child->type->table_size) {
-var34 = 0;
+if(cltype >= var_new_child->type->table_size) {
+var6 = 0;
 } else {
-var34 = var_new_child->type->type_table[cltype35] == idtype36;
+var6 = var_new_child->type->type_table[cltype] == idtype;
 }
 }
-if (unlikely(!var34)) {
-var_class_name37 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name37);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2863);
+if (unlikely(!var6)) {
+var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwbreak", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2755);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfExpr___n_then_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_then= on <self:AIfExpr>*/
+nitc__parser_prod___ABreakExpr___n_kwbreak_61d(self, var_new_child); /* Direct call parser_prod#ABreakExpr#n_kwbreak= on <self:ABreakExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var38 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwelse].val; /* _n_kwelse on <self:AIfExpr> */
-if (var38 == NULL) {
-var39 = 0; /* <var_old_child:ANode> cannot be null */
+var7 = self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:ABreakExpr> */
+if (var7 == NULL) {
+var8 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var38,var_old_child) on <var38:nullable TKwelse> */
+{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:nullable ALabel> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var38,var_other) on <var38:nullable TKwelse(TKwelse)> */
-var44 = var38 == var_other;
-var42 = var44;
-goto RET_LABEL43;
-RET_LABEL43:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:nullable ALabel(ALabel)> */
+var13 = var7 == var_other;
+var11 = var13;
+goto RET_LABEL12;
+RET_LABEL12:(void)0;
 }
 }
-var40 = var42;
-goto RET_LABEL41;
-RET_LABEL41:(void)0;
+var9 = var11;
+goto RET_LABEL10;
+RET_LABEL10:(void)0;
 }
-var39 = var40;
+var8 = var9;
 }
-if (var39){
-/* <var_new_child:nullable ANode> isa nullable TKwelse */
-cltype46 = type_nullable__nit__TKwelse.color;
-idtype47 = type_nullable__nit__TKwelse.id;
+if (var8){
+/* <var_new_child:nullable ANode> isa nullable ALabel */
+cltype15 = type_nullable__nitc__ALabel.color;
+idtype16 = type_nullable__nitc__ALabel.id;
 if(var_new_child == NULL) {
-var45 = 1;
+var14 = 1;
 } else {
-if(cltype46 >= var_new_child->type->table_size) {
-var45 = 0;
+if(cltype15 >= var_new_child->type->table_size) {
+var14 = 0;
+} else {
+var14 = var_new_child->type->type_table[cltype15] == idtype16;
+}
+}
+if (unlikely(!var14)) {
+var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable ALabel", var_class_name17);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2759);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___ABreakExpr___nitc__parser_nodes__ALabelable__n_label_61d(self, var_new_child); /* Direct call parser_prod#ABreakExpr#n_label= on <self:ABreakExpr>*/
+}
+goto RET_LABEL;
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#ABreakExpr#n_kwbreak= for (self: ABreakExpr, TKwbreak) */
+void nitc__parser_prod___ABreakExpr___n_kwbreak_61d(val* self, val* p0) {
+val* var_node /* var node: TKwbreak */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__ABreakExpr___n_kwbreak].val = var_node; /* _n_kwbreak on <self:ABreakExpr> */
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwbreak> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwbreak> */
+RET_LABEL1:(void)0;
+}
+}
+RET_LABEL:;
+}
+/* method parser_prod#ABreakExpr#n_label= for (self: ABreakExpr, nullable ALabel) */
+void nitc__parser_prod___ABreakExpr___nitc__parser_nodes__ALabelable__n_label_61d(val* self, val* p0) {
+val* var_node /* var node: nullable ALabel */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val = var_node; /* _n_label on <self:ABreakExpr> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable ALabel> */
+var_other = ((val*)NULL);
+{
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ALabel(ALabel)>*/
+}
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+var = var1;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable ALabel(ALabel)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ALabel(ALabel)> */
+RET_LABEL5:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#ABreakExpr#visit_all for (self: ABreakExpr, Visitor) */
+void nitc__parser_prod___ABreakExpr___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
+val* var_v /* var v: Visitor */;
+val* var /* : TKwbreak */;
+val* var1 /* : nullable ALabel */;
+var_v = p0;
+var = self->attrs[COLOR_nitc__parser_nodes__ABreakExpr___n_kwbreak].val; /* _n_kwbreak on <self:ABreakExpr> */
+if (unlikely(var == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwbreak");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2778);
+fatal_exit(1);
+}
+{
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+var1 = self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:ABreakExpr> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+RET_LABEL:;
+}
+/* method parser_prod#AAbortExpr#init_aabortexpr for (self: AAbortExpr, nullable TKwabort) */
+void nitc__parser_prod___AAbortExpr___init_aabortexpr(val* self, val* p0) {
+val* var_n_kwabort /* var n_kwabort: nullable TKwabort */;
+{
+{ /* Inline kernel#Object#init (self) on <self:AAbortExpr> */
+RET_LABEL1:(void)0;
+}
+}
+var_n_kwabort = p0;
+if (unlikely(var_n_kwabort == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Cast failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2787);
+fatal_exit(1);
+}
+self->attrs[COLOR_nitc__parser_nodes__AAbortExpr___n_kwabort].val = var_n_kwabort; /* _n_kwabort on <self:AAbortExpr> */
+if (var_n_kwabort == NULL) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2788);
+fatal_exit(1);
+} else {
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwabort,self) on <var_n_kwabort:nullable TKwabort> */
+if (unlikely(var_n_kwabort == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
+fatal_exit(1);
+}
+var_n_kwabort->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwabort:nullable TKwabort> */
+RET_LABEL2:(void)0;
+}
+}
+RET_LABEL:;
+}
+/* method parser_prod#AAbortExpr#replace_child for (self: AAbortExpr, ANode, nullable ANode) */
+void nitc__parser_prod___AAbortExpr___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+val* var_old_child /* var old_child: ANode */;
+val* var_new_child /* var new_child: nullable ANode */;
+val* var /* : TKwabort */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var5 /* : Bool */;
+short int var6 /* : Bool */;
+int cltype;
+int idtype;
+const char* var_class_name;
+var_old_child = p0;
+var_new_child = p1;
+var = self->attrs[COLOR_nitc__parser_nodes__AAbortExpr___n_kwabort].val; /* _n_kwabort on <self:AAbortExpr> */
+if (unlikely(var == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwabort");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2793);
+fatal_exit(1);
+}
+{
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwabort> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwabort> */
+var5 = var == var_other;
+var3 = var5;
+goto RET_LABEL4;
+RET_LABEL4:(void)0;
+}
+}
+var1 = var3;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+}
+if (var1){
+/* <var_new_child:nullable ANode> isa TKwabort */
+cltype = type_nitc__TKwabort.color;
+idtype = type_nitc__TKwabort.id;
+if(var_new_child == NULL) {
+var6 = 0;
+} else {
+if(cltype >= var_new_child->type->table_size) {
+var6 = 0;
+} else {
+var6 = var_new_child->type->type_table[cltype] == idtype;
+}
+}
+if (unlikely(!var6)) {
+var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwabort", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2794);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AAbortExpr___n_kwabort_61d(self, var_new_child); /* Direct call parser_prod#AAbortExpr#n_kwabort= on <self:AAbortExpr>*/
+}
+goto RET_LABEL;
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#AAbortExpr#n_kwabort= for (self: AAbortExpr, TKwabort) */
+void nitc__parser_prod___AAbortExpr___n_kwabort_61d(val* self, val* p0) {
+val* var_node /* var node: TKwabort */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AAbortExpr___n_kwabort].val = var_node; /* _n_kwabort on <self:AAbortExpr> */
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwabort> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwabort> */
+RET_LABEL1:(void)0;
+}
+}
+RET_LABEL:;
+}
+/* method parser_prod#AAbortExpr#visit_all for (self: AAbortExpr, Visitor) */
+void nitc__parser_prod___AAbortExpr___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
+val* var_v /* var v: Visitor */;
+val* var /* : TKwabort */;
+var_v = p0;
+var = self->attrs[COLOR_nitc__parser_nodes__AAbortExpr___n_kwabort].val; /* _n_kwabort on <self:AAbortExpr> */
+if (unlikely(var == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwabort");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2808);
+fatal_exit(1);
+}
+{
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+RET_LABEL:;
+}
+/* method parser_prod#AContinueExpr#init_acontinueexpr for (self: AContinueExpr, nullable TKwcontinue, nullable ALabel) */
+void nitc__parser_prod___AContinueExpr___init_acontinueexpr(val* self, val* p0, val* p1) {
+val* var_n_kwcontinue /* var n_kwcontinue: nullable TKwcontinue */;
+val* var_n_label /* var n_label: nullable ALabel */;
+short int var /* : Bool */;
+short int var2 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var4 /* : Bool */;
+short int var5 /* : Bool */;
+short int var7 /* : Bool */;
+short int var8 /* : Bool */;
+short int var10 /* : Bool */;
+short int var11 /* : Bool */;
+{
+{ /* Inline kernel#Object#init (self) on <self:AContinueExpr> */
+RET_LABEL1:(void)0;
+}
+}
+var_n_kwcontinue = p0;
+var_n_label = p1;
+self->attrs[COLOR_nitc__parser_nodes__AContinueExpr___n_kwcontinue].val = var_n_kwcontinue; /* _n_kwcontinue on <self:AContinueExpr> */
+if (var_n_kwcontinue == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_kwcontinue,((val*)NULL)) on <var_n_kwcontinue:nullable TKwcontinue> */
+var_other = ((val*)NULL);
+{
+var4 = ((short int(*)(val* self, val* p0))(var_n_kwcontinue->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_kwcontinue, var_other); /* == on <var_n_kwcontinue:nullable TKwcontinue(TKwcontinue)>*/
+}
+var5 = !var4;
+var2 = var5;
+goto RET_LABEL3;
+RET_LABEL3:(void)0;
+}
+var = var2;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwcontinue,self) on <var_n_kwcontinue:nullable TKwcontinue(TKwcontinue)> */
+var_n_kwcontinue->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwcontinue:nullable TKwcontinue(TKwcontinue)> */
+RET_LABEL6:(void)0;
+}
+}
+} else {
+}
+self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val = var_n_label; /* _n_label on <self:AContinueExpr> */
+if (var_n_label == NULL) {
+var7 = 0; /* is null */
+} else {
+var7 = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_label,((val*)NULL)) on <var_n_label:nullable ALabel> */
+var_other = ((val*)NULL);
+{
+var10 = ((short int(*)(val* self, val* p0))(var_n_label->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_label, var_other); /* == on <var_n_label:nullable ALabel(ALabel)>*/
+}
+var11 = !var10;
+var8 = var11;
+goto RET_LABEL9;
+RET_LABEL9:(void)0;
+}
+var7 = var8;
+}
+if (var7){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_label,self) on <var_n_label:nullable ALabel(ALabel)> */
+var_n_label->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_label:nullable ALabel(ALabel)> */
+RET_LABEL12:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#AContinueExpr#replace_child for (self: AContinueExpr, ANode, nullable ANode) */
+void nitc__parser_prod___AContinueExpr___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+val* var_old_child /* var old_child: ANode */;
+val* var_new_child /* var new_child: nullable ANode */;
+val* var /* : nullable TKwcontinue */;
+short int var1 /* : Bool */;
+short int var2 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var4 /* : Bool */;
+short int var6 /* : Bool */;
+short int var7 /* : Bool */;
+int cltype;
+int idtype;
+const char* var_class_name;
+val* var8 /* : nullable ALabel */;
+short int var9 /* : Bool */;
+short int var10 /* : Bool */;
+short int var12 /* : Bool */;
+short int var14 /* : Bool */;
+short int var15 /* : Bool */;
+int cltype16;
+int idtype17;
+const char* var_class_name18;
+var_old_child = p0;
+var_new_child = p1;
+var = self->attrs[COLOR_nitc__parser_nodes__AContinueExpr___n_kwcontinue].val; /* _n_kwcontinue on <self:AContinueExpr> */
+if (var == NULL) {
+var1 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:nullable TKwcontinue> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:nullable TKwcontinue(TKwcontinue)> */
+var6 = var == var_other;
+var4 = var6;
+goto RET_LABEL5;
+RET_LABEL5:(void)0;
+}
+}
+var2 = var4;
+goto RET_LABEL3;
+RET_LABEL3:(void)0;
+}
+var1 = var2;
+}
+if (var1){
+/* <var_new_child:nullable ANode> isa nullable TKwcontinue */
+cltype = type_nullable__nitc__TKwcontinue.color;
+idtype = type_nullable__nitc__TKwcontinue.id;
+if(var_new_child == NULL) {
+var7 = 1;
+} else {
+if(cltype >= var_new_child->type->table_size) {
+var7 = 0;
+} else {
+var7 = var_new_child->type->type_table[cltype] == idtype;
+}
+}
+if (unlikely(!var7)) {
+var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwcontinue", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2826);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AContinueExpr___n_kwcontinue_61d(self, var_new_child); /* Direct call parser_prod#AContinueExpr#n_kwcontinue= on <self:AContinueExpr>*/
+}
+goto RET_LABEL;
+} else {
+}
+var8 = self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:AContinueExpr> */
+if (var8 == NULL) {
+var9 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var8,var_old_child) on <var8:nullable ALabel> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var8,var_other) on <var8:nullable ALabel(ALabel)> */
+var14 = var8 == var_other;
+var12 = var14;
+goto RET_LABEL13;
+RET_LABEL13:(void)0;
+}
+}
+var10 = var12;
+goto RET_LABEL11;
+RET_LABEL11:(void)0;
+}
+var9 = var10;
+}
+if (var9){
+/* <var_new_child:nullable ANode> isa nullable ALabel */
+cltype16 = type_nullable__nitc__ALabel.color;
+idtype17 = type_nullable__nitc__ALabel.id;
+if(var_new_child == NULL) {
+var15 = 1;
+} else {
+if(cltype16 >= var_new_child->type->table_size) {
+var15 = 0;
+} else {
+var15 = var_new_child->type->type_table[cltype16] == idtype17;
+}
+}
+if (unlikely(!var15)) {
+var_class_name18 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable ALabel", var_class_name18);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2830);
+fatal_exit(1);
+}
+{
+nitc__parser_prod___AContinueExpr___nitc__parser_nodes__ALabelable__n_label_61d(self, var_new_child); /* Direct call parser_prod#AContinueExpr#n_label= on <self:AContinueExpr>*/
+}
+goto RET_LABEL;
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#AContinueExpr#n_kwcontinue= for (self: AContinueExpr, nullable TKwcontinue) */
+void nitc__parser_prod___AContinueExpr___n_kwcontinue_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TKwcontinue */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AContinueExpr___n_kwcontinue].val = var_node; /* _n_kwcontinue on <self:AContinueExpr> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwcontinue> */
+var_other = ((val*)NULL);
+{
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwcontinue(TKwcontinue)>*/
+}
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+var = var1;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwcontinue(TKwcontinue)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwcontinue(TKwcontinue)> */
+RET_LABEL5:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#AContinueExpr#n_label= for (self: AContinueExpr, nullable ALabel) */
+void nitc__parser_prod___AContinueExpr___nitc__parser_nodes__ALabelable__n_label_61d(val* self, val* p0) {
+val* var_node /* var node: nullable ALabel */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val = var_node; /* _n_label on <self:AContinueExpr> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable ALabel> */
+var_other = ((val*)NULL);
+{
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ALabel(ALabel)>*/
+}
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+var = var1;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable ALabel(ALabel)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ALabel(ALabel)> */
+RET_LABEL5:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#AContinueExpr#visit_all for (self: AContinueExpr, Visitor) */
+void nitc__parser_prod___AContinueExpr___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
+val* var_v /* var v: Visitor */;
+val* var /* : nullable TKwcontinue */;
+val* var1 /* : nullable ALabel */;
+var_v = p0;
+var = self->attrs[COLOR_nitc__parser_nodes__AContinueExpr___n_kwcontinue].val; /* _n_kwcontinue on <self:AContinueExpr> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+var1 = self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:AContinueExpr> */
+{
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+}
+RET_LABEL:;
+}
+/* method parser_prod#ADoExpr#init_adoexpr for (self: ADoExpr, nullable TKwdo, nullable AExpr, nullable ALabel) */
+void nitc__parser_prod___ADoExpr___init_adoexpr(val* self, val* p0, val* p1, val* p2) {
+val* var_n_kwdo /* var n_kwdo: nullable TKwdo */;
+val* var_n_block /* var n_block: nullable AExpr */;
+val* var_n_label /* var n_label: nullable ALabel */;
+short int var /* : Bool */;
+short int var3 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var5 /* : Bool */;
+short int var6 /* : Bool */;
+short int var8 /* : Bool */;
+short int var9 /* : Bool */;
+short int var11 /* : Bool */;
+short int var12 /* : Bool */;
+{
+{ /* Inline kernel#Object#init (self) on <self:ADoExpr> */
+RET_LABEL1:(void)0;
+}
+}
+var_n_kwdo = p0;
+var_n_block = p1;
+var_n_label = p2;
+if (unlikely(var_n_kwdo == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Cast failed");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2860);
+fatal_exit(1);
+}
+self->attrs[COLOR_nitc__parser_nodes__ADoExpr___n_kwdo].val = var_n_kwdo; /* _n_kwdo on <self:ADoExpr> */
+if (var_n_kwdo == NULL) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2861);
+fatal_exit(1);
+} else {
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwdo,self) on <var_n_kwdo:nullable TKwdo> */
+if (unlikely(var_n_kwdo == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Receiver is null");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
+fatal_exit(1);
+}
+var_n_kwdo->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwdo:nullable TKwdo> */
+RET_LABEL2:(void)0;
+}
+}
+self->attrs[COLOR_nitc__parser_nodes__ADoExpr___n_block].val = var_n_block; /* _n_block on <self:ADoExpr> */
+if (var_n_block == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_block,((val*)NULL)) on <var_n_block:nullable AExpr> */
+var_other = ((val*)NULL);
+{
+var5 = ((short int(*)(val* self, val* p0))(var_n_block->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_block, var_other); /* == on <var_n_block:nullable AExpr(AExpr)>*/
+}
+var6 = !var5;
+var3 = var6;
+goto RET_LABEL4;
+RET_LABEL4:(void)0;
+}
+var = var3;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_block,self) on <var_n_block:nullable AExpr(AExpr)> */
+var_n_block->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_block:nullable AExpr(AExpr)> */
+RET_LABEL7:(void)0;
+}
+}
+} else {
+}
+self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val = var_n_label; /* _n_label on <self:ADoExpr> */
+if (var_n_label == NULL) {
+var8 = 0; /* is null */
+} else {
+var8 = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_label,((val*)NULL)) on <var_n_label:nullable ALabel> */
+var_other = ((val*)NULL);
+{
+var11 = ((short int(*)(val* self, val* p0))(var_n_label->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_label, var_other); /* == on <var_n_label:nullable ALabel(ALabel)>*/
+}
+var12 = !var11;
+var9 = var12;
+goto RET_LABEL10;
+RET_LABEL10:(void)0;
+}
+var8 = var9;
+}
+if (var8){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_label,self) on <var_n_label:nullable ALabel(ALabel)> */
+var_n_label->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_label:nullable ALabel(ALabel)> */
+RET_LABEL13:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#ADoExpr#replace_child for (self: ADoExpr, ANode, nullable ANode) */
+void nitc__parser_prod___ADoExpr___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+val* var_old_child /* var old_child: ANode */;
+val* var_new_child /* var new_child: nullable ANode */;
+val* var /* : TKwdo */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var5 /* : Bool */;
+short int var6 /* : Bool */;
+int cltype;
+int idtype;
+const char* var_class_name;
+val* var7 /* : nullable AExpr */;
+short int var8 /* : Bool */;
+short int var9 /* : Bool */;
+short int var11 /* : Bool */;
+short int var13 /* : Bool */;
+short int var14 /* : Bool */;
+int cltype15;
+int idtype16;
+const char* var_class_name17;
+val* var18 /* : nullable ALabel */;
+short int var19 /* : Bool */;
+short int var20 /* : Bool */;
+short int var22 /* : Bool */;
+short int var24 /* : Bool */;
+short int var25 /* : Bool */;
+int cltype26;
+int idtype27;
+const char* var_class_name28;
+var_old_child = p0;
+var_new_child = p1;
+var = self->attrs[COLOR_nitc__parser_nodes__ADoExpr___n_kwdo].val; /* _n_kwdo on <self:ADoExpr> */
+if (unlikely(var == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwdo");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2870);
+fatal_exit(1);
+}
+{
+{ /* Inline kernel#Object#== (var,var_old_child) on <var:TKwdo> */
+var_other = var_old_child;
+{
+{ /* Inline kernel#Object#is_same_instance (var,var_other) on <var:TKwdo> */
+var5 = var == var_other;
+var3 = var5;
+goto RET_LABEL4;
+RET_LABEL4:(void)0;
+}
+}
+var1 = var3;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+}
+if (var1){
+/* <var_new_child:nullable ANode> isa TKwdo */
+cltype = type_nitc__TKwdo.color;
+idtype = type_nitc__TKwdo.id;
+if(var_new_child == NULL) {
+var6 = 0;
 } else {
-var45 = var_new_child->type->type_table[cltype46] == idtype47;
+if(cltype >= var_new_child->type->table_size) {
+var6 = 0;
+} else {
+var6 = var_new_child->type->type_table[cltype] == idtype;
 }
 }
-if (unlikely(!var45)) {
-var_class_name48 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwelse", var_class_name48);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2867);
+if (unlikely(!var6)) {
+var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwdo", var_class_name);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2871);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfExpr___n_kwelse_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_kwelse= on <self:AIfExpr>*/
+nitc__parser_prod___ADoExpr___n_kwdo_61d(self, var_new_child); /* Direct call parser_prod#ADoExpr#n_kwdo= on <self:ADoExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var49 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_else].val; /* _n_else on <self:AIfExpr> */
-if (var49 == NULL) {
-var50 = 0; /* <var_old_child:ANode> cannot be null */
+var7 = self->attrs[COLOR_nitc__parser_nodes__ADoExpr___n_block].val; /* _n_block on <self:ADoExpr> */
+if (var7 == NULL) {
+var8 = 0; /* <var_old_child:ANode> cannot be null */
 } else {
-{ /* Inline kernel#Object#== (var49,var_old_child) on <var49:nullable AExpr> */
+{ /* Inline kernel#Object#== (var7,var_old_child) on <var7:nullable AExpr> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var49,var_other) on <var49:nullable AExpr(AExpr)> */
-var55 = var49 == var_other;
-var53 = var55;
-goto RET_LABEL54;
-RET_LABEL54:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var7,var_other) on <var7:nullable AExpr(AExpr)> */
+var13 = var7 == var_other;
+var11 = var13;
+goto RET_LABEL12;
+RET_LABEL12:(void)0;
 }
 }
-var51 = var53;
-goto RET_LABEL52;
-RET_LABEL52:(void)0;
+var9 = var11;
+goto RET_LABEL10;
+RET_LABEL10:(void)0;
 }
-var50 = var51;
+var8 = var9;
 }
-if (var50){
+if (var8){
 /* <var_new_child:nullable ANode> isa nullable AExpr */
-cltype57 = type_nullable__nit__AExpr.color;
-idtype58 = type_nullable__nit__AExpr.id;
+cltype15 = type_nullable__nitc__AExpr.color;
+idtype16 = type_nullable__nitc__AExpr.id;
 if(var_new_child == NULL) {
-var56 = 1;
+var14 = 1;
 } else {
-if(cltype57 >= var_new_child->type->table_size) {
-var56 = 0;
+if(cltype15 >= var_new_child->type->table_size) {
+var14 = 0;
 } else {
-var56 = var_new_child->type->type_table[cltype57] == idtype58;
+var14 = var_new_child->type->type_table[cltype15] == idtype16;
 }
 }
-if (unlikely(!var56)) {
-var_class_name59 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name59);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2871);
+if (unlikely(!var14)) {
+var_class_name17 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name17);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2875);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfExpr___n_else_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_else= on <self:AIfExpr>*/
+nitc__parser_prod___ADoExpr___n_block_61d(self, var_new_child); /* Direct call parser_prod#ADoExpr#n_block= on <self:ADoExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-RET_LABEL:;
-}
-/* method parser_prod#AIfExpr#n_kwif= for (self: AIfExpr, TKwif) */
-void nit__parser_prod___AIfExpr___n_kwif_61d(val* self, val* p0) {
-val* var_node /* var node: TKwif */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwif].val = var_node; /* _n_kwif on <self:AIfExpr> */
+var18 = self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:ADoExpr> */
+if (var18 == NULL) {
+var19 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var18,var_old_child) on <var18:nullable ALabel> */
+var_other = var_old_child;
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwif> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwif> */
-RET_LABEL1:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var18,var_other) on <var18:nullable ALabel(ALabel)> */
+var24 = var18 == var_other;
+var22 = var24;
+goto RET_LABEL23;
+RET_LABEL23:(void)0;
 }
 }
-RET_LABEL:;
+var20 = var22;
+goto RET_LABEL21;
+RET_LABEL21:(void)0;
+}
+var19 = var20;
+}
+if (var19){
+/* <var_new_child:nullable ANode> isa nullable ALabel */
+cltype26 = type_nullable__nitc__ALabel.color;
+idtype27 = type_nullable__nitc__ALabel.id;
+if(var_new_child == NULL) {
+var25 = 1;
+} else {
+if(cltype26 >= var_new_child->type->table_size) {
+var25 = 0;
+} else {
+var25 = var_new_child->type->type_table[cltype26] == idtype27;
+}
+}
+if (unlikely(!var25)) {
+var_class_name28 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable ALabel", var_class_name28);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2879);
+fatal_exit(1);
 }
-/* method parser_prod#AIfExpr#n_expr= for (self: AIfExpr, AExpr) */
-void nit__parser_prod___AIfExpr___n_expr_61d(val* self, val* p0) {
-val* var_node /* var node: AExpr */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_expr].val = var_node; /* _n_expr on <self:AIfExpr> */
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:AExpr> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:AExpr> */
-RET_LABEL1:(void)0;
+nitc__parser_prod___ADoExpr___nitc__parser_nodes__ALabelable__n_label_61d(self, var_new_child); /* Direct call parser_prod#ADoExpr#n_label= on <self:ADoExpr>*/
 }
+goto RET_LABEL;
+} else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AIfExpr#n_kwthen= for (self: AIfExpr, TKwthen) */
-void nit__parser_prod___AIfExpr___n_kwthen_61d(val* self, val* p0) {
-val* var_node /* var node: TKwthen */;
+/* method parser_prod#ADoExpr#n_kwdo= for (self: ADoExpr, TKwdo) */
+void nitc__parser_prod___ADoExpr___n_kwdo_61d(val* self, val* p0) {
+val* var_node /* var node: TKwdo */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwthen].val = var_node; /* _n_kwthen on <self:AIfExpr> */
+self->attrs[COLOR_nitc__parser_nodes__ADoExpr___n_kwdo].val = var_node; /* _n_kwdo on <self:ADoExpr> */
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwthen> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwthen> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwdo> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwdo> */
 RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
 }
-/* method parser_prod#AIfExpr#n_then= for (self: AIfExpr, nullable AExpr) */
-void nit__parser_prod___AIfExpr___n_then_61d(val* self, val* p0) {
+/* method parser_prod#ADoExpr#n_block= for (self: ADoExpr, nullable AExpr) */
+void nitc__parser_prod___ADoExpr___n_block_61d(val* self, val* p0) {
 val* var_node /* var node: nullable AExpr */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
@@ -9353,7 +9209,7 @@ val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_then].val = var_node; /* _n_then on <self:AIfExpr> */
+self->attrs[COLOR_nitc__parser_nodes__ADoExpr___n_block].val = var_node; /* _n_block on <self:ADoExpr> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
@@ -9363,7 +9219,7 @@ if (0) {
 { /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AExpr> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -9375,46 +9231,7 @@ var = var1;
 if (var){
 {
 { /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AExpr(AExpr)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
-RET_LABEL5:(void)0;
-}
-}
-} else {
-}
-RET_LABEL:;
-}
-/* method parser_prod#AIfExpr#n_kwelse= for (self: AIfExpr, nullable TKwelse) */
-void nit__parser_prod___AIfExpr___n_kwelse_61d(val* self, val* p0) {
-val* var_node /* var node: nullable TKwelse */;
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-val* var_other /* var other: nullable Object */;
-short int var3 /* : Bool */;
-short int var4 /* : Bool */;
-var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwelse].val = var_node; /* _n_kwelse on <self:AIfExpr> */
-if (var_node == NULL) {
-var = 0; /* is null */
-} else {
-var = 1; /* arg is null and recv is not */
-}
-if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwelse> */
-var_other = ((val*)NULL);
-{
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwelse(TKwelse)>*/
-}
-var4 = !var3;
-var1 = var4;
-goto RET_LABEL2;
-RET_LABEL2:(void)0;
-}
-var = var1;
-}
-if (var){
-{
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwelse(TKwelse)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwelse(TKwelse)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -9422,26 +9239,26 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AIfExpr#n_else= for (self: AIfExpr, nullable AExpr) */
-void nit__parser_prod___AIfExpr___n_else_61d(val* self, val* p0) {
-val* var_node /* var node: nullable AExpr */;
+/* method parser_prod#ADoExpr#n_label= for (self: ADoExpr, nullable ALabel) */
+void nitc__parser_prod___ADoExpr___nitc__parser_nodes__ALabelable__n_label_61d(val* self, val* p0) {
+val* var_node /* var node: nullable ALabel */;
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var3 /* : Bool */;
 short int var4 /* : Bool */;
 var_node = p0;
-self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_else].val = var_node; /* _n_else on <self:AIfExpr> */
+self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val = var_node; /* _n_label on <self:ADoExpr> */
 if (var_node == NULL) {
 var = 0; /* is null */
 } else {
 var = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AExpr> */
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable ALabel> */
 var_other = ((val*)NULL);
 {
-var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_standard__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable ALabel(ALabel)>*/
 }
 var4 = !var3;
 var1 = var4;
@@ -9452,8 +9269,8 @@ var = var1;
 }
 if (var){
 {
-{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AExpr(AExpr)> */
-var_node->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable ALabel(ALabel)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable ALabel(ALabel)> */
 RET_LABEL5:(void)0;
 }
 }
@@ -9461,67 +9278,55 @@ RET_LABEL5:(void)0;
 }
 RET_LABEL:;
 }
-/* method parser_prod#AIfExpr#visit_all for (self: AIfExpr, Visitor) */
-void nit__parser_prod___AIfExpr___nit__parser_nodes__ANode__visit_all(val* self, val* p0) {
+/* method parser_prod#ADoExpr#visit_all for (self: ADoExpr, Visitor) */
+void nitc__parser_prod___ADoExpr___nitc__parser_nodes__ANode__visit_all(val* self, val* p0) {
 val* var_v /* var v: Visitor */;
-val* var /* : TKwif */;
-val* var1 /* : AExpr */;
-val* var2 /* : TKwthen */;
-val* var3 /* : nullable AExpr */;
-val* var4 /* : nullable TKwelse */;
-val* var5 /* : nullable AExpr */;
+val* var /* : TKwdo */;
+val* var1 /* : nullable AExpr */;
+val* var2 /* : nullable ALabel */;
 var_v = p0;
-var = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwif].val; /* _n_kwif on <self:AIfExpr> */
+var = self->attrs[COLOR_nitc__parser_nodes__ADoExpr___n_kwdo].val; /* _n_kwdo on <self:ADoExpr> */
 if (unlikely(var == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwif");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2910);
-fatal_exit(1);
-}
-{
-nit___nit__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var1 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_expr].val; /* _n_expr on <self:AIfExpr> */
-if (unlikely(var1 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2911);
-fatal_exit(1);
-}
-{
-nit___nit__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var2 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwthen].val; /* _n_kwthen on <self:AIfExpr> */
-if (unlikely(var2 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwthen");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2912);
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwdo");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2903);
 fatal_exit(1);
 }
 {
-nit___nit__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
-}
-var3 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_then].val; /* _n_then on <self:AIfExpr> */
-{
-nit___nit__Visitor___enter_visit(var_v, var3); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var4 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_kwelse].val; /* _n_kwelse on <self:AIfExpr> */
+var1 = self->attrs[COLOR_nitc__parser_nodes__ADoExpr___n_block].val; /* _n_block on <self:ADoExpr> */
 {
-nit___nit__Visitor___enter_visit(var_v, var4); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var1); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
-var5 = self->attrs[COLOR_nit__parser_nodes__AIfExpr___n_else].val; /* _n_else on <self:AIfExpr> */
+var2 = self->attrs[COLOR_nitc__parser_nodes__ALabelable___n_label].val; /* _n_label on <self:ADoExpr> */
 {
-nit___nit__Visitor___enter_visit(var_v, var5); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
+nitc___nitc__Visitor___enter_visit(var_v, var2); /* Direct call parser_nodes#Visitor#enter_visit on <var_v:Visitor>*/
 }
 RET_LABEL:;
 }
-/* method parser_prod#AIfexprExpr#init_aifexprexpr for (self: AIfexprExpr, nullable TKwif, nullable AExpr, nullable TKwthen, nullable AExpr, nullable TKwelse, nullable AExpr) */
-void nit__parser_prod___AIfexprExpr___init_aifexprexpr(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5) {
+/* method parser_prod#AIfExpr#init_aifexpr for (self: AIfExpr, nullable TKwif, nullable AExpr, nullable TKwthen, nullable AExpr, nullable TKwelse, nullable AExpr) */
+void nitc__parser_prod___AIfExpr___init_aifexpr(val* self, val* p0, val* p1, val* p2, val* p3, val* p4, val* p5) {
 val* var_n_kwif /* var n_kwif: nullable TKwif */;
 val* var_n_expr /* var n_expr: nullable AExpr */;
 val* var_n_kwthen /* var n_kwthen: nullable TKwthen */;
 val* var_n_then /* var n_then: nullable AExpr */;
 val* var_n_kwelse /* var n_kwelse: nullable TKwelse */;
 val* var_n_else /* var n_else: nullable AExpr */;
+short int var /* : Bool */;
+short int var5 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var7 /* : Bool */;
+short int var8 /* : Bool */;
+short int var10 /* : Bool */;
+short int var11 /* : Bool */;
+short int var13 /* : Bool */;
+short int var14 /* : Bool */;
+short int var16 /* : Bool */;
+short int var17 /* : Bool */;
+short int var19 /* : Bool */;
+short int var20 /* : Bool */;
 {
-{ /* Inline kernel#Object#init (self) on <self:AIfexprExpr> */
+{ /* Inline kernel#Object#init (self) on <self:AIfExpr> */
 RET_LABEL1:(void)0;
 }
 }
@@ -9533,134 +9338,155 @@ var_n_kwelse = p4;
 var_n_else = p5;
 if (unlikely(var_n_kwif == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2928);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2918);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_kwif].val = var_n_kwif; /* _n_kwif on <self:AIfexprExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwif].val = var_n_kwif; /* _n_kwif on <self:AIfExpr> */
 if (var_n_kwif == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2929);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2919);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_kwif,self) on <var_n_kwif:nullable TKwif> */
 if (unlikely(var_n_kwif == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_kwif->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwif:nullable TKwif> */
+var_n_kwif->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwif:nullable TKwif> */
 RET_LABEL2:(void)0;
 }
 }
 if (unlikely(var_n_expr == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2930);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2920);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_expr].val = var_n_expr; /* _n_expr on <self:AIfexprExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_expr].val = var_n_expr; /* _n_expr on <self:AIfExpr> */
 if (var_n_expr == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2931);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2921);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_expr,self) on <var_n_expr:nullable AExpr> */
 if (unlikely(var_n_expr == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_expr->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_expr:nullable AExpr> */
+var_n_expr->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_expr:nullable AExpr> */
 RET_LABEL3:(void)0;
 }
 }
 if (unlikely(var_n_kwthen == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2932);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2922);
 fatal_exit(1);
 }
-self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_kwthen].val = var_n_kwthen; /* _n_kwthen on <self:AIfexprExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwthen].val = var_n_kwthen; /* _n_kwthen on <self:AIfExpr> */
 if (var_n_kwthen == NULL) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2933);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2923);
 fatal_exit(1);
 } else {
 { /* Inline parser_nodes#ANode#parent= (var_n_kwthen,self) on <var_n_kwthen:nullable TKwthen> */
 if (unlikely(var_n_kwthen == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_nodes, 46);
 fatal_exit(1);
 }
-var_n_kwthen->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwthen:nullable TKwthen> */
+var_n_kwthen->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwthen:nullable TKwthen> */
 RET_LABEL4:(void)0;
 }
 }
-if (unlikely(var_n_then == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2934);
-fatal_exit(1);
-}
-self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_then].val = var_n_then; /* _n_then on <self:AIfexprExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_then].val = var_n_then; /* _n_then on <self:AIfExpr> */
 if (var_n_then == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2935);
-fatal_exit(1);
+var = 0; /* is null */
 } else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_then,self) on <var_n_then:nullable AExpr> */
-if (unlikely(var_n_then == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
-fatal_exit(1);
+var = 1; /* arg is null and recv is not */
 }
-var_n_then->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_then:nullable AExpr> */
-RET_LABEL5:(void)0;
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_then,((val*)NULL)) on <var_n_then:nullable AExpr> */
+var_other = ((val*)NULL);
+{
+var7 = ((short int(*)(val* self, val* p0))(var_n_then->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_then, var_other); /* == on <var_n_then:nullable AExpr(AExpr)>*/
+}
+var8 = !var7;
+var5 = var8;
+goto RET_LABEL6;
+RET_LABEL6:(void)0;
 }
+var = var5;
 }
-if (unlikely(var_n_kwelse == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2936);
-fatal_exit(1);
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_then,self) on <var_n_then:nullable AExpr(AExpr)> */
+var_n_then->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_then:nullable AExpr(AExpr)> */
+RET_LABEL9:(void)0;
+}
+}
+} else {
 }
-self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_kwelse].val = var_n_kwelse; /* _n_kwelse on <self:AIfexprExpr> */
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwelse].val = var_n_kwelse; /* _n_kwelse on <self:AIfExpr> */
 if (var_n_kwelse == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2937);
-fatal_exit(1);
+var10 = 0; /* is null */
 } else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_kwelse,self) on <var_n_kwelse:nullable TKwelse> */
-if (unlikely(var_n_kwelse == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
-fatal_exit(1);
+var10 = 1; /* arg is null and recv is not */
 }
-var_n_kwelse->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwelse:nullable TKwelse> */
-RET_LABEL6:(void)0;
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_kwelse,((val*)NULL)) on <var_n_kwelse:nullable TKwelse> */
+var_other = ((val*)NULL);
+{
+var13 = ((short int(*)(val* self, val* p0))(var_n_kwelse->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_kwelse, var_other); /* == on <var_n_kwelse:nullable TKwelse(TKwelse)>*/
 }
+var14 = !var13;
+var11 = var14;
+goto RET_LABEL12;
+RET_LABEL12:(void)0;
 }
-if (unlikely(var_n_else == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Cast failed");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2938);
-fatal_exit(1);
+var10 = var11;
+}
+if (var10){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_kwelse,self) on <var_n_kwelse:nullable TKwelse(TKwelse)> */
+var_n_kwelse->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_kwelse:nullable TKwelse(TKwelse)> */
+RET_LABEL15:(void)0;
+}
+}
+} else {
+}
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_else].val = var_n_else; /* _n_else on <self:AIfExpr> */
+if (var_n_else == NULL) {
+var16 = 0; /* is null */
+} else {
+var16 = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_n_else,((val*)NULL)) on <var_n_else:nullable AExpr> */
+var_other = ((val*)NULL);
+{
+var19 = ((short int(*)(val* self, val* p0))(var_n_else->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_n_else, var_other); /* == on <var_n_else:nullable AExpr(AExpr)>*/
+}
+var20 = !var19;
+var17 = var20;
+goto RET_LABEL18;
+RET_LABEL18:(void)0;
+}
+var16 = var17;
 }
-self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_else].val = var_n_else; /* _n_else on <self:AIfexprExpr> */
-if (var_n_else == NULL) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2939);
-fatal_exit(1);
-} else {
-{ /* Inline parser_nodes#ANode#parent= (var_n_else,self) on <var_n_else:nullable AExpr> */
-if (unlikely(var_n_else == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Receiver is null");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_nodes, 46);
-fatal_exit(1);
+if (var16){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_n_else,self) on <var_n_else:nullable AExpr(AExpr)> */
+var_n_else->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_else:nullable AExpr(AExpr)> */
+RET_LABEL21:(void)0;
 }
-var_n_else->attrs[COLOR_nit__parser_nodes__ANode___parent].val = self; /* _parent on <var_n_else:nullable AExpr> */
-RET_LABEL7:(void)0;
 }
+} else {
 }
 RET_LABEL:;
 }
-/* method parser_prod#AIfexprExpr#replace_child for (self: AIfexprExpr, ANode, nullable ANode) */
-void nit__parser_prod___AIfexprExpr___nit__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
+/* method parser_prod#AIfExpr#replace_child for (self: AIfExpr, ANode, nullable ANode) */
+void nitc__parser_prod___AIfExpr___nitc__parser_nodes__ANode__replace_child(val* self, val* p0, val* p1) {
 val* var_old_child /* var old_child: ANode */;
 val* var_new_child /* var new_child: nullable ANode */;
 val* var /* : TKwif */;
@@ -9688,36 +9514,39 @@ short int var23 /* : Bool */;
 int cltype24;
 int idtype25;
 const char* var_class_name26;
-val* var27 /* : AExpr */;
+val* var27 /* : nullable AExpr */;
 short int var28 /* : Bool */;
-short int var30 /* : Bool */;
-short int var32 /* : Bool */;
+short int var29 /* : Bool */;
+short int var31 /* : Bool */;
 short int var33 /* : Bool */;
-int cltype34;
-int idtype35;
-const char* var_class_name36;
-val* var37 /* : TKwelse */;
-short int var38 /* : Bool */;
+short int var34 /* : Bool */;
+int cltype35;
+int idtype36;
+const char* var_class_name37;
+val* var38 /* : nullable TKwelse */;
+short int var39 /* : Bool */;
 short int var40 /* : Bool */;
 short int var42 /* : Bool */;
-short int var43 /* : Bool */;
-int cltype44;
-int idtype45;
-const char* var_class_name46;
-val* var47 /* : AExpr */;
-short int var48 /* : Bool */;
+short int var44 /* : Bool */;
+short int var45 /* : Bool */;
+int cltype46;
+int idtype47;
+const char* var_class_name48;
+val* var49 /* : nullable AExpr */;
 short int var50 /* : Bool */;
-short int var52 /* : Bool */;
+short int var51 /* : Bool */;
 short int var53 /* : Bool */;
-int cltype54;
-int idtype55;
-const char* var_class_name56;
+short int var55 /* : Bool */;
+short int var56 /* : Bool */;
+int cltype57;
+int idtype58;
+const char* var_class_name59;
 var_old_child = p0;
 var_new_child = p1;
-var = self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_kwif].val; /* _n_kwif on <self:AIfexprExpr> */
+var = self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwif].val; /* _n_kwif on <self:AIfExpr> */
 if (unlikely(var == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwif");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2944);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2934);
 fatal_exit(1);
 }
 {
@@ -9738,8 +9567,8 @@ RET_LABEL2:(void)0;
 }
 if (var1){
 /* <var_new_child:nullable ANode> isa TKwif */
-cltype = type_nit__TKwif.color;
-idtype = type_nit__TKwif.id;
+cltype = type_nitc__TKwif.color;
+idtype = type_nitc__TKwif.id;
 if(var_new_child == NULL) {
 var6 = 0;
 } else {
@@ -9752,19 +9581,19 @@ var6 = var_new_child->type->type_table[cltype] == idtype;
 if (unlikely(!var6)) {
 var_class_name = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwif", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2945);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2935);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfexprExpr___n_kwif_61d(self, var_new_child); /* Direct call parser_prod#AIfexprExpr#n_kwif= on <self:AIfexprExpr>*/
+nitc__parser_prod___AIfExpr___n_kwif_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_kwif= on <self:AIfExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var7 = self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_expr].val; /* _n_expr on <self:AIfexprExpr> */
+var7 = self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_expr].val; /* _n_expr on <self:AIfExpr> */
 if (unlikely(var7 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_expr");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2948);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2938);
 fatal_exit(1);
 }
 {
@@ -9785,8 +9614,8 @@ RET_LABEL9:(void)0;
 }
 if (var8){
 /* <var_new_child:nullable ANode> isa AExpr */
-cltype14 = type_nit__AExpr.color;
-idtype15 = type_nit__AExpr.id;
+cltype14 = type_nitc__AExpr.color;
+idtype15 = type_nitc__AExpr.id;
 if(var_new_child == NULL) {
 var13 = 0;
 } else {
@@ -9799,19 +9628,19 @@ var13 = var_new_child->type->type_table[cltype14] == idtype15;
 if (unlikely(!var13)) {
 var_class_name16 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "AExpr", var_class_name16);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2949);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2939);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfexprExpr___n_expr_61d(self, var_new_child); /* Direct call parser_prod#AIfexprExpr#n_expr= on <self:AIfexprExpr>*/
+nitc__parser_prod___AIfExpr___n_expr_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_expr= on <self:AIfExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var17 = self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_kwthen].val; /* _n_kwthen on <self:AIfexprExpr> */
+var17 = self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwthen].val; /* _n_kwthen on <self:AIfExpr> */
 if (unlikely(var17 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwthen");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2952);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2942);
 fatal_exit(1);
 }
 {
@@ -9832,8 +9661,8 @@ RET_LABEL19:(void)0;
 }
 if (var18){
 /* <var_new_child:nullable ANode> isa TKwthen */
-cltype24 = type_nit__TKwthen.color;
-idtype25 = type_nit__TKwthen.id;
+cltype24 = type_nitc__TKwthen.color;
+idtype25 = type_nitc__TKwthen.id;
 if(var_new_child == NULL) {
 var23 = 0;
 } else {
@@ -9846,155 +9675,305 @@ var23 = var_new_child->type->type_table[cltype24] == idtype25;
 if (unlikely(!var23)) {
 var_class_name26 = var_new_child == NULL ? "null" : var_new_child->type->name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwthen", var_class_name26);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2953);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2943);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfexprExpr___n_kwthen_61d(self, var_new_child); /* Direct call parser_prod#AIfexprExpr#n_kwthen= on <self:AIfexprExpr>*/
+nitc__parser_prod___AIfExpr___n_kwthen_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_kwthen= on <self:AIfExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var27 = self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_then].val; /* _n_then on <self:AIfexprExpr> */
-if (unlikely(var27 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_then");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2956);
-fatal_exit(1);
-}
-{
-{ /* Inline kernel#Object#== (var27,var_old_child) on <var27:AExpr> */
+var27 = self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_then].val; /* _n_then on <self:AIfExpr> */
+if (var27 == NULL) {
+var28 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var27,var_old_child) on <var27:nullable AExpr> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var27,var_other) on <var27:AExpr> */
-var32 = var27 == var_other;
-var30 = var32;
-goto RET_LABEL31;
-RET_LABEL31:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var27,var_other) on <var27:nullable AExpr(AExpr)> */
+var33 = var27 == var_other;
+var31 = var33;
+goto RET_LABEL32;
+RET_LABEL32:(void)0;
 }
 }
-var28 = var30;
-goto RET_LABEL29;
-RET_LABEL29:(void)0;
+var29 = var31;
+goto RET_LABEL30;
+RET_LABEL30:(void)0;
 }
+var28 = var29;
 }
 if (var28){
-/* <var_new_child:nullable ANode> isa AExpr */
-cltype34 = type_nit__AExpr.color;
-idtype35 = type_nit__AExpr.id;
+/* <var_new_child:nullable ANode> isa nullable AExpr */
+cltype35 = type_nullable__nitc__AExpr.color;
+idtype36 = type_nullable__nitc__AExpr.id;
 if(var_new_child == NULL) {
-var33 = 0;
+var34 = 1;
 } else {
-if(cltype34 >= var_new_child->type->table_size) {
-var33 = 0;
+if(cltype35 >= var_new_child->type->table_size) {
+var34 = 0;
 } else {
-var33 = var_new_child->type->type_table[cltype34] == idtype35;
+var34 = var_new_child->type->type_table[cltype35] == idtype36;
 }
 }
-if (unlikely(!var33)) {
-var_class_name36 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "AExpr", var_class_name36);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2957);
+if (unlikely(!var34)) {
+var_class_name37 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name37);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2947);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfexprExpr___n_then_61d(self, var_new_child); /* Direct call parser_prod#AIfexprExpr#n_then= on <self:AIfexprExpr>*/
+nitc__parser_prod___AIfExpr___n_then_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_then= on <self:AIfExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var37 = self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_kwelse].val; /* _n_kwelse on <self:AIfexprExpr> */
-if (unlikely(var37 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_kwelse");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2960);
-fatal_exit(1);
-}
-{
-{ /* Inline kernel#Object#== (var37,var_old_child) on <var37:TKwelse> */
+var38 = self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwelse].val; /* _n_kwelse on <self:AIfExpr> */
+if (var38 == NULL) {
+var39 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var38,var_old_child) on <var38:nullable TKwelse> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var37,var_other) on <var37:TKwelse> */
-var42 = var37 == var_other;
+{ /* Inline kernel#Object#is_same_instance (var38,var_other) on <var38:nullable TKwelse(TKwelse)> */
+var44 = var38 == var_other;
+var42 = var44;
+goto RET_LABEL43;
+RET_LABEL43:(void)0;
+}
+}
 var40 = var42;
 goto RET_LABEL41;
 RET_LABEL41:(void)0;
 }
+var39 = var40;
 }
-var38 = var40;
-goto RET_LABEL39;
-RET_LABEL39:(void)0;
-}
-}
-if (var38){
-/* <var_new_child:nullable ANode> isa TKwelse */
-cltype44 = type_nit__TKwelse.color;
-idtype45 = type_nit__TKwelse.id;
+if (var39){
+/* <var_new_child:nullable ANode> isa nullable TKwelse */
+cltype46 = type_nullable__nitc__TKwelse.color;
+idtype47 = type_nullable__nitc__TKwelse.id;
 if(var_new_child == NULL) {
-var43 = 0;
+var45 = 1;
 } else {
-if(cltype44 >= var_new_child->type->table_size) {
-var43 = 0;
+if(cltype46 >= var_new_child->type->table_size) {
+var45 = 0;
 } else {
-var43 = var_new_child->type->type_table[cltype44] == idtype45;
+var45 = var_new_child->type->type_table[cltype46] == idtype47;
 }
 }
-if (unlikely(!var43)) {
-var_class_name46 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "TKwelse", var_class_name46);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2961);
+if (unlikely(!var45)) {
+var_class_name48 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable TKwelse", var_class_name48);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2951);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfexprExpr___n_kwelse_61d(self, var_new_child); /* Direct call parser_prod#AIfexprExpr#n_kwelse= on <self:AIfexprExpr>*/
+nitc__parser_prod___AIfExpr___n_kwelse_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_kwelse= on <self:AIfExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
-var47 = self->attrs[COLOR_nit__parser_nodes__AIfexprExpr___n_else].val; /* _n_else on <self:AIfexprExpr> */
-if (unlikely(var47 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_else");
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2964);
-fatal_exit(1);
-}
-{
-{ /* Inline kernel#Object#== (var47,var_old_child) on <var47:AExpr> */
+var49 = self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_else].val; /* _n_else on <self:AIfExpr> */
+if (var49 == NULL) {
+var50 = 0; /* <var_old_child:ANode> cannot be null */
+} else {
+{ /* Inline kernel#Object#== (var49,var_old_child) on <var49:nullable AExpr> */
 var_other = var_old_child;
 {
-{ /* Inline kernel#Object#is_same_instance (var47,var_other) on <var47:AExpr> */
-var52 = var47 == var_other;
-var50 = var52;
-goto RET_LABEL51;
-RET_LABEL51:(void)0;
+{ /* Inline kernel#Object#is_same_instance (var49,var_other) on <var49:nullable AExpr(AExpr)> */
+var55 = var49 == var_other;
+var53 = var55;
+goto RET_LABEL54;
+RET_LABEL54:(void)0;
 }
 }
-var48 = var50;
-goto RET_LABEL49;
-RET_LABEL49:(void)0;
+var51 = var53;
+goto RET_LABEL52;
+RET_LABEL52:(void)0;
 }
+var50 = var51;
 }
-if (var48){
-/* <var_new_child:nullable ANode> isa AExpr */
-cltype54 = type_nit__AExpr.color;
-idtype55 = type_nit__AExpr.id;
+if (var50){
+/* <var_new_child:nullable ANode> isa nullable AExpr */
+cltype57 = type_nullable__nitc__AExpr.color;
+idtype58 = type_nullable__nitc__AExpr.id;
 if(var_new_child == NULL) {
-var53 = 0;
+var56 = 1;
 } else {
-if(cltype54 >= var_new_child->type->table_size) {
-var53 = 0;
+if(cltype57 >= var_new_child->type->table_size) {
+var56 = 0;
 } else {
-var53 = var_new_child->type->type_table[cltype54] == idtype55;
+var56 = var_new_child->type->type_table[cltype57] == idtype58;
 }
 }
-if (unlikely(!var53)) {
-var_class_name56 = var_new_child == NULL ? "null" : var_new_child->type->name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "AExpr", var_class_name56);
-PRINT_ERROR(" (%s:%d)\n", FILE_nit__parser_prod, 2965);
+if (unlikely(!var56)) {
+var_class_name59 = var_new_child == NULL ? "null" : var_new_child->type->name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "nullable AExpr", var_class_name59);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__parser_prod, 2955);
 fatal_exit(1);
 }
 {
-nit__parser_prod___AIfexprExpr___n_else_61d(self, var_new_child); /* Direct call parser_prod#AIfexprExpr#n_else= on <self:AIfexprExpr>*/
+nitc__parser_prod___AIfExpr___n_else_61d(self, var_new_child); /* Direct call parser_prod#AIfExpr#n_else= on <self:AIfExpr>*/
 }
 goto RET_LABEL;
 } else {
 }
 RET_LABEL:;
 }
+/* method parser_prod#AIfExpr#n_kwif= for (self: AIfExpr, TKwif) */
+void nitc__parser_prod___AIfExpr___n_kwif_61d(val* self, val* p0) {
+val* var_node /* var node: TKwif */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwif].val = var_node; /* _n_kwif on <self:AIfExpr> */
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwif> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwif> */
+RET_LABEL1:(void)0;
+}
+}
+RET_LABEL:;
+}
+/* method parser_prod#AIfExpr#n_expr= for (self: AIfExpr, AExpr) */
+void nitc__parser_prod___AIfExpr___n_expr_61d(val* self, val* p0) {
+val* var_node /* var node: AExpr */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_expr].val = var_node; /* _n_expr on <self:AIfExpr> */
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:AExpr> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:AExpr> */
+RET_LABEL1:(void)0;
+}
+}
+RET_LABEL:;
+}
+/* method parser_prod#AIfExpr#n_kwthen= for (self: AIfExpr, TKwthen) */
+void nitc__parser_prod___AIfExpr___n_kwthen_61d(val* self, val* p0) {
+val* var_node /* var node: TKwthen */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwthen].val = var_node; /* _n_kwthen on <self:AIfExpr> */
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:TKwthen> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:TKwthen> */
+RET_LABEL1:(void)0;
+}
+}
+RET_LABEL:;
+}
+/* method parser_prod#AIfExpr#n_then= for (self: AIfExpr, nullable AExpr) */
+void nitc__parser_prod___AIfExpr___n_then_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AExpr */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_then].val = var_node; /* _n_then on <self:AIfExpr> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AExpr> */
+var_other = ((val*)NULL);
+{
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
+}
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+var = var1;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AExpr(AExpr)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
+RET_LABEL5:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#AIfExpr#n_kwelse= for (self: AIfExpr, nullable TKwelse) */
+void nitc__parser_prod___AIfExpr___n_kwelse_61d(val* self, val* p0) {
+val* var_node /* var node: nullable TKwelse */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_kwelse].val = var_node; /* _n_kwelse on <self:AIfExpr> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable TKwelse> */
+var_other = ((val*)NULL);
+{
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable TKwelse(TKwelse)>*/
+}
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+var = var1;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable TKwelse(TKwelse)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable TKwelse(TKwelse)> */
+RET_LABEL5:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}
+/* method parser_prod#AIfExpr#n_else= for (self: AIfExpr, nullable AExpr) */
+void nitc__parser_prod___AIfExpr___n_else_61d(val* self, val* p0) {
+val* var_node /* var node: nullable AExpr */;
+short int var /* : Bool */;
+short int var1 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var3 /* : Bool */;
+short int var4 /* : Bool */;
+var_node = p0;
+self->attrs[COLOR_nitc__parser_nodes__AIfExpr___n_else].val = var_node; /* _n_else on <self:AIfExpr> */
+if (var_node == NULL) {
+var = 0; /* is null */
+} else {
+var = 1; /* arg is null and recv is not */
+}
+if (0) {
+{ /* Inline kernel#Object#!= (var_node,((val*)NULL)) on <var_node:nullable AExpr> */
+var_other = ((val*)NULL);
+{
+var3 = ((short int(*)(val* self, val* p0))(var_node->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_node, var_other); /* == on <var_node:nullable AExpr(AExpr)>*/
+}
+var4 = !var3;
+var1 = var4;
+goto RET_LABEL2;
+RET_LABEL2:(void)0;
+}
+var = var1;
+}
+if (var){
+{
+{ /* Inline parser_nodes#ANode#parent= (var_node,self) on <var_node:nullable AExpr(AExpr)> */
+var_node->attrs[COLOR_nitc__parser_nodes__ANode___parent].val = self; /* _parent on <var_node:nullable AExpr(AExpr)> */
+RET_LABEL5:(void)0;
+}
+}
+} else {
+}
+RET_LABEL:;
+}