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

diff --git a/c_src/core__sorter.sep.1.c b/c_src/core__sorter.sep.1.c
index 9f2682b..4ebf9dc 100644
--- a/c_src/core__sorter.sep.1.c
+++ b/c_src/core__sorter.sep.1.c
@@ -1,5 +1,5 @@
 #include "core__sorter.sep.0.h"
-/* method sorter#Comparator#sort for (self: Comparator, Array[nullable Object]) */
+/* method sorter$Comparator$sort for (self: Comparator, Array[nullable Object]) */
 void core___core__Comparator___sort(val* self, val* p0) {
 short int var /* : Bool */;
 int cltype;
@@ -33,21 +33,21 @@ fatal_exit(1);
 }
 var_array = p0;
 {
-{ /* Inline array#AbstractArrayRead#length (var_array) on <var_array:Array[nullable Object]> */
+{ /* Inline array$AbstractArrayRead$length (var_array) on <var_array:Array[nullable Object]> */
 var3 = var_array->attrs[COLOR_core__array__AbstractArrayRead___length].l; /* _length on <var_array:Array[nullable Object]> */
 var1 = var3;
 RET_LABEL2:(void)0;
 }
 }
 {
-{ /* Inline kernel#Int#- (var1,1l) on <var1:Int> */
+{ /* Inline kernel$Int$- (var1,1l) on <var1:Int> */
 /* Covariant cast for argument 0 (i) <1l:Int> isa OTHER */
 /* <1l:Int> isa OTHER */
 var6 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var6)) {
 var_class_name9 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name9);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 734);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
 fatal_exit(1);
 }
 var10 = var1 - 1l;
@@ -57,11 +57,11 @@ RET_LABEL5:(void)0;
 }
 }
 {
-core___core__Comparator___sub_sort(self, var_array, 0l, var4); /* Direct call sorter#Comparator#sub_sort on <self:Comparator>*/
+core___core__Comparator___sub_sort(self, var_array, 0l, var4); /* Direct call sorter$Comparator$sub_sort on <self:Comparator>*/
 }
 RET_LABEL:;
 }
-/* method sorter#Comparator#sub_sort for (self: Comparator, Array[nullable Object], Int, Int) */
+/* method sorter$Comparator$sub_sort for (self: Comparator, Array[nullable Object], Int, Int) */
 void core___core__Comparator___sub_sort(val* self, val* p0, long p1, long p2) {
 short int var /* : Bool */;
 int cltype;
@@ -109,14 +109,14 @@ var_array = p0;
 var_from = p1;
 var_to = p2;
 {
-{ /* Inline kernel#Int#>= (var_from,var_to) on <var_from:Int> */
+{ /* Inline kernel$Int$>= (var_from,var_to) on <var_from:Int> */
 /* Covariant cast for argument 0 (i) <var_to:Int> isa OTHER */
 /* <var_to:Int> isa OTHER */
 var3 = 1; /* easy <var_to:Int> isa OTHER*/
 if (unlikely(!var3)) {
 var_class_name6 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name6);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 729);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 726);
 fatal_exit(1);
 }
 var7 = var_from >= var_to;
@@ -129,14 +129,14 @@ if (var1){
 goto RET_LABEL;
 } else {
 {
-{ /* Inline kernel#Int#+ (var_from,7l) on <var_from:Int> */
+{ /* Inline kernel$Int$+ (var_from,7l) on <var_from:Int> */
 /* Covariant cast for argument 0 (i) <7l:Int> isa OTHER */
 /* <7l:Int> isa OTHER */
 var10 = 1; /* easy <7l:Int> isa OTHER*/
 if (unlikely(!var10)) {
 var_class_name13 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name13);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 728);
 fatal_exit(1);
 }
 var14 = var_from + 7l;
@@ -146,14 +146,14 @@ RET_LABEL9:(void)0;
 }
 }
 {
-{ /* Inline kernel#Int#< (var8,var_to) on <var8:Int> */
+{ /* Inline kernel$Int$< (var8,var_to) on <var8:Int> */
 /* Covariant cast for argument 0 (i) <var_to:Int> isa OTHER */
 /* <var_to:Int> isa OTHER */
 var17 = 1; /* easy <var_to:Int> isa OTHER*/
 if (unlikely(!var17)) {
 var_class_name20 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name20);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 728);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 725);
 fatal_exit(1);
 }
 var21 = var8 < var_to;
@@ -164,17 +164,17 @@ RET_LABEL16:(void)0;
 }
 if (var15){
 {
-core___core__Comparator___quick_sort(self, var_array, var_from, var_to); /* Direct call sorter#Comparator#quick_sort on <self:Comparator>*/
+core___core__Comparator___quick_sort(self, var_array, var_from, var_to); /* Direct call sorter$Comparator$quick_sort on <self:Comparator>*/
 }
 } else {
 {
-core___core__Comparator___bubble_sort(self, var_array, var_from, var_to); /* Direct call sorter#Comparator#bubble_sort on <self:Comparator>*/
+core___core__Comparator___bubble_sort(self, var_array, var_from, var_to); /* Direct call sorter$Comparator$bubble_sort on <self:Comparator>*/
 }
 }
 }
 RET_LABEL:;
 }
