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

diff --git a/c_src/template.sep.1.c b/c_src/template.sep.1.c
index 6505aa7..60df9c4 100644
--- a/c_src/template.sep.1.c
+++ b/c_src/template.sep.1.c
@@ -1,6 +1,6 @@
 #include "template.sep.0.h"
 /* method template#Template#add for (self: Template, Streamable) */
-void template__Template__add(val* self, val* p0) {
+void template___template__Template___add(val* self, val* p0) {
 val* var_element /* var element: Streamable */;
 short int var /* : Bool */;
 short int var2 /* : Bool */;
@@ -18,7 +18,7 @@ RET_LABEL1:(void)0;
 var3 = !var;
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "../lib/template/template.nit", 110);
+PRINT_ERROR(" (%s:%d)\n", FILE_template, 110);
 show_backtrace(1);
 }
 {
@@ -26,7 +26,7 @@ show_backtrace(1);
 var6 = self->attrs[COLOR_template__Template___content].val; /* _content on <self:Template> */
 if (unlikely(var6 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _content");
-PRINT_ERROR(" (%s:%d)\n", "../lib/template/template.nit", 183);
+PRINT_ERROR(" (%s:%d)\n", FILE_template, 183);
 show_backtrace(1);
 }
 var4 = var6;
@@ -34,17 +34,12 @@ RET_LABEL5:(void)0;
 }
 }
 {
-array__Array__add(var4, var_element); /* Direct call array#Array#add on <var4:Array[Streamable]>*/
+standard___standard__Array___standard__abstract_collection__SimpleCollection__add(var4, var_element); /* Direct call array#Array#add on <var4:Array[Streamable]>*/
 }
 RET_LABEL:;
 }
-/* method template#Template#add for (self: Object, Streamable) */
-void VIRTUAL_template__Template__add(val* self, val* p0) {
-template__Template__add(self, p0); /* Direct call template#Template#add on <self:Object(Template)>*/
-RET_LABEL:;
-}
 /* method template#Template#addn for (self: Template, Streamable) */
