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

diff --git a/c_src/nitc__mpackage.sep.1.c b/c_src/nitc__mpackage.sep.1.c
index 9c2fb5b..c43954d 100644
--- a/c_src/nitc__mpackage.sep.1.c
+++ b/c_src/nitc__mpackage.sep.1.c
@@ -1,10 +1,13 @@
 #include "nitc__mpackage.sep.0.h"
-/* method mpackage#MPackage#name for (self: MPackage): String */
+/* method mpackage$MPackage$name for (self: MPackage): String */
 val* nitc___nitc__MPackage___nitc__model_base__MEntity__name(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
 var1 = self->attrs[COLOR_nitc__mpackage__MPackage___name].val; /* _name on <self:MPackage> */
 if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 27);
 fatal_exit(1);
@@ -13,20 +16,23 @@ var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MPackage#name= for (self: MPackage, String) */
+/* method mpackage$MPackage$name= for (self: MPackage, String) */
 void nitc___nitc__MPackage___name_61d(val* self, val* p0) {
 self->attrs[COLOR_nitc__mpackage__MPackage___name].val = p0; /* _name on <self:MPackage> */
 RET_LABEL:;
 }
-/* method mpackage#MPackage#full_name for (self: MPackage): String */
+/* method mpackage$MPackage$full_name for (self: MPackage): String */
 val* nitc___nitc__MPackage___nitc__model_base__MEntity__full_name(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
 val* var3 /* : String */;
 {
-{ /* Inline mpackage#MPackage#name (self) on <self:MPackage> */
+{ /* Inline mpackage$MPackage$name (self) on <self:MPackage> */
 var3 = self->attrs[COLOR_nitc__mpackage__MPackage___name].val; /* _name on <self:MPackage> */
 if (unlikely(var3 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 27);
 fatal_exit(1);
@@ -40,7 +46,7 @@ goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MPackage#c_name for (self: MPackage): String */
+/* method mpackage$MPackage$c_name for (self: MPackage): String */
 val* nitc___nitc__MPackage___nitc__model_base__MEntity__c_name(val* self) {
 val* var /* : String */;
 short int var1 /* : Bool */;
@@ -52,15 +58,21 @@ var1 = self->attrs[COLOR_nitc__mpackage__MPackage___c_name].val != NULL; /* _c_n
 if(likely(var1)) {
 var2 = self->attrs[COLOR_nitc__mpackage__MPackage___c_name].val; /* _c_name on <self:MPackage> */
 if (unlikely(var2 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _c_name");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 32);
 fatal_exit(1);
 }
 } else {
 {
-{ /* Inline mpackage#MPackage#name (self) on <self:MPackage> */
+{ /* Inline mpackage$MPackage$name (self) on <self:MPackage> */
 var5 = self->attrs[COLOR_nitc__mpackage__MPackage___name].val; /* _name on <self:MPackage> */
 if (unlikely(var5 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 27);
 fatal_exit(1);
@@ -79,12 +91,15 @@ var = var2;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MPackage#model for (self: MPackage): Model */
+/* method mpackage$MPackage$model for (self: MPackage): Model */
 val* nitc___nitc__MPackage___nitc__model_base__MEntity__model(val* self) {
 val* var /* : Model */;
 val* var1 /* : Model */;
 var1 = self->attrs[COLOR_nitc__mpackage__MPackage___model].val; /* _model on <self:MPackage> */
 if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 34);
 fatal_exit(1);
@@ -93,12 +108,34 @@ var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MPackage#model= for (self: MPackage, Model) */
+/* method mpackage$MPackage$model= for (self: MPackage, Model) */
 void nitc___nitc__MPackage___model_61d(val* self, val* p0) {
 self->attrs[COLOR_nitc__mpackage__MPackage___model].val = p0; /* _model on <self:MPackage> */
 RET_LABEL:;
 }
-/* method mpackage#MPackage#root for (self: MPackage): nullable MGroup */
+/* method mpackage$MPackage$location for (self: MPackage): Location */
+val* nitc___nitc__MPackage___nitc__model_base__MEntity__location(val* self) {
+val* var /* : Location */;
+val* var1 /* : Location */;
+var1 = self->attrs[COLOR_nitc__mpackage__MPackage___location].val; /* _location on <self:MPackage> */
+if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _location");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 37);
+fatal_exit(1);
+}
+var = var1;
+RET_LABEL:;
+return var;
+}
+/* method mpackage$MPackage$location= for (self: MPackage, Location) */
+void nitc___nitc__MPackage___location_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__mpackage__MPackage___location].val = p0; /* _location on <self:MPackage> */
+RET_LABEL:;
+}
+/* method mpackage$MPackage$root for (self: MPackage): nullable MGroup */
 val* nitc___nitc__MPackage___root(val* self) {
 val* var /* : nullable MGroup */;
 val* var1 /* : nullable MGroup */;
@@ -107,34 +144,40 @@ var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MPackage#root= for (self: MPackage, nullable MGroup) */
+/* method mpackage$MPackage$root= for (self: MPackage, nullable MGroup) */
 void nitc___nitc__MPackage___root_61d(val* self, val* p0) {
 self->attrs[COLOR_nitc__mpackage__MPackage___root].val = p0; /* _root on <self:MPackage> */
 RET_LABEL:;
 }
-/* method mpackage#MPackage#mgroups for (self: MPackage): POSet[MGroup] */
+/* method mpackage$MPackage$mgroups for (self: MPackage): POSet[MGroup] */
 val* nitc___nitc__MPackage___mgroups(val* self) {
 val* var /* : POSet[MGroup] */;
 val* var1 /* : POSet[MGroup] */;
 var1 = self->attrs[COLOR_nitc__mpackage__MPackage___mgroups].val; /* _mgroups on <self:MPackage> */
 if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mgroups");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 40);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 42);
 fatal_exit(1);
 }
 var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MPackage#to_s for (self: MPackage): String */
+/* method mpackage$MPackage$to_s for (self: MPackage): String */
 val* nitc___nitc__MPackage___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
 val* var3 /* : String */;
 {
-{ /* Inline mpackage#MPackage#name (self) on <self:MPackage> */
+{ /* Inline mpackage$MPackage$name (self) on <self:MPackage> */
 var3 = self->attrs[COLOR_nitc__mpackage__MPackage___name].val; /* _name on <self:MPackage> */
 if (unlikely(var3 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 27);
 fatal_exit(1);
@@ -148,7 +191,7 @@ goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MPackage#init for (self: MPackage) */
+/* method mpackage$MPackage$init for (self: MPackage) */
 void nitc___nitc__MPackage___core__kernel__Object__init(val* self) {
 val* var /* : Model */;
 val* var2 /* : Model */;
@@ -164,9 +207,12 @@ val* var14 /* : String */;
 ((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MPackage___core__kernel__Object__init]))(self); /* init on <self:MPackage>*/
 }
 {
-{ /* Inline mpackage#MPackage#model (self) on <self:MPackage> */
+{ /* Inline mpackage$MPackage$model (self) on <self:MPackage> */
 var2 = self->attrs[COLOR_nitc__mpackage__MPackage___model].val; /* _model on <self:MPackage> */
 if (unlikely(var2 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 34);
 fatal_exit(1);
@@ -176,11 +222,14 @@ RET_LABEL1:(void)0;
 }
 }
 {
-{ /* Inline mpackage#Model#mpackages (var) on <var:Model> */
+{ /* Inline mpackage$Model$mpackages (var) on <var:Model> */
 var5 = var->attrs[COLOR_nitc__mpackage__Model___mpackages].val; /* _mpackages on <var:Model> */
 if (unlikely(var5 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpackages");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 117);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 134);
 fatal_exit(1);
 }
 var3 = var5;
@@ -188,12 +237,15 @@ RET_LABEL4:(void)0;
 }
 }
 {
-core___core__Array___core__abstract_collection__SimpleCollection__add(var3, self); /* Direct call array#Array#add on <var3:Array[MPackage]>*/
+core___core__Array___core__abstract_collection__SimpleCollection__add(var3, self); /* Direct call array$Array$add on <var3:Array[MPackage]>*/
 }
 {
-{ /* Inline mpackage#MPackage#model (self) on <self:MPackage> */
+{ /* Inline mpackage$MPackage$model (self) on <self:MPackage> */
 var8 = self->attrs[COLOR_nitc__mpackage__MPackage___model].val; /* _model on <self:MPackage> */
 if (unlikely(var8 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 34);
 fatal_exit(1);
@@ -203,11 +255,14 @@ RET_LABEL7:(void)0;
 }
 }
 {
-{ /* Inline mpackage#Model#mpackage_by_name (var6) on <var6:Model> */
+{ /* Inline mpackage$Model$mpackage_by_name (var6) on <var6:Model> */
 var11 = var6->attrs[COLOR_nitc__mpackage__Model___mpackage_by_name].val; /* _mpackage_by_name on <var6:Model> */
 if (unlikely(var11 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpackage_by_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 120);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 137);
 fatal_exit(1);
 }
 var9 = var11;
@@ -215,9 +270,12 @@ RET_LABEL10:(void)0;
 }
 }
 {
-{ /* Inline mpackage#MPackage#name (self) on <self:MPackage> */
+{ /* Inline mpackage$MPackage$name (self) on <self:MPackage> */
 var14 = self->attrs[COLOR_nitc__mpackage__MPackage___name].val; /* _name on <self:MPackage> */
 if (unlikely(var14 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 27);
 fatal_exit(1);
@@ -227,49 +285,77 @@ RET_LABEL13:(void)0;
 }
 }
 {
-more_collections___more_collections__MultiHashMap___add_one(var9, var12, self); /* Direct call more_collections#MultiHashMap#add_one on <var9:MultiHashMap[String, MPackage]>*/
+more_collections___more_collections__MultiHashMap___add_one(var9, var12, self); /* Direct call more_collections$MultiHashMap$add_one on <var9:MultiHashMap[String, MPackage]>*/
 }
 RET_LABEL:;
 }
-/* method mpackage#MGroup#name for (self: MGroup): String */
+/* method mpackage$MGroup$name for (self: MGroup): String */
 val* nitc___nitc__MGroup___nitc__model_base__MEntity__name(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
 var1 = self->attrs[COLOR_nitc__mpackage__MGroup___name].val; /* _name on <self:MGroup> */
 if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 65);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 70);
 fatal_exit(1);
 }
 var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MGroup#name= for (self: MGroup, String) */
+/* method mpackage$MGroup$name= for (self: MGroup, String) */
 void nitc___nitc__MGroup___name_61d(val* self, val* p0) {
 self->attrs[COLOR_nitc__mpackage__MGroup___name].val = p0; /* _name on <self:MGroup> */
 RET_LABEL:;
 }
-/* method mpackage#MGroup#mpackage for (self: MGroup): MPackage */
+/* method mpackage$MGroup$location for (self: MGroup): Location */
+val* nitc___nitc__MGroup___nitc__model_base__MEntity__location(val* self) {
+val* var /* : Location */;
+val* var1 /* : Location */;
+var1 = self->attrs[COLOR_nitc__mpackage__MGroup___location].val; /* _location on <self:MGroup> */
+if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _location");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 74);
+fatal_exit(1);
+}
+var = var1;
+RET_LABEL:;
+return var;
+}
+/* method mpackage$MGroup$location= for (self: MGroup, Location) */
+void nitc___nitc__MGroup___location_61d(val* self, val* p0) {
+self->attrs[COLOR_nitc__mpackage__MGroup___location].val = p0; /* _location on <self:MGroup> */
+RET_LABEL:;
+}
+/* method mpackage$MGroup$mpackage for (self: MGroup): MPackage */
 val* nitc___nitc__MGroup___mpackage(val* self) {
 val* var /* : MPackage */;
 val* var1 /* : MPackage */;
 var1 = self->attrs[COLOR_nitc__mpackage__MGroup___mpackage].val; /* _mpackage on <self:MGroup> */
 if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpackage");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 69);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 76);
 fatal_exit(1);
 }
 var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MGroup#mpackage= for (self: MGroup, MPackage) */
+/* method mpackage$MGroup$mpackage= for (self: MGroup, MPackage) */
 void nitc___nitc__MGroup___mpackage_61d(val* self, val* p0) {
 self->attrs[COLOR_nitc__mpackage__MGroup___mpackage].val = p0; /* _mpackage on <self:MGroup> */
 RET_LABEL:;
 }
-/* method mpackage#MGroup#parent for (self: MGroup): nullable MGroup */
+/* method mpackage$MGroup$parent for (self: MGroup): nullable MGroup */
 val* nitc___nitc__MGroup___parent(val* self) {
 val* var /* : nullable MGroup */;
 val* var1 /* : nullable MGroup */;
@@ -278,12 +364,12 @@ var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MGroup#parent= for (self: MGroup, nullable MGroup) */
+/* method mpackage$MGroup$parent= for (self: MGroup, nullable MGroup) */
 void nitc___nitc__MGroup___parent_61d(val* self, val* p0) {
 self->attrs[COLOR_nitc__mpackage__MGroup___parent].val = p0; /* _parent on <self:MGroup> */
 RET_LABEL:;
 }
-/* method mpackage#MGroup#full_name for (self: MGroup): String */
+/* method mpackage$MGroup$full_name for (self: MGroup): String */
 val* nitc___nitc__MGroup___nitc__model_base__MEntity__full_name(val* self) {
 val* var /* : String */;
 val* var1 /* : nullable MGroup */;
@@ -294,20 +380,35 @@ short int var5 /* : Bool */;
 val* var_other /* var other: nullable Object */;
 short int var7 /* : Bool */;
 short int var9 /* : Bool */;
-val* var10 /* : String */;
-val* var12 /* : String */;
-val* var13 /* : NativeArray[String] */;
+val* var10 /* : NativeArray[String] */;
 static val* varonce;
-static val* varonce14;
-val* var15 /* : String */;
-char* var16 /* : NativeString */;
-val* var17 /* : String */;
-val* var18 /* : String */;
+static val* varonce11;
+val* var12 /* : String */;
+char* var13 /* : CString */;
+val* var14 /* : String */;
+val* var15 /* : nullable Int */;
+val* var16 /* : nullable Int */;
+val* var17 /* : nullable Bool */;
+val* var18 /* : nullable Bool */;
 val* var19 /* : String */;
 val* var21 /* : String */;
 val* var22 /* : String */;
+val* var24 /* : NativeArray[String] */;
+static val* varonce23;
+static val* varonce25;
+val* var26 /* : String */;
+char* var27 /* : CString */;
+val* var28 /* : String */;
+val* var29 /* : nullable Int */;
+val* var30 /* : nullable Int */;
+val* var31 /* : nullable Bool */;
+val* var32 /* : nullable Bool */;
+val* var33 /* : String */;
+val* var34 /* : String */;
+val* var36 /* : String */;
+val* var37 /* : String */;
 {
-{ /* Inline mpackage#MGroup#parent (self) on <self:MGroup> */
+{ /* Inline mpackage$MGroup$parent (self) on <self:MGroup> */
 var3 = self->attrs[COLOR_nitc__mpackage__MGroup___parent].val; /* _parent on <self:MGroup> */
 var1 = var3;
 RET_LABEL2:(void)0;
@@ -320,10 +421,10 @@ var4 = 1; /* is null */
 var4 = 0; /* arg is null but recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#== (var_p,((val*)NULL)) on <var_p:nullable MGroup> */
+{ /* Inline kernel$Object$== (var_p,((val*)NULL)) on <var_p:nullable MGroup> */
 var_other = ((val*)NULL);
 {
-{ /* Inline kernel#Object#is_same_instance (var_p,var_other) on <var_p:nullable MGroup(MGroup)> */
+{ /* Inline kernel$Object$is_same_instance (var_p,var_other) on <var_p:nullable MGroup(MGroup)> */
 var9 = var_p == var_other;
 var7 = var9;
 goto RET_LABEL8;
@@ -337,97 +438,205 @@ RET_LABEL6:(void)0;
 var4 = var5;
 }
 if (var4){
+if (unlikely(varonce==NULL)) {
+var10 = NEW_core__NativeArray((int)2l, &type_core__NativeArray__core__String);
+if (likely(varonce11!=NULL)) {
+var12 = varonce11;
+} else {
+var13 = ">";
+var15 = (val*)(1l<<2|1);
+var16 = (val*)(1l<<2|1);
+var17 = (val*)((long)(0)<<2|3);
+var18 = (val*)((long)(0)<<2|3);
+var14 = core__flat___CString___to_s_unsafe(var13, var15, var16, var17, var18);
+var12 = var14;
+varonce11 = var12;
+}
+((struct instance_core__NativeArray*)var10)->values[1]=var12;
+} else {
+var10 = varonce;
+varonce = NULL;
+}
 {
-{ /* Inline mpackage#MGroup#name (self) on <self:MGroup> */
-var12 = self->attrs[COLOR_nitc__mpackage__MGroup___name].val; /* _name on <self:MGroup> */
-if (unlikely(var12 == NULL)) {
+{ /* Inline mpackage$MGroup$name (self) on <self:MGroup> */
+var21 = self->attrs[COLOR_nitc__mpackage__MGroup___name].val; /* _name on <self:MGroup> */
+if (unlikely(var21 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 65);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 70);
 fatal_exit(1);
 }
-var10 = var12;
-RET_LABEL11:(void)0;
+var19 = var21;
+RET_LABEL20:(void)0;
+}
 }
+((struct instance_core__NativeArray*)var10)->values[0]=var19;
+{
+var22 = ((val*(*)(val* self))(var10->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var10); /* native_to_s on <var10:NativeArray[String]>*/
 }
-var = var10;
+varonce = var10;
+var = var22;
 goto RET_LABEL;
 } else {
 }
-if (unlikely(varonce==NULL)) {
-var13 = NEW_core__NativeArray(3l, &type_core__NativeArray__core__String);
-if (likely(varonce14!=NULL)) {
-var15 = varonce14;
+if (unlikely(varonce23==NULL)) {
+var24 = NEW_core__NativeArray((int)3l, &type_core__NativeArray__core__String);
+if (likely(varonce25!=NULL)) {
+var26 = varonce25;
 } else {
-var16 = "/";
-var17 = core__flat___NativeString___to_s_full(var16, 1l, 1l);
-var15 = var17;
-varonce14 = var15;
-}
-((struct instance_core__NativeArray*)var13)->values[1]=var15;
+var27 = ">";
+var29 = (val*)(1l<<2|1);
+var30 = (val*)(1l<<2|1);
+var31 = (val*)((long)(0)<<2|3);
+var32 = (val*)((long)(0)<<2|3);
+var28 = core__flat___CString___to_s_unsafe(var27, var29, var30, var31, var32);
+var26 = var28;
+varonce25 = var26;
+}
+((struct instance_core__NativeArray*)var24)->values[2]=var26;
 } else {
-var13 = varonce;
-varonce = NULL;
+var24 = varonce23;
+varonce23 = NULL;
 }
 {
-var18 = nitc___nitc__MGroup___nitc__model_base__MEntity__full_name(var_p);
+var33 = nitc___nitc__MGroup___nitc__model_base__MEntity__full_name(var_p);
 }
-((struct instance_core__NativeArray*)var13)->values[0]=var18;
+((struct instance_core__NativeArray*)var24)->values[0]=var33;
 {
-{ /* Inline mpackage#MGroup#name (self) on <self:MGroup> */
-var21 = self->attrs[COLOR_nitc__mpackage__MGroup___name].val; /* _name on <self:MGroup> */
-if (unlikely(var21 == NULL)) {
+{ /* Inline mpackage$MGroup$name (self) on <self:MGroup> */
+var36 = self->attrs[COLOR_nitc__mpackage__MGroup___name].val; /* _name on <self:MGroup> */
+if (unlikely(var36 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 65);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 70);
 fatal_exit(1);
 }
-var19 = var21;
-RET_LABEL20:(void)0;
+var34 = var36;
+RET_LABEL35:(void)0;
 }
 }
-((struct instance_core__NativeArray*)var13)->values[2]=var19;
+((struct instance_core__NativeArray*)var24)->values[1]=var34;
 {
-var22 = ((val*(*)(val* self))(var13->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var13); /* native_to_s on <var13:NativeArray[String]>*/
+var37 = ((val*(*)(val* self))(var24->class->vft[COLOR_core__abstract_text__NativeArray__native_to_s]))(var24); /* native_to_s on <var24:NativeArray[String]>*/
 }
-varonce = var13;
-var = var22;
+varonce23 = var24;
+var = var37;
 goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MGroup#in_nesting for (self: MGroup): POSetElement[MGroup] */
+/* method mpackage$MGroup$in_nesting for (self: MGroup): POSetElement[MGroup] */
 val* nitc___nitc__MGroup___in_nesting(val* self) {
 val* var /* : POSetElement[MGroup] */;
 val* var1 /* : POSetElement[MGroup] */;
 var1 = self->attrs[COLOR_nitc__mpackage__MGroup___in_nesting].val; /* _in_nesting on <self:MGroup> */
 if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _in_nesting");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 85);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 95);
 fatal_exit(1);
 }
 var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MGroup#in_nesting= for (self: MGroup, POSetElement[MGroup]) */
+/* method mpackage$MGroup$in_nesting= for (self: MGroup, POSetElement[MGroup]) */
 void nitc___nitc__MGroup___in_nesting_61d(val* self, val* p0) {
 self->attrs[COLOR_nitc__mpackage__MGroup___in_nesting].val = p0; /* _in_nesting on <self:MGroup> */
 RET_LABEL:;
 }
-/* method mpackage#MGroup#filepath for (self: MGroup): nullable String */
+/* method mpackage$MGroup$filepath for (self: MGroup): nullable String */
 val* nitc___nitc__MGroup___filepath(val* self) {
 val* var /* : nullable String */;
-val* var1 /* : nullable String */;
-var1 = self->attrs[COLOR_nitc__mpackage__MGroup___filepath].val; /* _filepath on <self:MGroup> */
-var = var1;
-RET_LABEL:;
-return var;
+val* var1 /* : Location */;
+val* var3 /* : Location */;
+val* var4 /* : nullable SourceFile */;
+val* var6 /* : nullable SourceFile */;
+val* var_res /* var res: nullable Object */;
+short int var7 /* : Bool */;
+short int var8 /* : Bool */;
+val* var_other /* var other: nullable Object */;
+short int var10 /* : Bool */;
+short int var12 /* : Bool */;
+val* var13 /* : String */;
+val* var15 /* : String */;
+{
+{ /* Inline mpackage$MGroup$location (self) on <self:MGroup> */
+var3 = self->attrs[COLOR_nitc__mpackage__MGroup___location].val; /* _location on <self:MGroup> */
+if (unlikely(var3 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _location");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 74);
+fatal_exit(1);
+}
+var1 = var3;
+RET_LABEL2:(void)0;
+}
+}
+{
+{ /* Inline location$Location$file (var1) on <var1:Location> */
+var6 = var1->attrs[COLOR_nitc__location__Location___file].val; /* _file on <var1:Location> */
+var4 = var6;
+RET_LABEL5:(void)0;
+}
+}
+var_res = var4;
+if (var_res == NULL) {
+var7 = 1; /* is null */
+} else {
+var7 = 0; /* arg is null but recv is not */
 }
-/* method mpackage#MGroup#filepath= for (self: MGroup, nullable String) */
-void nitc___nitc__MGroup___filepath_61d(val* self, val* p0) {
-self->attrs[COLOR_nitc__mpackage__MGroup___filepath].val = p0; /* _filepath on <self:MGroup> */
+if (0) {
+{ /* Inline kernel$Object$== (var_res,((val*)NULL)) on <var_res:nullable Object(nullable SourceFile)> */
+var_other = ((val*)NULL);
+{
+{ /* Inline kernel$Object$is_same_instance (var_res,var_other) on <var_res:nullable Object(SourceFile)> */
+var12 = var_res == var_other;
+var10 = var12;
+goto RET_LABEL11;
+RET_LABEL11:(void)0;
+}
+}
+var8 = var10;
+goto RET_LABEL9;
+RET_LABEL9:(void)0;
+}
+var7 = var8;
+}
+if (var7){
+var = ((val*)NULL);
+goto RET_LABEL;
+} else {
+}
+{
+{ /* Inline location$SourceFile$filename (var_res) on <var_res:nullable Object(SourceFile)> */
+var15 = var_res->attrs[COLOR_nitc__location__SourceFile___filename].val; /* _filename on <var_res:nullable Object(SourceFile)> */
+if (unlikely(var15 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
+PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _filename");
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__location, 22);
+fatal_exit(1);
+}
+var13 = var15;
+RET_LABEL14:(void)0;
+}
+}
+var = var13;
+goto RET_LABEL;
 RET_LABEL:;
+return var;
 }
-/* method mpackage#MGroup#init for (self: MGroup) */
+/* method mpackage$MGroup$init for (self: MGroup) */
 void nitc___nitc__MGroup___core__kernel__Object__init(val* self) {
 val* var /* : MPackage */;
 val* var2 /* : MPackage */;
@@ -447,11 +656,14 @@ short int var15 /* : Bool */;
 ((void(*)(val* self))(self->class->vft[COLOR_nitc___nitc__MGroup___core__kernel__Object__init]))(self); /* init on <self:MGroup>*/
 }
 {
-{ /* Inline mpackage#MGroup#mpackage (self) on <self:MGroup> */
+{ /* Inline mpackage$MGroup$mpackage (self) on <self:MGroup> */
 var2 = self->attrs[COLOR_nitc__mpackage__MGroup___mpackage].val; /* _mpackage on <self:MGroup> */
 if (unlikely(var2 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpackage");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 69);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 76);
 fatal_exit(1);
 }
 var = var2;
@@ -459,11 +671,14 @@ RET_LABEL1:(void)0;
 }
 }
 {
-{ /* Inline mpackage#MPackage#mgroups (var) on <var:MPackage> */
+{ /* Inline mpackage$MPackage$mgroups (var) on <var:MPackage> */
 var5 = var->attrs[COLOR_nitc__mpackage__MPackage___mgroups].val; /* _mgroups on <var:MPackage> */
 if (unlikely(var5 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mgroups");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 40);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 42);
 fatal_exit(1);
 }
 var3 = var5;
@@ -475,13 +690,13 @@ var_tree = var3;
 var6 = poset___poset__POSet___add_node(var_tree, self);
 }
 {
-{ /* Inline mpackage#MGroup#in_nesting= (self,var6) on <self:MGroup> */
+{ /* Inline mpackage$MGroup$in_nesting= (self,var6) on <self:MGroup> */
 self->attrs[COLOR_nitc__mpackage__MGroup___in_nesting].val = var6; /* _in_nesting on <self:MGroup> */
 RET_LABEL7:(void)0;
 }
 }
 {
-{ /* Inline mpackage#MGroup#parent (self) on <self:MGroup> */
+{ /* Inline mpackage$MGroup$parent (self) on <self:MGroup> */
 var10 = self->attrs[COLOR_nitc__mpackage__MGroup___parent].val; /* _parent on <self:MGroup> */
 var8 = var10;
 RET_LABEL9:(void)0;
@@ -494,7 +709,7 @@ var11 = 0; /* is null */
 var11 = 1; /* arg is null and recv is not */
 }
 if (0) {
-{ /* Inline kernel#Object#!= (var_parent,((val*)NULL)) on <var_parent:nullable MGroup> */
+{ /* Inline kernel$Object$!= (var_parent,((val*)NULL)) on <var_parent:nullable MGroup> */
 var_other = ((val*)NULL);
 {
 var14 = ((short int(*)(val* self, val* p0))(var_parent->class->vft[COLOR_core__kernel__Object___61d_61d]))(var_parent, var_other); /* == on <var_parent:nullable MGroup(MGroup)>*/
@@ -508,13 +723,13 @@ var11 = var12;
 }
 if (var11){
 {
-poset___poset__POSet___add_edge(var_tree, self, var_parent); /* Direct call poset#POSet#add_edge on <var_tree:POSet[MGroup]>*/
+poset___poset__POSet___add_edge(var_tree, self, var_parent); /* Direct call poset$POSet$add_edge on <var_tree:POSet[MGroup]>*/
 }
 } else {
 }
 RET_LABEL:;
 }
-/* method mpackage#MGroup#model for (self: MGroup): Model */
+/* method mpackage$MGroup$model for (self: MGroup): Model */
 val* nitc___nitc__MGroup___nitc__model_base__MEntity__model(val* self) {
 val* var /* : Model */;
 val* var1 /* : MPackage */;
@@ -522,11 +737,14 @@ val* var3 /* : MPackage */;
 val* var4 /* : Model */;
 val* var6 /* : Model */;
 {
-{ /* Inline mpackage#MGroup#mpackage (self) on <self:MGroup> */
+{ /* Inline mpackage$MGroup$mpackage (self) on <self:MGroup> */
 var3 = self->attrs[COLOR_nitc__mpackage__MGroup___mpackage].val; /* _mpackage on <self:MGroup> */
 if (unlikely(var3 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpackage");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 69);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 76);
 fatal_exit(1);
 }
 var1 = var3;
@@ -534,9 +752,12 @@ RET_LABEL2:(void)0;
 }
 }
 {
-{ /* Inline mpackage#MPackage#model (var1) on <var1:MPackage> */
+{ /* Inline mpackage$MPackage$model (var1) on <var1:MPackage> */
 var6 = var1->attrs[COLOR_nitc__mpackage__MPackage___model].val; /* _model on <var1:MPackage> */
 if (unlikely(var6 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _model");
 PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 34);
 fatal_exit(1);
@@ -550,17 +771,20 @@ goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#MGroup#to_s for (self: MGroup): String */
+/* method mpackage$MGroup$to_s for (self: MGroup): String */
 val* nitc___nitc__MGroup___core__abstract_text__Object__to_s(val* self) {
 val* var /* : String */;
 val* var1 /* : String */;
 val* var3 /* : String */;
 {
-{ /* Inline mpackage#MGroup#name (self) on <self:MGroup> */
+{ /* Inline mpackage$MGroup$name (self) on <self:MGroup> */
 var3 = self->attrs[COLOR_nitc__mpackage__MGroup___name].val; /* _name on <self:MGroup> */
 if (unlikely(var3 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 65);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 70);
 fatal_exit(1);
 }
 var1 = var3;
@@ -572,28 +796,34 @@ goto RET_LABEL;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#Model#mpackages for (self: Model): Array[MPackage] */
+/* method mpackage$Model$mpackages for (self: Model): Array[MPackage] */
 val* nitc__mpackage___Model___mpackages(val* self) {
 val* var /* : Array[MPackage] */;
 val* var1 /* : Array[MPackage] */;
 var1 = self->attrs[COLOR_nitc__mpackage__Model___mpackages].val; /* _mpackages on <self:Model> */
 if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpackages");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 117);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 134);
 fatal_exit(1);
 }
 var = var1;
 RET_LABEL:;
 return var;
 }
-/* method mpackage#Model#mpackage_by_name for (self: Model): MultiHashMap[String, MPackage] */
+/* method mpackage$Model$mpackage_by_name for (self: Model): MultiHashMap[String, MPackage] */
 val* nitc__mpackage___Model___mpackage_by_name(val* self) {
 val* var /* : MultiHashMap[String, MPackage] */;
 val* var1 /* : MultiHashMap[String, MPackage] */;
 var1 = self->attrs[COLOR_nitc__mpackage__Model___mpackage_by_name].val; /* _mpackage_by_name on <self:Model> */
 if (unlikely(var1 == NULL)) {
+if(catchStack.cursor >= 0){
+longjmp(catchStack.envs[catchStack.cursor], 1);
+}
 PRINT_ERROR("Runtime error: %s", "Uninitialized attribute _mpackage_by_name");
-PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 120);
+PRINT_ERROR(" (%s:%d)\n", FILE_nitc__mpackage, 137);
 fatal_exit(1);
 }
 var = var1;