-/* method sorter#Comparator#quick_sort for (self: Comparator, Array[nullable Object], Int, Int) */
+/* method sorter$Comparator$quick_sort for (self: Comparator, Array[nullable Object], Int, Int) */
 void core___core__Comparator___quick_sort(val* self, val* p0, long p1, long p2) {
 short int var /* : Bool */;
 int cltype;
@@ -293,14 +293,14 @@ var_i = var_from;
 var_j = var_to;
 for(;;) {
 {
-{ /* Inline kernel#Int#> (var_j,var_i) on <var_j:Int> */
+{ /* Inline kernel$Int$> (var_j,var_i) on <var_j:Int> */
 /* Covariant cast for argument 0 (i) <var_i:Int> isa OTHER */
 /* <var_i:Int> isa OTHER */
 var4 = 1; /* easy <var_i:Int> isa OTHER*/
 if (unlikely(!var4)) {
 var_class_name7 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name7);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 730);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
 fatal_exit(1);
 }
 var8 = var_j > var_i;
@@ -312,14 +312,14 @@ RET_LABEL3:(void)0;
 if (var2){
 for(;;) {
 {
-{ /* Inline kernel#Int#<= (var_i,var_to) on <var_i:Int> */
+{ /* Inline kernel$Int$<= (var_i,var_to) on <var_i:Int> */
 /* Covariant cast for argument 0 (i) <var_to:Int> isa OTHER */
 /* <var_to:Int> isa OTHER */
 var12 = 1; /* easy <var_to:Int> isa OTHER*/
 if (unlikely(!var12)) {
 var_class_name15 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name15);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 724);
 fatal_exit(1);
 }
 var16 = var_i <= var_to;
@@ -337,14 +337,14 @@ var17 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(v
 var18 = ((long(*)(val* self, val* p0, val* p1))((((long)self&3)?class_info[((long)self&3)]:self->class)->vft[COLOR_core__sorter__Comparator__compare]))(self, var17, var_pivot); /* compare on <self:Comparator>*/
 }
 {
-{ /* Inline kernel#Int#<= (var18,0l) on <var18:Int> */
+{ /* Inline kernel$Int$<= (var18,0l) on <var18:Int> */
 /* Covariant cast for argument 0 (i) <0l:Int> isa OTHER */
 /* <0l:Int> isa OTHER */
 var21 = 1; /* easy <0l:Int> isa OTHER*/
 if (unlikely(!var21)) {
 var_class_name24 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name24);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 724);
 fatal_exit(1);
 }
 var25 = var18 <= 0l;
@@ -359,14 +359,14 @@ var9 = var_;
 }
 if (var9){
 {
-{ /* Inline kernel#Int#+ (var_i,1l) on <var_i:Int> */
+{ /* Inline kernel$Int$+ (var_i,1l) on <var_i:Int> */
 /* Covariant cast for argument 0 (i) <1l:Int> isa OTHER */
 /* <1l:Int> isa OTHER */
 var28 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var28)) {
 var_class_name31 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name31);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 728);
 fatal_exit(1);
 }
 var32 = var_i + 1l;
@@ -383,14 +383,14 @@ goto BREAK_label;
 BREAK_label: (void)0;
 for(;;) {
 {
-{ /* Inline kernel#Int#> (var_j,var_i) on <var_j:Int> */
+{ /* Inline kernel$Int$> (var_j,var_i) on <var_j:Int> */
 /* Covariant cast for argument 0 (i) <var_i:Int> isa OTHER */
 /* <var_i:Int> isa OTHER */
 var36 = 1; /* easy <var_i:Int> isa OTHER*/
 if (unlikely(!var36)) {
 var_class_name39 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name39);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 730);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
 fatal_exit(1);
 }
 var40 = var_j > var_i;
@@ -408,14 +408,14 @@ var42 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(v
 var43 = ((long(*)(val* self, val* p0, val* p1))((((long)self&3)?class_info[((long)self&3)]:self->class)->vft[COLOR_core__sorter__Comparator__compare]))(self, var42, var_pivot); /* compare on <self:Comparator>*/
 }
 {
-{ /* Inline kernel#Int#>= (var43,0l) on <var43:Int> */
+{ /* Inline kernel$Int$>= (var43,0l) on <var43:Int> */
 /* Covariant cast for argument 0 (i) <0l:Int> isa OTHER */
 /* <0l:Int> isa OTHER */
 var46 = 1; /* easy <0l:Int> isa OTHER*/
 if (unlikely(!var46)) {
 var_class_name49 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name49);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 729);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 726);
 fatal_exit(1);
 }
 var50 = var43 >= 0l;
@@ -430,14 +430,14 @@ var33 = var_41;
 }
 if (var33){
 {
-{ /* Inline kernel#Int#- (var_j,1l) on <var_j:Int> */
+{ /* Inline kernel$Int$- (var_j,1l) on <var_j:Int> */
 /* Covariant cast for argument 0 (i) <1l:Int> isa OTHER */
 /* <1l:Int> isa OTHER */
 var53 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var53)) {
 var_class_name56 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name56);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 734);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
 fatal_exit(1);
 }
 var57 = var_j - 1l;
@@ -453,14 +453,14 @@ goto BREAK_label58;
 }
 BREAK_label58: (void)0;
 {
-{ /* Inline kernel#Int#> (var_j,var_i) on <var_j:Int> */
+{ /* Inline kernel$Int$> (var_j,var_i) on <var_j:Int> */
 /* Covariant cast for argument 0 (i) <var_i:Int> isa OTHER */
 /* <var_i:Int> isa OTHER */
 var61 = 1; /* easy <var_i:Int> isa OTHER*/
 if (unlikely(!var61)) {
 var_class_name64 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name64);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 730);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
 fatal_exit(1);
 }
 var65 = var_j > var_i;
@@ -478,10 +478,10 @@ var_t = var66;
 var67 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var_array, var_j);
 }
 {
-core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_i, var67); /* Direct call array#Array#[]= on <var_array:Array[nullable Object]>*/
+core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_i, var67); /* Direct call array$Array$[]= on <var_array:Array[nullable Object]>*/
 }
 {
-core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_j, var_t); /* Direct call array#Array#[]= on <var_array:Array[nullable Object]>*/
+core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_j, var_t); /* Direct call array$Array$[]= on <var_array:Array[nullable Object]>*/
 }
 } else {
 }
