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

diff --git a/c_src/literal.sep.1.c b/c_src/literal.sep.1.c
index a39625b..9a9fcf0 100644
--- a/c_src/literal.sep.1.c
+++ b/c_src/literal.sep.1.c
@@ -10,7 +10,7 @@ var_nmodule = p0;
 var2 = self->attrs[COLOR_phase__Phase___toolcontext].val; /* _toolcontext on <self:LiteralPhase> */
 if (unlikely(var2 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _toolcontext");
-PRINT_ERROR(" (%s:%d)\n", "src/phase.nit", 145);
+PRINT_ERROR(" (%s:%d)\n", "phase.nit", 162);
 show_backtrace(1);
 }
 var = var2;
@@ -55,7 +55,7 @@ val* var1 /* : ToolContext */;
 var1 = self->attrs[COLOR_literal__LiteralVisitor___toolcontext].val; /* _toolcontext on <self:LiteralVisitor> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _toolcontext");
-PRINT_ERROR(" (%s:%d)\n", "src/literal.nit", 47);
+PRINT_ERROR(" (%s:%d)\n", "literal.nit", 45);
 show_backtrace(1);
 }
 var = var1;
@@ -71,7 +71,7 @@ val* var3 /* : ToolContext */;
 var3 = self->attrs[COLOR_literal__LiteralVisitor___toolcontext].val; /* _toolcontext on <self:Object(LiteralVisitor)> */
 if (unlikely(var3 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _toolcontext");
-PRINT_ERROR(" (%s:%d)\n", "src/literal.nit", 47);
+PRINT_ERROR(" (%s:%d)\n", "literal.nit", 45);
 show_backtrace(1);
 }
 var1 = var3;
@@ -98,15 +98,13 @@ RET_LABEL:;
 void literal__LiteralVisitor__init(val* self, val* p0) {
 val* var_toolcontext /* var toolcontext: ToolContext */;
 {
-{ /* Inline parser_nodes#Visitor#init (self) on <self:LiteralVisitor> */
-RET_LABEL1:(void)0;
-}
+((void (*)(val*))(self->class->vft[COLOR_kernel__Object__init]))(self) /* init on <self:LiteralVisitor>*/;
 }
 var_toolcontext = p0;
 {
 { /* Inline literal#LiteralVisitor#toolcontext= (self,var_toolcontext) on <self:LiteralVisitor> */
 self->attrs[COLOR_literal__LiteralVisitor___toolcontext].val = var_toolcontext; /* _toolcontext on <self:LiteralVisitor> */
-RET_LABEL2:(void)0;
+RET_LABEL1:(void)0;
 }
 }
 RET_LABEL:;
@@ -188,24 +186,34 @@ RET_LABEL:;
 void literal__ADecIntExpr__accept_literal(val* self, val* p0) {
 val* var_v /* var v: LiteralVisitor */;
 val* var /* : TNumber */;
-val* var1 /* : String */;
-long var2 /* : Int */;
-val* var4 /* : nullable Int */;
+val* var2 /* : TNumber */;
+val* var3 /* : String */;
+long var4 /* : Int */;
+val* var6 /* : nullable Int */;
 var_v = p0;
 {
-var = parser_nodes__ADecIntExpr__n_number(self);
+{ /* Inline parser_nodes#ADecIntExpr#n_number (self) on <self:ADecIntExpr> */
+var2 = self->attrs[COLOR_parser_nodes__ADecIntExpr___n_number].val; /* _n_number on <self:ADecIntExpr> */
+if (unlikely(var2 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_number");
+PRINT_ERROR(" (%s:%d)\n", "parser/parser_nodes.nit", 1814);
+show_backtrace(1);
+}
+var = var2;
+RET_LABEL1:(void)0;
+}
 }
 {
-var1 = lexer_work__Token__text(var);
+var3 = lexer_work__Token__text(var);
 }
 {
-var2 = string__Text__to_i(var1);
+var4 = string__Text__to_i(var3);
 }
 {
-{ /* Inline literal#AIntExpr#value= (self,var2) on <self:ADecIntExpr> */
-var4 = BOX_kernel__Int(var2); /* autobox from Int to nullable Int */
-self->attrs[COLOR_literal__AIntExpr___value].val = var4; /* _value on <self:ADecIntExpr> */
-RET_LABEL3:(void)0;
+{ /* Inline literal#AIntExpr#value= (self,var4) on <self:ADecIntExpr> */
+var6 = BOX_kernel__Int(var4); /* autobox from Int to nullable Int */
+self->attrs[COLOR_literal__AIntExpr___value].val = var6; /* _value on <self:ADecIntExpr> */
+RET_LABEL5:(void)0;
 }
 }
 RET_LABEL:;
@@ -219,30 +227,40 @@ RET_LABEL:;
 void literal__AHexIntExpr__accept_literal(val* self, val* p0) {
 val* var_v /* var v: LiteralVisitor */;
 val* var /* : THexNumber */;
-val* var1 /* : String */;
-long var2 /* : Int */;
-val* var3 /* : Text */;
+val* var2 /* : THexNumber */;
+val* var3 /* : String */;
 long var4 /* : Int */;
-val* var6 /* : nullable Int */;
+val* var5 /* : Text */;
+long var6 /* : Int */;
+val* var8 /* : nullable Int */;
 var_v = p0;
 {
-var = parser_nodes__AHexIntExpr__n_hex_number(self);
+{ /* Inline parser_nodes#AHexIntExpr#n_hex_number (self) on <self:AHexIntExpr> */
+var2 = self->attrs[COLOR_parser_nodes__AHexIntExpr___n_hex_number].val; /* _n_hex_number on <self:AHexIntExpr> */
+if (unlikely(var2 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_hex_number");
+PRINT_ERROR(" (%s:%d)\n", "parser/parser_nodes.nit", 1819);
+show_backtrace(1);
+}
+var = var2;
+RET_LABEL1:(void)0;
+}
 }
 {
-var1 = lexer_work__Token__text(var);
+var3 = lexer_work__Token__text(var);
 }
-var2 = 2;
+var4 = 2;
 {
-var3 = string__Text__substring_from(var1, var2);
+var5 = string__Text__substring_from(var3, var4);
 }
 {
-var4 = string__Text__to_hex(var3);
+var6 = string__Text__to_hex(var5);
 }
 {
-{ /* Inline literal#AIntExpr#value= (self,var4) on <self:AHexIntExpr> */
-var6 = BOX_kernel__Int(var4); /* autobox from Int to nullable Int */
-self->attrs[COLOR_literal__AIntExpr___value].val = var6; /* _value on <self:AHexIntExpr> */
-RET_LABEL5:(void)0;
+{ /* Inline literal#AIntExpr#value= (self,var6) on <self:AHexIntExpr> */
+var8 = BOX_kernel__Int(var6); /* autobox from Int to nullable Int */
+self->attrs[COLOR_literal__AIntExpr___value].val = var8; /* _value on <self:AHexIntExpr> */
+RET_LABEL7:(void)0;
 }
 }
 RET_LABEL:;
@@ -269,24 +287,34 @@ RET_LABEL:;
 void literal__AFloatExpr__accept_literal(val* self, val* p0) {
 val* var_v /* var v: LiteralVisitor */;
 val* var /* : TFloat */;
-val* var1 /* : String */;
-double var2 /* : Float */;
-val* var4 /* : nullable Float */;
+val* var2 /* : TFloat */;
+val* var3 /* : String */;
+double var4 /* : Float */;
+val* var6 /* : nullable Float */;
 var_v = p0;
 {
-var = parser_nodes__AFloatExpr__n_float(self);
+{ /* Inline parser_nodes#AFloatExpr#n_float (self) on <self:AFloatExpr> */
+var2 = self->attrs[COLOR_parser_nodes__AFloatExpr___n_float].val; /* _n_float on <self:AFloatExpr> */
+if (unlikely(var2 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_float");
+PRINT_ERROR(" (%s:%d)\n", "parser/parser_nodes.nit", 1824);
+show_backtrace(1);
+}
+var = var2;
+RET_LABEL1:(void)0;
+}
 }
 {
-var1 = lexer_work__Token__text(var);
+var3 = lexer_work__Token__text(var);
 }
 {
-var2 = string__Text__to_f(var1);
+var4 = string__Text__to_f(var3);
 }
 {
-{ /* Inline literal#AFloatExpr#value= (self,var2) on <self:AFloatExpr> */
-var4 = BOX_kernel__Float(var2); /* autobox from Float to nullable Float */
-self->attrs[COLOR_literal__AFloatExpr___value].val = var4; /* _value on <self:AFloatExpr> */
-RET_LABEL3:(void)0;
+{ /* Inline literal#AFloatExpr#value= (self,var4) on <self:AFloatExpr> */
+var6 = BOX_kernel__Float(var4); /* autobox from Float to nullable Float */
+self->attrs[COLOR_literal__AFloatExpr___value].val = var6; /* _value on <self:AFloatExpr> */
+RET_LABEL5:(void)0;
 }
 }
 RET_LABEL:;
@@ -336,125 +364,135 @@ RET_LABEL:;
 void literal__ACharExpr__accept_literal(val* self, val* p0) {
 val* var_v /* var v: LiteralVisitor */;
 val* var /* : TChar */;
-val* var1 /* : String */;
-val* var2 /* : String */;
+val* var2 /* : TChar */;
+val* var3 /* : String */;
+val* var4 /* : String */;
 val* var_txt /* var txt: String */;
-long var3 /* : Int */;
 long var5 /* : Int */;
-long var6 /* : Int */;
-short int var7 /* : Bool */;
-short int var8 /* : Bool */;
+long var7 /* : Int */;
+long var8 /* : Int */;
+short int var9 /* : Bool */;
 short int var10 /* : Bool */;
-short int var11 /* : Bool */;
-val* var12 /* : ToolContext */;
+short int var12 /* : Bool */;
+short int var13 /* : Bool */;
 val* var14 /* : ToolContext */;
-val* var15 /* : Location */;
+val* var16 /* : ToolContext */;
+val* var17 /* : Location */;
 static val* varonce;
-val* var16 /* : String */;
-char* var17 /* : NativeString */;
-long var18 /* : Int */;
-val* var19 /* : FlatString */;
-val* var20 /* : Array[Object] */;
-long var21 /* : Int */;
-val* var22 /* : NativeArray[Object] */;
-val* var23 /* : String */;
-val* var24 /* : SequenceRead[Char] */;
+val* var18 /* : String */;
+char* var19 /* : NativeString */;
+long var20 /* : Int */;
+val* var21 /* : FlatString */;
+val* var22 /* : Array[Object] */;
+long var23 /* : Int */;
+val* var24 /* : NativeArray[Object] */;
+val* var25 /* : String */;
 val* var26 /* : SequenceRead[Char] */;
-long var27 /* : Int */;
-val* var28 /* : nullable Object */;
+val* var28 /* : SequenceRead[Char] */;
+long var29 /* : Int */;
+val* var30 /* : nullable Object */;
 var_v = p0;
 {
-var = parser_nodes__ACharExpr__n_char(self);
+{ /* Inline parser_nodes#ACharExpr#n_char (self) on <self:ACharExpr> */
+var2 = self->attrs[COLOR_parser_nodes__ACharExpr___n_char].val; /* _n_char on <self:ACharExpr> */
+if (unlikely(var2 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_char");
+PRINT_ERROR(" (%s:%d)\n", "parser/parser_nodes.nit", 1829);
+show_backtrace(1);
+}
+var = var2;
+RET_LABEL1:(void)0;
+}
 }
 {
-var1 = lexer_work__Token__text(var);
+var3 = lexer_work__Token__text(var);
 }
 {
-var2 = string__Text__unescape_nit(var1);
+var4 = string__Text__unescape_nit(var3);
 }
-var_txt = var2;
+var_txt = var4;
 {
 { /* Inline string#FlatText#length (var_txt) on <var_txt:String> */
-var5 = var_txt->attrs[COLOR_string__FlatText___length].l; /* _length on <var_txt:String> */
-var3 = var5;
-RET_LABEL4:(void)0;
+var7 = var_txt->attrs[COLOR_string__FlatText___length].l; /* _length on <var_txt:String> */
+var5 = var7;
+RET_LABEL6:(void)0;
 }
 }
-var6 = 3;
+var8 = 3;
 {
-{ /* Inline kernel#Int#!= (var3,var6) on <var3:Int> */
-var10 = var3 == var6;
-var11 = !var10;
-var8 = var11;
-goto RET_LABEL9;
-RET_LABEL9:(void)0;
+{ /* Inline kernel#Int#!= (var5,var8) on <var5:Int> */
+var12 = var5 == var8;
+var13 = !var12;
+var10 = var13;
+goto RET_LABEL11;
+RET_LABEL11:(void)0;
 }
-var7 = var8;
+var9 = var10;
 }
-if (var7){
+if (var9){
 {
 { /* Inline literal#LiteralVisitor#toolcontext (var_v) on <var_v:LiteralVisitor> */
-var14 = var_v->attrs[COLOR_literal__LiteralVisitor___toolcontext].val; /* _toolcontext on <var_v:LiteralVisitor> */
-if (unlikely(var14 == NULL)) {
+var16 = var_v->attrs[COLOR_literal__LiteralVisitor___toolcontext].val; /* _toolcontext on <var_v:LiteralVisitor> */
+if (unlikely(var16 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _toolcontext");
-PRINT_ERROR(" (%s:%d)\n", "src/literal.nit", 47);
+PRINT_ERROR(" (%s:%d)\n", "literal.nit", 45);
 show_backtrace(1);
 }
-var12 = var14;
-RET_LABEL13:(void)0;
+var14 = var16;
+RET_LABEL15:(void)0;
 }
 }
 {
-var15 = parser_nodes__ANode__hot_location(self);
+var17 = parser_nodes__ANode__hot_location(self);
 }
 if (varonce) {
-var16 = varonce;
+var18 = varonce;
 } else {
-var17 = "Invalid character literal ";
-var18 = 26;
-var19 = string__NativeString__to_s_with_length(var17, var18);
-var16 = var19;
-varonce = var16;
+var19 = "Invalid character literal ";
+var20 = 26;
+var21 = string__NativeString__to_s_with_length(var19, var20);
+var18 = var21;
+varonce = var18;
 }
-var20 = NEW_array__Array(&type_array__Arraykernel__Object);
-{ /* var20 = array_instance Array[Object] */
-var21 = 2;
-var22 = NEW_array__NativeArray(var21, &type_array__NativeArraykernel__Object);
-((struct instance_array__NativeArray*)var22)->values[0] = (val*) var16;
-((struct instance_array__NativeArray*)var22)->values[1] = (val*) var_txt;
+var22 = NEW_array__Array(&type_array__Arraykernel__Object);
+{ /* var22 = array_instance Array[Object] */
+var23 = 2;
+var24 = NEW_array__NativeArray(var23, &type_array__NativeArraykernel__Object);
+((struct instance_array__NativeArray*)var24)->values[0] = (val*) var18;
+((struct instance_array__NativeArray*)var24)->values[1] = (val*) var_txt;
 {
-((void (*)(val*, val*, long))(var20->class->vft[COLOR_array__Array__with_native]))(var20, var22, var21) /* with_native on <var20:Array[Object]>*/;
+((void (*)(val*, val*, long))(var22->class->vft[COLOR_array__Array__with_native]))(var22, var24, var23) /* with_native on <var22:Array[Object]>*/;
 }
 }
 {
-var23 = ((val* (*)(val*))(var20->class->vft[COLOR_string__Object__to_s]))(var20) /* to_s on <var20:Array[Object]>*/;
+var25 = ((val* (*)(val*))(var22->class->vft[COLOR_string__Object__to_s]))(var22) /* to_s on <var22:Array[Object]>*/;
 }
 {
-toolcontext__ToolContext__error(var12, var15, var23); /* Direct call toolcontext#ToolContext#error on <var12:ToolContext>*/
+toolcontext__ToolContext__error(var14, var17, var25); /* Direct call toolcontext#ToolContext#error on <var14:ToolContext>*/
 }
 goto RET_LABEL;
 } else {
 }
 {
 { /* Inline string#FlatString#chars (var_txt) on <var_txt:String> */
-var26 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
-if (unlikely(var26 == NULL)) {
+var28 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
+if (unlikely(var28 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _chars");
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/string.nit", 746);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/string.nit", 939);
 show_backtrace(1);
 }
-var24 = var26;
-RET_LABEL25:(void)0;
+var26 = var28;
+RET_LABEL27:(void)0;
 }
 }
-var27 = 1;
+var29 = 1;
 {
-var28 = ((val* (*)(val*, long))(var24->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var24, var27) /* [] on <var24:SequenceRead[Char]>*/;
+var30 = ((val* (*)(val*, long))(var26->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var26, var29) /* [] on <var26:SequenceRead[Char]>*/;
 }
 {
-{ /* Inline literal#ACharExpr#value= (self,var28) on <self:ACharExpr> */
-self->attrs[COLOR_literal__ACharExpr___value].val = var28; /* _value on <self:ACharExpr> */
-RET_LABEL29:(void)0;
+{ /* Inline literal#ACharExpr#value= (self,var30) on <self:ACharExpr> */
+self->attrs[COLOR_literal__ACharExpr___value].val = var30; /* _value on <self:ACharExpr> */
+RET_LABEL31:(void)0;
 }
 }
 RET_LABEL:;
@@ -504,286 +542,296 @@ RET_LABEL:;
 void literal__AStringFormExpr__accept_literal(val* self, val* p0) {
 val* var_v /* var v: LiteralVisitor */;
 val* var /* : Token */;
-val* var1 /* : String */;
+val* var2 /* : Token */;
+val* var3 /* : String */;
 val* var_txt /* var txt: String */;
-long var2 /* : Int */;
+long var4 /* : Int */;
 long var_behead /* var behead: Int */;
-long var3 /* : Int */;
+long var5 /* : Int */;
 long var_betail /* var betail: Int */;
-short int var4 /* : Bool */;
-val* var5 /* : SequenceRead[Char] */;
+short int var6 /* : Bool */;
 val* var7 /* : SequenceRead[Char] */;
-long var8 /* : Int */;
-val* var9 /* : nullable Object */;
-val* var10 /* : SequenceRead[Char] */;
+val* var9 /* : SequenceRead[Char] */;
+long var10 /* : Int */;
+val* var11 /* : nullable Object */;
 val* var12 /* : SequenceRead[Char] */;
-long var13 /* : Int */;
-val* var14 /* : nullable Object */;
-short int var15 /* : Bool */;
-short int var16 /* : Bool */;
+val* var14 /* : SequenceRead[Char] */;
+long var15 /* : Int */;
+val* var16 /* : nullable Object */;
+short int var17 /* : Bool */;
 short int var18 /* : Bool */;
+short int var20 /* : Bool */;
 short int var_ /* var : Bool */;
-long var19 /* : Int */;
 long var21 /* : Int */;
-long var22 /* : Int */;
-short int var23 /* : Bool */;
+long var23 /* : Int */;
+long var24 /* : Int */;
 short int var25 /* : Bool */;
+short int var27 /* : Bool */;
 int cltype;
 int idtype;
 const char* var_class_name;
-short int var26 /* : Bool */;
-long var27 /* : Int */;
-long var28 /* : Int */;
-short int var29 /* : Bool */;
-val* var30 /* : SequenceRead[Char] */;
+short int var28 /* : Bool */;
+long var29 /* : Int */;
+long var30 /* : Int */;
+short int var31 /* : Bool */;
 val* var32 /* : SequenceRead[Char] */;
-long var33 /* : Int */;
-val* var34 /* : nullable Object */;
-char var35 /* : Char */;
-short int var36 /* : Bool */;
-short int var37 /* : Bool */;
+val* var34 /* : SequenceRead[Char] */;
+long var35 /* : Int */;
+val* var36 /* : nullable Object */;
+char var37 /* : Char */;
+short int var38 /* : Bool */;
 short int var39 /* : Bool */;
-char var40 /* : Char */;
-short int var_41 /* var : Bool */;
-val* var42 /* : SequenceRead[Char] */;
+short int var41 /* : Bool */;
+char var42 /* : Char */;
+short int var_43 /* var : Bool */;
 val* var44 /* : SequenceRead[Char] */;
-long var45 /* : Int */;
-val* var46 /* : nullable Object */;
-char var47 /* : Char */;
-short int var48 /* : Bool */;
-short int var49 /* : Bool */;
+val* var46 /* : SequenceRead[Char] */;
+long var47 /* : Int */;
+val* var48 /* : nullable Object */;
+char var49 /* : Char */;
+short int var50 /* : Bool */;
 short int var51 /* : Bool */;
-char var52 /* : Char */;
-long var53 /* : Int */;
-long var54 /* : Int */;
+short int var53 /* : Bool */;
+char var54 /* : Char */;
+long var55 /* : Int */;
 long var56 /* : Int */;
-long var57 /* : Int */;
-short int var59 /* : Bool */;
-int cltype60;
-int idtype61;
-const char* var_class_name62;
-long var63 /* : Int */;
-long var64 /* : Int */;
-short int var66 /* : Bool */;
-int cltype67;
-int idtype68;
-const char* var_class_name69;
-long var70 /* : Int */;
-val* var71 /* : String */;
-val* var72 /* : String */;
+long var58 /* : Int */;
+long var59 /* : Int */;
+short int var61 /* : Bool */;
+int cltype62;
+int idtype63;
+const char* var_class_name64;
+long var65 /* : Int */;
+long var66 /* : Int */;
+short int var68 /* : Bool */;
+int cltype69;
+int idtype70;
+const char* var_class_name71;
+long var72 /* : Int */;
+val* var73 /* : String */;
+val* var74 /* : String */;
 var_v = p0;
 {
-var = parser_nodes__AStringFormExpr__n_string(self);
+{ /* Inline parser_nodes#AStringFormExpr#n_string (self) on <self:AStringFormExpr> */
+var2 = self->attrs[COLOR_parser_nodes__AStringFormExpr___n_string].val; /* _n_string on <self:AStringFormExpr> */
+if (unlikely(var2 == NULL)) {
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _n_string");
+PRINT_ERROR(" (%s:%d)\n", "parser/parser_nodes.nit", 1834);
+show_backtrace(1);
+}
+var = var2;
+RET_LABEL1:(void)0;
+}
 }
 {
-var1 = lexer_work__Token__text(var);
+var3 = lexer_work__Token__text(var);
 }
-var_txt = var1;
-var2 = 1;
-var_behead = var2;
-var3 = 1;
-var_betail = var3;
+var_txt = var3;
+var4 = 1;
+var_behead = var4;
+var5 = 1;
+var_betail = var5;
 {
 { /* Inline string#FlatString#chars (var_txt) on <var_txt:String> */
-var7 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
-if (unlikely(var7 == NULL)) {
+var9 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
+if (unlikely(var9 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _chars");
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/string.nit", 746);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/string.nit", 939);
 show_backtrace(1);
 }
-var5 = var7;
-RET_LABEL6:(void)0;
+var7 = var9;
+RET_LABEL8:(void)0;
 }
 }
-var8 = 0;
+var10 = 0;
 {
-var9 = ((val* (*)(val*, long))(var5->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var5, var8) /* [] on <var5:SequenceRead[Char]>*/;
+var11 = ((val* (*)(val*, long))(var7->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var7, var10) /* [] on <var7:SequenceRead[Char]>*/;
 }
 {
 { /* Inline string#FlatString#chars (var_txt) on <var_txt:String> */
-var12 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
-if (unlikely(var12 == NULL)) {
+var14 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
+if (unlikely(var14 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _chars");
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/string.nit", 746);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/string.nit", 939);
 show_backtrace(1);
 }
-var10 = var12;
-RET_LABEL11:(void)0;
+var12 = var14;
+RET_LABEL13:(void)0;
 }
 }
-var13 = 1;
+var15 = 1;
 {
-var14 = ((val* (*)(val*, long))(var10->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var10, var13) /* [] on <var10:SequenceRead[Char]>*/;
+var16 = ((val* (*)(val*, long))(var12->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var12, var15) /* [] on <var12:SequenceRead[Char]>*/;
 }
 {
-{ /* Inline kernel#Char#== (var9,var14) on <var9:nullable Object(Char)> */
-var18 = var9 == var14 || (((struct instance_kernel__Char*)var9)->value == ((struct instance_kernel__Char*)var14)->value);
-var16 = var18;
-goto RET_LABEL17;
-RET_LABEL17:(void)0;
+{ /* Inline kernel#Char#== (var11,var16) on <var11:nullable Object(Char)> */
+var20 = var11 == var16 || (((struct instance_kernel__Char*)var11)->value == ((struct instance_kernel__Char*)var16)->value);
+var18 = var20;
+goto RET_LABEL19;
+RET_LABEL19:(void)0;
 }
-var15 = var16;
+var17 = var18;
 }
-var_ = var15;
-if (var15){
+var_ = var17;
+if (var17){
 {
 { /* Inline string#FlatText#length (var_txt) on <var_txt:String> */
-var21 = var_txt->attrs[COLOR_string__FlatText___length].l; /* _length on <var_txt:String> */
-var19 = var21;
-RET_LABEL20:(void)0;
+var23 = var_txt->attrs[COLOR_string__FlatText___length].l; /* _length on <var_txt:String> */
+var21 = var23;
+RET_LABEL22:(void)0;
 }
 }
-var22 = 6;
+var24 = 6;
 {
-{ /* Inline kernel#Int#>= (var19,var22) on <var19:Int> */
-/* Covariant cast for argument 0 (i) <var22:Int> isa OTHER */
-/* <var22:Int> isa OTHER */
-var25 = 1; /* easy <var22:Int> isa OTHER*/
-if (unlikely(!var25)) {
+{ /* Inline kernel#Int#>= (var21,var24) on <var21:Int> */
+/* Covariant cast for argument 0 (i) <var24:Int> isa OTHER */
+/* <var24:Int> isa OTHER */
+var27 = 1; /* easy <var24:Int> isa OTHER*/
+if (unlikely(!var27)) {
 var_class_name = type_kernel__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name);
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/kernel.nit", 326);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/kernel.nit", 372);
 show_backtrace(1);
 }
-var26 = var19 >= var22;
-var23 = var26;
-goto RET_LABEL24;
-RET_LABEL24:(void)0;
+var28 = var21 >= var24;
+var25 = var28;
+goto RET_LABEL26;
+RET_LABEL26:(void)0;
 }
 }
-var4 = var23;
+var6 = var25;
 } else {
-var4 = var_;
+var6 = var_;
 }
-if (var4){
-var27 = 3;
-var_behead = var27;
-var28 = 3;
-var_betail = var28;
+if (var6){
+var29 = 3;
+var_behead = var29;
+var30 = 3;
+var_betail = var30;
 {
 { /* Inline string#FlatString#chars (var_txt) on <var_txt:String> */
-var32 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
-if (unlikely(var32 == NULL)) {
+var34 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
+if (unlikely(var34 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _chars");
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/string.nit", 746);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/string.nit", 939);
 show_backtrace(1);
 }
-var30 = var32;
-RET_LABEL31:(void)0;
+var32 = var34;
+RET_LABEL33:(void)0;
 }
 }
-var33 = 0;
+var35 = 0;
 {
-var34 = ((val* (*)(val*, long))(var30->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var30, var33) /* [] on <var30:SequenceRead[Char]>*/;
+var36 = ((val* (*)(val*, long))(var32->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var32, var35) /* [] on <var32:SequenceRead[Char]>*/;
 }
-var35 = '\"';
+var37 = '\"';
 {
-{ /* Inline kernel#Char#== (var34,var35) on <var34:nullable Object(Char)> */
-var39 = (var34 != NULL) && (var34->class == &class_kernel__Char);
-if (var39) {
-var40 = ((struct instance_kernel__Char*)var34)->value; /* autounbox from nullable Object to Char */;
-var39 = (var40 == var35);
+{ /* Inline kernel#Char#== (var36,var37) on <var36:nullable Object(Char)> */
+var41 = (var36 != NULL) && (var36->class == &class_kernel__Char);
+if (var41) {
+var42 = ((struct instance_kernel__Char*)var36)->value; /* autounbox from nullable Object to Char */;
+var41 = (var42 == var37);
 }
-var37 = var39;
-goto RET_LABEL38;
-RET_LABEL38:(void)0;
+var39 = var41;
+goto RET_LABEL40;
+RET_LABEL40:(void)0;
 }
-var36 = var37;
+var38 = var39;
 }
-var_41 = var36;
-if (var36){
+var_43 = var38;
+if (var38){
 {
 { /* Inline string#FlatString#chars (var_txt) on <var_txt:String> */
-var44 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
-if (unlikely(var44 == NULL)) {
+var46 = var_txt->attrs[COLOR_string__FlatString___chars].val; /* _chars on <var_txt:String> */
+if (unlikely(var46 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _chars");
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/string.nit", 746);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/string.nit", 939);
 show_backtrace(1);
 }
-var42 = var44;
-RET_LABEL43:(void)0;
+var44 = var46;
+RET_LABEL45:(void)0;
 }
 }
-var45 = 3;
+var47 = 3;
 {
-var46 = ((val* (*)(val*, long))(var42->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var42, var45) /* [] on <var42:SequenceRead[Char]>*/;
+var48 = ((val* (*)(val*, long))(var44->class->vft[COLOR_abstract_collection__SequenceRead___91d_93d]))(var44, var47) /* [] on <var44:SequenceRead[Char]>*/;
 }
-var47 = '\n';
+var49 = '\n';
 {
-{ /* Inline kernel#Char#== (var46,var47) on <var46:nullable Object(Char)> */
-var51 = (var46 != NULL) && (var46->class == &class_kernel__Char);
-if (var51) {
-var52 = ((struct instance_kernel__Char*)var46)->value; /* autounbox from nullable Object to Char */;
-var51 = (var52 == var47);
+{ /* Inline kernel#Char#== (var48,var49) on <var48:nullable Object(Char)> */
+var53 = (var48 != NULL) && (var48->class == &class_kernel__Char);
+if (var53) {
+var54 = ((struct instance_kernel__Char*)var48)->value; /* autounbox from nullable Object to Char */;
+var53 = (var54 == var49);
 }
-var49 = var51;
-goto RET_LABEL50;
-RET_LABEL50:(void)0;
+var51 = var53;
+goto RET_LABEL52;
+RET_LABEL52:(void)0;
 }
-var48 = var49;
+var50 = var51;
 }
-var29 = var48;
+var31 = var50;
 } else {
-var29 = var_41;
+var31 = var_43;
 }
-if (var29){
-var53 = 4;
-var_behead = var53;
+if (var31){
+var55 = 4;
+var_behead = var55;
 } else {
 }
 } else {
 }
 {
 { /* Inline string#FlatText#length (var_txt) on <var_txt:String> */
-var56 = var_txt->attrs[COLOR_string__FlatText___length].l; /* _length on <var_txt:String> */
-var54 = var56;
-RET_LABEL55:(void)0;
+var58 = var_txt->attrs[COLOR_string__FlatText___length].l; /* _length on <var_txt:String> */
+var56 = var58;
+RET_LABEL57:(void)0;
 }
 }
 {
-{ /* Inline kernel#Int#- (var54,var_behead) on <var54:Int> */
+{ /* Inline kernel#Int#- (var56,var_behead) on <var56:Int> */
 /* Covariant cast for argument 0 (i) <var_behead:Int> isa OTHER */
 /* <var_behead:Int> isa OTHER */
-var59 = 1; /* easy <var_behead:Int> isa OTHER*/
-if (unlikely(!var59)) {
-var_class_name62 = type_kernel__Int.name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name62);
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/kernel.nit", 331);
+var61 = 1; /* easy <var_behead:Int> isa OTHER*/
+if (unlikely(!var61)) {
+var_class_name64 = type_kernel__Int.name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name64);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/kernel.nit", 377);
 show_backtrace(1);
 }
-var63 = var54 - var_behead;
-var57 = var63;
-goto RET_LABEL58;
-RET_LABEL58:(void)0;
+var65 = var56 - var_behead;
+var59 = var65;
+goto RET_LABEL60;
+RET_LABEL60:(void)0;
 }
 }
 {
-{ /* Inline kernel#Int#- (var57,var_betail) on <var57:Int> */
+{ /* Inline kernel#Int#- (var59,var_betail) on <var59:Int> */
 /* Covariant cast for argument 0 (i) <var_betail:Int> isa OTHER */
 /* <var_betail:Int> isa OTHER */
-var66 = 1; /* easy <var_betail:Int> isa OTHER*/
-if (unlikely(!var66)) {
-var_class_name69 = type_kernel__Int.name;
-PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name69);
-PRINT_ERROR(" (%s:%d)\n", "lib/standard/kernel.nit", 331);
+var68 = 1; /* easy <var_betail:Int> isa OTHER*/
+if (unlikely(!var68)) {
+var_class_name71 = type_kernel__Int.name;
+PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name71);
+PRINT_ERROR(" (%s:%d)\n", "../lib/standard/kernel.nit", 377);
 show_backtrace(1);
 }
-var70 = var57 - var_betail;
-var64 = var70;
-goto RET_LABEL65;
-RET_LABEL65:(void)0;
+var72 = var59 - var_betail;
+var66 = var72;
+goto RET_LABEL67;
+RET_LABEL67:(void)0;
 }
 }
 {
-var71 = string__FlatString__substring(var_txt, var_behead, var64);
+var73 = string__FlatString__substring(var_txt, var_behead, var66);
 }
 {
-var72 = string__Text__unescape_nit(var71);
+var74 = string__Text__unescape_nit(var73);
 }
 {
-{ /* Inline literal#AStringFormExpr#value= (self,var72) on <self:AStringFormExpr> */
-self->attrs[COLOR_literal__AStringFormExpr___value].val = var72; /* _value on <self:AStringFormExpr> */
-RET_LABEL73:(void)0;
+{ /* Inline literal#AStringFormExpr#value= (self,var74) on <self:AStringFormExpr> */
+self->attrs[COLOR_literal__AStringFormExpr___value].val = var74; /* _value on <self:AStringFormExpr> */
+RET_LABEL75:(void)0;
 }
 }
 RET_LABEL:;