-void template__Template__addn(val* self, val* p0) {
+void template___template__Template___addn(val* self, val* p0) {
 val* var_element /* var element: Streamable */;
 static val* varonce;
 val* var /* : String */;
@@ -53,29 +48,24 @@ long var2 /* : Int */;
 val* var3 /* : FlatString */;
 var_element = p0;
 {
-template__Template__add(self, var_element); /* Direct call template#Template#add on <self:Template>*/
+template___template__Template___add(self, var_element); /* Direct call template#Template#add on <self:Template>*/
 }
 if (varonce) {
 var = varonce;
 } else {
 var1 = "\n";
 var2 = 1;
-var3 = string__NativeString__to_s_with_length(var1, var2);
+var3 = standard___standard__NativeString___to_s_with_length(var1, var2);
 var = var3;
 varonce = var;
 }
 {
-template__Template__add(self, var); /* Direct call template#Template#add on <self:Template>*/
-}
-RET_LABEL:;
+template___template__Template___add(self, var); /* Direct call template#Template#add on <self:Template>*/
 }
-/* method template#Template#addn for (self: Object, Streamable) */
-void VIRTUAL_template__Template__addn(val* self, val* p0) {
-template__Template__addn(self, p0); /* Direct call template#Template#addn on <self:Object(Template)>*/
 RET_LABEL:;
 }
 /* method template#Template#is_frozen for (self: Template): Bool */
-short int template__Template__is_frozen(val* self) {
+short int template___template__Template___is_frozen(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 var1 = self->attrs[COLOR_template__Template___is_frozen].s; /* _is_frozen on <self:Template> */
@@ -83,35 +73,13 @@ var = var1;
 RET_LABEL:;
 return var;
 }
-/* method template#Template#is_frozen for (self: Object): Bool */
-short int VIRTUAL_template__Template__is_frozen(val* self) {
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-short int var3 /* : Bool */;
-{ /* Inline template#Template#is_frozen (self) on <self:Object(Template)> */
-var3 = self->attrs[COLOR_template__Template___is_frozen].s; /* _is_frozen on <self:Object(Template)> */
-var1 = var3;
-RET_LABEL2:(void)0;
-}
-var = var1;
-RET_LABEL:;
-return var;
-}
 /* method template#Template#is_frozen= for (self: Template, Bool) */
-void template__Template__is_frozen_61d(val* self, short int p0) {
+void template___template__Template___is_frozen_61d(val* self, short int p0) {
 self->attrs[COLOR_template__Template___is_frozen].s = p0; /* _is_frozen on <self:Template> */
 RET_LABEL:;
 }
-/* method template#Template#is_frozen= for (self: Object, Bool) */
-void VIRTUAL_template__Template__is_frozen_61d(val* self, short int p0) {
-{ /* Inline template#Template#is_frozen= (self,p0) on <self:Object(Template)> */
-self->attrs[COLOR_template__Template___is_frozen].s = p0; /* _is_frozen on <self:Object(Template)> */
-RET_LABEL1:(void)0;
-}
-RET_LABEL:;
-}
 /* method template#Template#freeze for (self: Template) */
-void template__Template__freeze(val* self) {
+void template___template__Template___freeze(val* self) {
 short int var /* : Bool */;
 short int var2 /* : Bool */;
 short int var3 /* : Bool */;
@@ -135,46 +103,22 @@ RET_LABEL4:(void)0;
 }
 RET_LABEL:;
 }
-/* method template#Template#freeze for (self: Object) */
-void VIRTUAL_template__Template__freeze(val* self) {
-template__Template__freeze(self); /* Direct call template#Template#freeze on <self:Object(Template)>*/
-RET_LABEL:;
-}
 /* method template#Template#content for (self: Template): Array[Streamable] */
-val* template__Template__content(val* self) {
+val* template___template__Template___content(val* self) {
 val* var /* : Array[Streamable] */;
 val* var1 /* : Array[Streamable] */;
 var1 = self->attrs[COLOR_template__Template___content].val; /* _content on <self:Template> */
 if (unlikely(var1 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _content");
-PRINT_ERROR(" (%s:%d)\n", "../lib/template/template.nit", 183);
-show_backtrace(1);
-}
-var = var1;
-RET_LABEL:;
-return var;
-}
-/* method template#Template#content for (self: Object): Array[Streamable] */
-val* VIRTUAL_template__Template__content(val* self) {
-val* var /* : Array[Streamable] */;
-val* var1 /* : Array[Streamable] */;
-val* var3 /* : Array[Streamable] */;
-{ /* Inline template#Template#content (self) on <self:Object(Template)> */
-var3 = self->attrs[COLOR_template__Template___content].val; /* _content on <self:Object(Template)> */
-if (unlikely(var3 == NULL)) {
-PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _content");
-PRINT_ERROR(" (%s:%d)\n", "../lib/template/template.nit", 183);
+PRINT_ERROR(" (%s:%d)\n", FILE_template, 183);
 show_backtrace(1);
 }
-var1 = var3;
-RET_LABEL2:(void)0;
-}
 var = var1;
 RET_LABEL:;
 return var;
 }
 /* method template#Template#render_done for (self: Template): Bool */
-short int template__Template__render_done(val* self) {
+short int template___template__Template___render_done(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 var1 = self->attrs[COLOR_template__Template___render_done].s; /* _render_done on <self:Template> */
@@ -182,35 +126,13 @@ var = var1;
 RET_LABEL:;
 return var;
 }
-/* method template#Template#render_done for (self: Object): Bool */
-short int VIRTUAL_template__Template__render_done(val* self) {
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-short int var3 /* : Bool */;
-{ /* Inline template#Template#render_done (self) on <self:Object(Template)> */
-var3 = self->attrs[COLOR_template__Template___render_done].s; /* _render_done on <self:Object(Template)> */
-var1 = var3;
-RET_LABEL2:(void)0;
-}
-var = var1;
-RET_LABEL:;
-return var;
-}
 /* method template#Template#render_done= for (self: Template, Bool) */
-void template__Template__render_done_61d(val* self, short int p0) {
+void template___template__Template___render_done_61d(val* self, short int p0) {
 self->attrs[COLOR_template__Template___render_done].s = p0; /* _render_done on <self:Template> */
 RET_LABEL:;
 }
-/* method template#Template#render_done= for (self: Object, Bool) */
-void VIRTUAL_template__Template__render_done_61d(val* self, short int p0) {
-{ /* Inline template#Template#render_done= (self,p0) on <self:Object(Template)> */
-self->attrs[COLOR_template__Template___render_done].s = p0; /* _render_done on <self:Object(Template)> */
-RET_LABEL1:(void)0;
-}
-RET_LABEL:;
-}
 /* method template#Template#force_render for (self: Template) */
-void template__Template__force_render(val* self) {
+void template___template__Template___force_render(val* self) {
 short int var /* : Bool */;
 short int var2 /* : Bool */;
 short int var3 /* : Bool */;
@@ -233,20 +155,15 @@ RET_LABEL4:(void)0;
 }
 }
 {
-toolcontext__BashCompletion__rendering(self); /* Direct call toolcontext#BashCompletion#rendering on <self:Template>*/
+nit___nit__BashCompletion___template__Template__rendering(self); /* Direct call toolcontext#BashCompletion#rendering on <self:Template>*/
 }
 {
-template__Template__freeze(self); /* Direct call template#Template#freeze on <self:Template>*/
-}
-RET_LABEL:;
+template___template__Template___freeze(self); /* Direct call template#Template#freeze on <self:Template>*/
 }
-/* method template#Template#force_render for (self: Object) */
-void VIRTUAL_template__Template__force_render(val* self) {
-template__Template__force_render(self); /* Direct call template#Template#force_render on <self:Object(Template)>*/
 RET_LABEL:;
 }
 /* method template#Template#write_to for (self: Template, OStream) */
-void template__Template__write_to(val* self, val* p0) {
+void template___template__Template___standard__stream__Streamable__write_to(val* self, val* p0) {
 val* var_stream /* var stream: OStream */;
 short int var /* : Bool */;
 short int var2 /* : Bool */;
@@ -272,7 +189,7 @@ RET_LABEL1:(void)0;
 var3 = !var;
 if (unlikely(!var3)) {
 PRINT_ERROR("Runtime error: %s", "Assert failed");
-PRINT_ERROR(" (%s:%d)\n", "../lib/template/template.nit", 205);
+PRINT_ERROR(" (%s:%d)\n", FILE_template, 205);
 show_backtrace(1);
 }
 var4 = 1;
@@ -283,14 +200,14 @@ RET_LABEL5:(void)0;
 }
 }
 {
-template__Template__force_render(self); /* Direct call template#Template#force_render on <self:Template>*/
+template___template__Template___force_render(self); /* Direct call template#Template#force_render on <self:Template>*/
 }
 {
 { /* Inline template#Template#content (self) on <self:Template> */
 var8 = self->attrs[COLOR_template__Template___content].val; /* _content on <self:Template> */
 if (unlikely(var8 == NULL)) {
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _content");
-PRINT_ERROR(" (%s:%d)\n", "../lib/template/template.nit", 183);
+PRINT_ERROR(" (%s:%d)\n", FILE_template, 183);
 show_backtrace(1);
 }
 var6 = var8;
@@ -299,23 +216,23 @@ RET_LABEL7:(void)0;
 }
 var_ = var6;
 {
-var9 = array__AbstractArrayRead__iterator(var_);
+var9 = standard___standard__AbstractArrayRead___standard__abstract_collection__Collection__iterator(var_);
 }
 var_10 = var9;
 for(;;) {
 {
-var11 = array__ArrayIterator__is_ok(var_10);
+var11 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__is_ok(var_10);
 }
 if (var11){
 {
-var12 = array__ArrayIterator__item(var_10);
+var12 = standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__item(var_10);
 }
 var_e = var12;
 {
-((void (*)(val*, val*))(var_e->class->vft[COLOR_stream__Streamable__write_to]))(var_e, var_stream) /* write_to on <var_e:Streamable>*/;
+((void (*)(val* self, val* p0))(var_e->class->vft[COLOR_standard__stream__Streamable__write_to]))(var_e, var_stream) /* write_to on <var_e:Streamable>*/;
 }
 {
-array__ArrayIterator__next(var_10); /* Direct call array#ArrayIterator#next on <var_10:ArrayIterator[Streamable]>*/
+standard__array___standard__array__ArrayIterator___standard__abstract_collection__Iterator__next(var_10); /* Direct call array#ArrayIterator#next on <var_10:ArrayIterator[Streamable]>*/
 }
 } else {
 goto BREAK_label;
@@ -336,13 +253,8 @@ RET_LABEL15:(void)0;
 }
 RET_LABEL:;
 }
-/* method template#Template#write_to for (self: Object, OStream) */
-void VIRTUAL_template__Template__write_to(val* self, val* p0) {
-template__Template__write_to(self, p0); /* Direct call template#Template#write_to on <self:Object(Template)>*/
-RET_LABEL:;
-}
 /* method template#Template#is_writing for (self: Template): Bool */
-short int template__Template__is_writing(val* self) {
+short int template___template__Template___is_writing(val* self) {
 short int var /* : Bool */;
 short int var1 /* : Bool */;
 var1 = self->attrs[COLOR_template__Template___is_writing].s; /* _is_writing on <self:Template> */
@@ -350,30 +262,8 @@ var = var1;
 RET_LABEL:;
 return var;
 }
-/* method template#Template#is_writing for (self: Object): Bool */
-short int VIRTUAL_template__Template__is_writing(val* self) {
-short int var /* : Bool */;
-short int var1 /* : Bool */;
-short int var3 /* : Bool */;
-{ /* Inline template#Template#is_writing (self) on <self:Object(Template)> */
-var3 = self->attrs[COLOR_template__Template___is_writing].s; /* _is_writing on <self:Object(Template)> */
-var1 = var3;
-RET_LABEL2:(void)0;
-}
-var = var1;
-RET_LABEL:;
-return var;
-}
 /* method template#Template#is_writing= for (self: Template, Bool) */
-void template__Template__is_writing_61d(val* self, short int p0) {
+void template___template__Template___is_writing_61d(val* self, short int p0) {
 self->attrs[COLOR_template__Template___is_writing].s = p0; /* _is_writing on <self:Template> */
 RET_LABEL:;
 }
-/* method template#Template#is_writing= for (self: Object, Bool) */
-void VIRTUAL_template__Template__is_writing_61d(val* self, short int p0) {
-{ /* Inline template#Template#is_writing= (self,p0) on <self:Object(Template)> */
-self->attrs[COLOR_template__Template___is_writing].s = p0; /* _is_writing on <self:Object(Template)> */
-RET_LABEL1:(void)0;
-}
-RET_LABEL:;
-}