@@ -491,14 +491,14 @@ goto BREAK_label68;
 }
 BREAK_label68: (void)0;
 {
-{ /* Inline kernel#Int#- (var_i,1l) on <var_i:Int> */
+{ /* Inline kernel$Int$- (var_i,1l) on <var_i:Int> */
 /* Covariant cast for argument 0 (i) <1l:Int> isa OTHER */
 /* <1l:Int> isa OTHER */
 var71 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var71)) {
 var_class_name74 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name74);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 734);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
 fatal_exit(1);
 }
 var75 = var_i - 1l;
@@ -511,17 +511,17 @@ RET_LABEL70:(void)0;
 var76 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var_array, var69);
 }
 {
-core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_from, var76); /* Direct call array#Array#[]= on <var_array:Array[nullable Object]>*/
+core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_from, var76); /* Direct call array$Array$[]= on <var_array:Array[nullable Object]>*/
 }
 {
-{ /* Inline kernel#Int#- (var_i,1l) on <var_i:Int> */
+{ /* Inline kernel$Int$- (var_i,1l) on <var_i:Int> */
 /* Covariant cast for argument 0 (i) <1l:Int> isa OTHER */
 /* <1l:Int> isa OTHER */
 var79 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var79)) {
 var_class_name82 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name82);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 734);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
 fatal_exit(1);
 }
 var83 = var_i - 1l;
@@ -531,17 +531,17 @@ RET_LABEL78:(void)0;
 }
 }
 {
-core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var77, var_pivot); /* Direct call array#Array#[]= on <var_array:Array[nullable Object]>*/
+core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var77, var_pivot); /* Direct call array$Array$[]= on <var_array:Array[nullable Object]>*/
 }
 {
-{ /* Inline kernel#Int#- (var_i,2l) on <var_i:Int> */
+{ /* Inline kernel$Int$- (var_i,2l) on <var_i:Int> */
 /* Covariant cast for argument 0 (i) <2l:Int> isa OTHER */
 /* <2l:Int> isa OTHER */
 var86 = 1; /* easy <2l:Int> isa OTHER*/
 if (unlikely(!var86)) {
 var_class_name89 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name89);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 734);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
 fatal_exit(1);
 }
 var90 = var_i - 2l;
@@ -551,14 +551,14 @@ RET_LABEL85:(void)0;
 }
 }
 {
-core___core__Comparator___sub_sort(self, var_array, var_from, var84); /* Direct call sorter#Comparator#sub_sort on <self:Comparator>*/
+core___core__Comparator___sub_sort(self, var_array, var_from, var84); /* Direct call sorter$Comparator$sub_sort on <self:Comparator>*/
 }
 {
-core___core__Comparator___sub_sort(self, var_array, var_i, var_to); /* Direct call sorter#Comparator#sub_sort on <self:Comparator>*/
+core___core__Comparator___sub_sort(self, var_array, var_i, var_to); /* Direct call sorter$Comparator$sub_sort on <self:Comparator>*/
 }
 RET_LABEL:;
 }
-/* method sorter#Comparator#bubble_sort for (self: Comparator, Array[nullable Object], Int, Int) */
+/* method sorter$Comparator$bubble_sort for (self: Comparator, Array[nullable Object], Int, Int) */
 void core___core__Comparator___bubble_sort(val* self, val* p0, long p1, long p2) {
 short int var /* : Bool */;
 int cltype;
@@ -632,14 +632,14 @@ var_to = p2;
 var_i = var_from;
 for(;;) {
 {
-{ /* Inline kernel#Int#< (var_i,var_to) on <var_i:Int> */
+{ /* Inline kernel$Int$< (var_i,var_to) on <var_i:Int> */
 /* Covariant cast for argument 0 (i) <var_to:Int> isa OTHER */
 /* <var_to:Int> isa OTHER */
 var3 = 1; /* easy <var_to:Int> isa OTHER*/
 if (unlikely(!var3)) {
 var_class_name6 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name6);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 728);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 725);
 fatal_exit(1);
 }
 var7 = var_i < var_to;
@@ -657,14 +657,14 @@ var_min_v = var8;
 var_j = var_i;
 for(;;) {
 {
-{ /* Inline kernel#Int#<= (var_j,var_to) on <var_j:Int> */
+{ /* Inline kernel$Int$<= (var_j,var_to) on <var_j:Int> */
 /* Covariant cast for argument 0 (i) <var_to:Int> isa OTHER */
 /* <var_to:Int> isa OTHER */
 var11 = 1; /* easy <var_to:Int> isa OTHER*/
 if (unlikely(!var11)) {
 var_class_name14 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name14);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 724);
 fatal_exit(1);
 }
 var15 = var_j <= var_to;
@@ -681,14 +681,14 @@ var16 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(v
 var17 = ((long(*)(val* self, val* p0, val* p1))((((long)self&3)?class_info[((long)self&3)]:self->class)->vft[COLOR_core__sorter__Comparator__compare]))(self, var_min_v, var16); /* compare on <self:Comparator>*/
 }
 {
-{ /* Inline kernel#Int#> (var17,0l) on <var17:Int> */
+{ /* Inline kernel$Int$> (var17,0l) on <var17:Int> */
 /* Covariant cast for argument 0 (i) <0l:Int> isa OTHER */
 /* <0l:Int> isa OTHER */
 var20 = 1; /* easy <0l:Int> isa OTHER*/
 if (unlikely(!var20)) {
 var_class_name23 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name23);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 730);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 727);
 fatal_exit(1);
 }
 var24 = var17 > 0l;
@@ -706,14 +706,14 @@ var_min_v = var25;
 } else {
 }
 {
-{ /* Inline kernel#Int#+ (var_j,1l) on <var_j:Int> */
+{ /* Inline kernel$Int$+ (var_j,1l) on <var_j:Int> */
 /* Covariant cast for argument 0 (i) <1l:Int> isa OTHER */
 /* <1l:Int> isa OTHER */
 var28 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var28)) {
 var_class_name31 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name31);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 728);
 fatal_exit(1);
 }
 var32 = var_j + 1l;
@@ -729,7 +729,7 @@ goto BREAK_label;
 }
 BREAK_label: (void)0;
 {
-{ /* Inline kernel#Int#!= (var_min,var_i) on <var_min:Int> */
+{ /* Inline kernel$Int$!= (var_min,var_i) on <var_min:Int> */
 var35 = var_min == var_i;
 var36 = !var35;
 var33 = var36;
@@ -742,22 +742,22 @@ if (var33){
 var37 = core___core__Array___core__abstract_collection__SequenceRead___91d_93d(var_array, var_i);
 }
 {
-core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_min, var37); /* Direct call array#Array#[]= on <var_array:Array[nullable Object]>*/
+core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_min, var37); /* Direct call array$Array$[]= on <var_array:Array[nullable Object]>*/
 }
 {
-core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_i, var_min_v); /* Direct call array#Array#[]= on <var_array:Array[nullable Object]>*/
+core___core__Array___core__abstract_collection__Sequence___91d_93d_61d(var_array, var_i, var_min_v); /* Direct call array$Array$[]= on <var_array:Array[nullable Object]>*/
 }
 } else {
 }
 {
-{ /* Inline kernel#Int#+ (var_i,1l) on <var_i:Int> */
+{ /* Inline kernel$Int$+ (var_i,1l) on <var_i:Int> */
 /* Covariant cast for argument 0 (i) <1l:Int> isa OTHER */
 /* <1l:Int> isa OTHER */
 var40 = 1; /* easy <1l:Int> isa OTHER*/
 if (unlikely(!var40)) {
 var_class_name43 = type_core__Int.name;
 PRINT_ERROR("Runtime error: Cast failed. Expected `%s`, got `%s`", "OTHER", var_class_name43);
-PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 731);
+PRINT_ERROR(" (%s:%d)\n", FILE_core__kernel, 728);
 fatal_exit(1);
 }
 var44 = var_i + 1l;
@@ -774,7 +774,7 @@ goto BREAK_label45;
 BREAK_label45: (void)0;
 RET_LABEL:;
 }
-/* method sorter#DefaultComparator#compare for (self: DefaultComparator, Comparable, Comparable): Int */
+/* method sorter$DefaultComparator$compare for (self: DefaultComparator, Comparable, Comparable): Int */
 long core___core__DefaultComparator___Comparator__compare(val* self, val* p0, val* p1) {
 long var /* : Int */;
 short int var1 /* : Bool */;
@@ -832,7 +832,7 @@ goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
-/* method sorter#Sys#default_comparator for (self: Sys): DefaultComparator */
+/* method sorter$Sys$default_comparator for (self: Sys): DefaultComparator */
 val* core__sorter___Sys___default_comparator(val* self) {
 val* var /* : DefaultComparator */;
 static val* varonce;
@@ -844,7 +844,7 @@ var1 = varonce;
 } else {
 var2 = NEW_core__DefaultComparator(&type_core__DefaultComparator);
 {
-{ /* Inline kernel#Object#init (var2) on <var2:DefaultComparator> */
+{ /* Inline kernel$Object$init (var2) on <var2:DefaultComparator> */
 RET_LABEL3:(void)0;
 }
 }