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

diff --git a/c_src/syntax._sep.c b/c_src/syntax._sep.c
index 2a77a27..be5ae63 100644
--- a/c_src/syntax._sep.c
+++ b/c_src/syntax._sep.c
@@ -1,13 +1,22 @@
 /* This C file is generated by NIT to compile module syntax. */
 #include "syntax._sep.h"
 val_t syntax___SrcModuleLoader___file_type(val_t  self) {
-  struct trace_t trace = {NULL, NULL, 31, LOCATE_syntax___SrcModuleLoader___file_type};
+  struct trace_t trace = {NULL, NULL, 30, LOCATE_syntax___SrcModuleLoader___file_type};
+  static val_t once_value_1 = NIT_NULL; /* Once value for string variable[2]*/
   val_t variable[3];
-  void **closurevariable = NULL;
+  struct WBT_ **closurevariable = NULL;
   trace.prev = tracehead; tracehead = &trace;
   trace.file = LOCATE_syntax;
+  /* Register variable[0]: Local variable */
   variable[0] =  self;
-  variable[2] = NEW_String_string___String___with_native(BOX_NativeString("nit"), TAG_Int(3)); /*new String*/
+  /* Register variable[1]: Method return value and escape marker */
+  /* Register variable[2]: Once String constant */
+  if (once_value_1 != NIT_NULL) variable[2] = once_value_1;
+  else {
+    variable[2] = NEW_String_string___String___with_native(BOX_NativeString("nit"), TAG_Int(3)) /*new String*/;
+    once_value_1 = variable[2];
+  }
+  /* Register variable[2]: Result */
   variable[1] = variable[2];
   goto return_label0;
   return_label0: while(false);
@@ -15,139 +24,189 @@ val_t syntax___SrcModuleLoader___file_type(val_t  self) {
   return variable[1];
 }
 val_t syntax___SrcModuleLoader___parse_file(val_t  self, val_t  param0, val_t  param1, val_t  param2, val_t  param3, val_t  param4) {
-  struct trace_t trace = {NULL, NULL, 33, LOCATE_syntax___SrcModuleLoader___parse_file};
-  val_t variable[22];
-  void **closurevariable = NULL;
+  struct trace_t trace = {NULL, NULL, 32, LOCATE_syntax___SrcModuleLoader___parse_file};
+    static val_t once_value_3 = NIT_NULL; /* Once value for string variable[12]*/
+    static val_t once_value_4 = NIT_NULL; /* Once value for string variable[12]*/
+    static val_t once_value_5 = NIT_NULL; /* Once value for string variable[12]*/
+  val_t variable[13];
+  struct WBT_ **closurevariable = NULL;
   trace.prev = tracehead; tracehead = &trace;
   trace.file = LOCATE_syntax;
+  /* Register variable[0]: Local variable */
   variable[0] =  self;
+  /* Register variable[1]: Local variable */
   variable[1] =  param0;
+  /* Register variable[2]: Local variable */
   variable[2] =  param1;
+  /* Register variable[3]: Local variable */
   variable[3] =  param2;
+  /* Register variable[4]: Local variable */
   variable[4] =  param3;
+  /* Register variable[5]: Local variable */
   variable[5] =  param4;
-  variable[8] = NEW_Lexer_lexer___Lexer___init( variable[2] /*file*/,  variable[3] /*filename*/); /*new Lexer*/
+  /* Register variable[6]: Method return value and escape marker */
+  /* Register variable[7]: Local variable */
+  /* Register variable[8]: Result */
+  variable[8] = NEW_Lexer_lexer___Lexer___init( variable[2] /*file*/,  variable[3] /*filename*/) /*new Lexer*/;
   variable[7] = variable[8];
-  variable[9] = NEW_Parser_parser___Parser___init( variable[7] /*lexer*/); /*new Parser*/
+  /* Register variable[8]: Local variable */
+  /* Register variable[9]: Result */
+  variable[9] = NEW_Parser_parser___Parser___init( variable[7] /*lexer*/) /*new Parser*/;
   variable[8] = variable[9];
-  variable[10] = ((parser___Parser___parse_t)CALL( variable[8] /*parser*/,COLOR_parser___Parser___parse))( variable[8] /*parser*/) /*Parser::parse*/;
+  /* Register variable[9]: Local variable */
+  /* Register variable[10]: Result */
+  variable[10] = CALL_parser___Parser___parse( variable[8] /*parser*/)( variable[8] /*parser*/) /*Parser::parse*/;
   variable[9] = variable[10];
-  variable[10] = ((parser_nodes___Start___n_base_t)CALL( variable[9] /*node_tree*/,COLOR_parser_nodes___Start___n_base))( variable[9] /*node_tree*/) /*Start::n_base*/;
-  variable[10] = TAG_Bool((variable[10] ==  NIT_NULL /*null*/) || ((variable[10] != NIT_NULL) && ((((kernel___Object_____eqeq_t)CALL(variable[10],COLOR_kernel___Object_____eqeq))==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable[10], NIT_NULL /*null*/)):(UNTAG_Bool(((kernel___Object_____eqeq_t)CALL(variable[10],COLOR_kernel___Object_____eqeq))(variable[10],  NIT_NULL /*null*/) /*Object::==*/)))));
+  /* Register variable[10]: Result */
+  variable[10] = CALL_parser_nodes___Start___n_base( variable[9] /*node_tree*/)( variable[9] /*node_tree*/) /*Start::n_base*/;
+  /* Register variable[10]: Result */
+  variable[10] = TAG_Bool((variable[10] ==  NIT_NULL /*null*/) || ((variable[10] != NIT_NULL) && ((CALL_kernel___Object_____eqeq(variable[10])==kernel___Object_____eqeq)?(IS_EQUAL_NN(variable[10], NIT_NULL /*null*/)):(UNTAG_Bool(CALL_kernel___Object_____eqeq(variable[10])(variable[10],  NIT_NULL /*null*/) /*Object::==*/)))));
   if (UNTAG_Bool(variable[10])) { /*if*/
-    variable[11] = ((parser_nodes___Start___n_eof_t)CALL( variable[9] /*node_tree*/,COLOR_parser_nodes___Start___n_eof))( variable[9] /*node_tree*/) /*Start::n_eof*/;
+    /* Register variable[10]: Local variable */
+    /* Register variable[11]: Result */
+    variable[11] = CALL_parser_nodes___Start___n_eof( variable[9] /*node_tree*/)( variable[9] /*node_tree*/) /*Start::n_eof*/;
     variable[10] = variable[11];
+    /* Register variable[11]: Result */
     variable[11] = TAG_Bool(( variable[10] /*err*/==NIT_NULL) || VAL_ISA( variable[10] /*err*/, COLOR_PError, ID_PError)) /*cast PError*/;
-    if (!UNTAG_Bool(variable[11])) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_syntax___SrcModuleLoader___parse_file, LOCATE_syntax, 40); nit_exit(1);}
-    variable[11] = NEW_String_string___String___init(); /*new String*/
-    variable[12] = NEW_String_string___String___with_native(BOX_NativeString(""), TAG_Int(0)); /*new String*/
-    variable[13] = variable[12];
-    ((string___String___append_t)CALL(variable[11],COLOR_abstract_collection___IndexedCollection___append))(variable[11], variable[13]) /*String::append*/;
-    variable[14] = ((parser_prod___Token___locate_t)CALL( variable[10] /*err*/,COLOR_parser_prod___PNode___locate))( variable[10] /*err*/) /*Token::locate*/;
-    variable[15] = variable[14];
-    ((string___String___append_t)CALL(variable[11],COLOR_abstract_collection___IndexedCollection___append))(variable[11], variable[15]) /*String::append*/;
-    variable[16] = NEW_String_string___String___with_native(BOX_NativeString(": "), TAG_Int(2)); /*new String*/
-    variable[17] = variable[16];
-    ((string___String___append_t)CALL(variable[11],COLOR_abstract_collection___IndexedCollection___append))(variable[11], variable[17]) /*String::append*/;
-    variable[18] = ((lexer___PError___message_t)CALL( variable[10] /*err*/,COLOR_lexer___PError___message))( variable[10] /*err*/) /*PError::message*/;
-    variable[19] = variable[18];
-    ((string___String___append_t)CALL(variable[11],COLOR_abstract_collection___IndexedCollection___append))(variable[11], variable[19]) /*String::append*/;
-    variable[20] = NEW_String_string___String___with_native(BOX_NativeString(""), TAG_Int(0)); /*new String*/
-    variable[21] = variable[20];
-    ((string___String___append_t)CALL(variable[11],COLOR_abstract_collection___IndexedCollection___append))(variable[11], variable[21]) /*String::append*/;
-    ((mmloader___ToolContext___error_t)CALL( variable[1] /*context*/,COLOR_mmloader___ToolContext___error))( variable[1] /*context*/, variable[11]) /*ToolContext::error*/;
-    variable[11] = variable[0];
+    if (!UNTAG_Bool(variable[11])) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_syntax___SrcModuleLoader___parse_file, LOCATE_syntax, 39); nit_exit(1);}
+    variable[11] = NEW_Array_array___Array___with_capacity(TAG_Int(5)) /*new Array[String]*/ /* Ensure var: Array (for super-string)*/;
+    /* Register variable[12]: Once String constant */
+    if (once_value_3 != NIT_NULL) variable[12] = once_value_3;
+    else {
+      variable[12] = NEW_String_string___String___with_native(BOX_NativeString(""), TAG_Int(0)) /*new String*/;
+      once_value_3 = variable[12];
+    }
+    /* Register variable[12]: Result */
+    /* Ensure var variable[12]: super-string element*/
+    CALL_abstract_collection___SimpleCollection___add(variable[11])(variable[11], variable[12]) /*AbstractArray::add*/;
+    /* Register variable[12]: Result */
+    variable[12] = CALL_parser_prod___PNode___locate( variable[10] /*err*/)( variable[10] /*err*/) /*Token::locate*/;
+    /* Ensure var variable[12]: super-string element*/
+    CALL_abstract_collection___SimpleCollection___add(variable[11])(variable[11], variable[12]) /*AbstractArray::add*/;
+    /* Register variable[12]: Once String constant */
+    if (once_value_4 != NIT_NULL) variable[12] = once_value_4;
+    else {
+      variable[12] = NEW_String_string___String___with_native(BOX_NativeString(": "), TAG_Int(2)) /*new String*/;
+      once_value_4 = variable[12];
+    }
+    /* Register variable[12]: Result */
+    /* Ensure var variable[12]: super-string element*/
+    CALL_abstract_collection___SimpleCollection___add(variable[11])(variable[11], variable[12]) /*AbstractArray::add*/;
+    /* Register variable[12]: Result */
+    variable[12] = CALL_lexer___PError___message( variable[10] /*err*/)( variable[10] /*err*/) /*PError::message*/;
+    /* Ensure var variable[12]: super-string element*/
+    CALL_abstract_collection___SimpleCollection___add(variable[11])(variable[11], variable[12]) /*AbstractArray::add*/;
+    /* Register variable[12]: Once String constant */
+    if (once_value_5 != NIT_NULL) variable[12] = once_value_5;
+    else {
+      variable[12] = NEW_String_string___String___with_native(BOX_NativeString(""), TAG_Int(0)) /*new String*/;
+      once_value_5 = variable[12];
+    }
+    /* Register variable[12]: Result */
+    /* Ensure var variable[12]: super-string element*/
+    CALL_abstract_collection___SimpleCollection___add(variable[11])(variable[11], variable[12]) /*AbstractArray::add*/;
+    /* Register variable[11]: Result */
+    variable[11] = CALL_string___Object___to_s(variable[11])(variable[11]) /*Object::to_s*/;
+    CALL_mmloader___ToolContext___error( variable[1] /*context*/)( variable[1] /*context*/, variable[11]) /*ToolContext::error*/;
     exit(UNTAG_Int( TAG_Int(1)));
   }
-  variable[11] = ((parser_nodes___Start___n_base_t)CALL( variable[9] /*node_tree*/,COLOR_parser_nodes___Start___n_base))( variable[9] /*node_tree*/) /*Start::n_base*/;
+  /* Register variable[10]: Local variable */
+  /* Register variable[11]: Result */
+  variable[11] = CALL_parser_nodes___Start___n_base( variable[9] /*node_tree*/)( variable[9] /*node_tree*/) /*Start::n_base*/;
   variable[10] = variable[11];
+  /* Register variable[11]: Result */
   variable[11] = TAG_Bool(( variable[10] /*node_module*/==NIT_NULL) || VAL_ISA( variable[10] /*node_module*/, COLOR_AModule, ID_AModule)) /*cast AModule*/;
-  if (!UNTAG_Bool(variable[11])) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_syntax___SrcModuleLoader___parse_file, LOCATE_syntax, 45); nit_exit(1);}
-  variable[12] = NEW_MMSrcModule_syntax_base___MMSrcModule___init( variable[1] /*context*/,  variable[10] /*node_module*/,  variable[5] /*dir*/,  variable[4] /*name*/); /*new MMSrcModule*/
+  if (!UNTAG_Bool(variable[11])) { fprintf(stderr, "Assert%s failed", ""); fprintf(stderr, " in %s (%s:%d)\n", LOCATE_syntax___SrcModuleLoader___parse_file, LOCATE_syntax, 44); nit_exit(1);}
+  /* Register variable[11]: Local variable */
+  /* Register variable[12]: Result */
+  variable[12] = NEW_MMSrcModule_syntax_base___MMSrcModule___init( variable[1] /*context*/,  variable[10] /*node_module*/,  variable[5] /*dir*/,  variable[4] /*name*/,  variable[3] /*filename*/) /*new MMSrcModule*/;
   variable[11] = variable[12];
   variable[6] =  variable[11] /*module*/;
-  goto return_label1;
-  return_label1: while(false);
+  goto return_label2;
+  return_label2: while(false);
   tracehead = trace.prev;
   return variable[6];
 }
 void syntax___SrcModuleLoader___process_metamodel(val_t  self, val_t  param0, val_t  param1) {
-  struct trace_t trace = {NULL, NULL, 52, LOCATE_syntax___SrcModuleLoader___process_metamodel};
+  struct trace_t trace = {NULL, NULL, 49, LOCATE_syntax___SrcModuleLoader___process_metamodel};
   val_t variable[4];
-  void **closurevariable = NULL;
+  struct WBT_ **closurevariable = NULL;
   trace.prev = tracehead; tracehead = &trace;
   trace.file = LOCATE_syntax;
+  /* Register variable[0]: Local variable */
   variable[0] =  self;
+  /* Register variable[1]: Local variable */
   variable[1] =  param0;
+  /* Register variable[2]: Local variable */
   variable[2] =  param1;
-  ((syntax___MMSrcModule___process_supermodules_t)CALL( variable[2] /*module*/,COLOR_syntax___MMSrcModule___process_supermodules))( variable[2] /*module*/,  variable[1] /*context*/) /*MMSrcModule::process_supermodules*/;
-  ((syntax___MMSrcModule___process_syntax_t)CALL( variable[2] /*module*/,COLOR_syntax___MMSrcModule___process_syntax))( variable[2] /*module*/,  variable[1] /*context*/) /*MMSrcModule::process_syntax*/;
-  return_label2: while(false);
+  /* Register variable[3]: Method return value and escape marker */
+  CALL_syntax___MMSrcModule___process_supermodules( variable[2] /*module*/)( variable[2] /*module*/,  variable[1] /*context*/) /*MMSrcModule::process_supermodules*/;
+  CALL_syntax___MMSrcModule___process_syntax( variable[2] /*module*/)( variable[2] /*module*/,  variable[1] /*context*/) /*MMSrcModule::process_syntax*/;
+  return_label6: while(false);
   tracehead = trace.prev;
   return;
 }
 void syntax___SrcModuleLoader___init(val_t  self, int* init_table) {
-  struct trace_t trace = {NULL, NULL, 58, LOCATE_syntax___SrcModuleLoader___init};
+  struct trace_t trace = {NULL, NULL, 55, LOCATE_syntax___SrcModuleLoader___init};
   val_t variable[2];
-  void **closurevariable = NULL;
+  struct WBT_ **closurevariable = NULL;
   trace.prev = tracehead; tracehead = &trace;
   trace.file = LOCATE_syntax;
+  /* Register variable[0]: Local variable */
   variable[0] =  self;
-  if (init_table[VAL2OBJ( self)->vft[INIT_TABLE_POS_SrcModuleLoader].i]) return;
-  return_label3: while(false);
-  init_table[VAL2OBJ( self)->vft[INIT_TABLE_POS_SrcModuleLoader].i] = 1;
+  if (init_table[VAL2OBJ(variable[0])->vft[INIT_TABLE_POS_SrcModuleLoader].i]) return;
+  /* Register variable[1]: Method return value and escape marker */
+  return_label7: while(false);
+  init_table[VAL2OBJ(variable[0])->vft[INIT_TABLE_POS_SrcModuleLoader].i] = 1;
   tracehead = trace.prev;
   return;
 }
 void syntax___MMSrcModule___process_supermodules(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, NULL, 62, LOCATE_syntax___MMSrcModule___process_supermodules};
-  val_t variable[5];
-  void **closurevariable = NULL;
+  struct trace_t trace = {NULL, NULL, 59, LOCATE_syntax___MMSrcModule___process_supermodules};
+  val_t variable[4];
+  struct WBT_ **closurevariable = NULL;
   trace.prev = tracehead; tracehead = &trace;
   trace.file = LOCATE_syntax;
+  /* Register variable[0]: Local variable */
   variable[0] =  self;
+  /* Register variable[1]: Local variable */
   variable[1] =  param0;
-  variable[3] = variable[0];
-  variable[3] = ((syntax_base___MMSrcModule___node_t)CALL(variable[3],COLOR_syntax_base___MMSrcModule___node))(variable[3]) /*MMSrcModule::node*/;
-  variable[4] = variable[0];
-  ((mmbuilder___AModule___import_super_modules_t)CALL(variable[3],COLOR_mmbuilder___AModule___import_super_modules))(variable[3],  variable[1] /*tc*/, variable[4]) /*AModule::import_super_modules*/;
-  return_label4: while(false);
+  /* Register variable[2]: Method return value and escape marker */
+  /* Register variable[3]: Result */
+  variable[3] = CALL_syntax_base___MMSrcModule___node(variable[0])(variable[0]) /*MMSrcModule::node*/;
+  CALL_mmbuilder___AModule___import_super_modules(variable[3])(variable[3],  variable[1] /*tc*/, variable[0]) /*AModule::import_super_modules*/;
+  return_label8: while(false);
   tracehead = trace.prev;
   return;
 }
 void syntax___MMSrcModule___process_syntax(val_t  self, val_t  param0) {
-  struct trace_t trace = {NULL, NULL, 69, LOCATE_syntax___MMSrcModule___process_syntax};
+  struct trace_t trace = {NULL, NULL, 65, LOCATE_syntax___MMSrcModule___process_syntax};
   val_t variable[4];
-  void **closurevariable = NULL;
+  struct WBT_ **closurevariable = NULL;
   trace.prev = tracehead; tracehead = &trace;
   trace.file = LOCATE_syntax;
+  /* Register variable[0]: Local variable */
   variable[0] =  self;
+  /* Register variable[1]: Local variable */
   variable[1] =  param0;
-  variable[3] = variable[0];
-  ((mmbuilder___MMSrcModule___do_mmbuilder_t)CALL(variable[3],COLOR_mmbuilder___MMSrcModule___do_mmbuilder))(variable[3],  variable[1] /*tc*/) /*MMSrcModule::do_mmbuilder*/;
-  variable[3] = ((mmloader___ToolContext___error_count_t)CALL( variable[1] /*tc*/,COLOR_mmloader___ToolContext___error_count))( variable[1] /*tc*/) /*ToolContext::error_count*/;
-  variable[3] = TAG_Bool(UNTAG_Int(variable[3])>UNTAG_Int( TAG_Int(0)));
-  if (UNTAG_Bool(variable[3])) { /*if*/
-    variable[3] = variable[0];
-    exit(UNTAG_Int( TAG_Int(1)));
-  }
-  variable[3] = variable[0];
-  ((typing___MMSrcModule___do_typing_t)CALL(variable[3],COLOR_typing___MMSrcModule___do_typing))(variable[3],  variable[1] /*tc*/) /*MMSrcModule::do_typing*/;
-  variable[3] = ((mmloader___ToolContext___error_count_t)CALL( variable[1] /*tc*/,COLOR_mmloader___ToolContext___error_count))( variable[1] /*tc*/) /*ToolContext::error_count*/;
+  /* Register variable[2]: Method return value and escape marker */
+  CALL_mmbuilder___MMSrcModule___do_mmbuilder(variable[0])(variable[0],  variable[1] /*tc*/) /*MMSrcModule::do_mmbuilder*/;
+  /* Register variable[3]: Result */
+  variable[3] = CALL_mmloader___ToolContext___error_count( variable[1] /*tc*/)( variable[1] /*tc*/) /*ToolContext::error_count*/;
+  /* Register variable[3]: Result */
   variable[3] = TAG_Bool(UNTAG_Int(variable[3])>UNTAG_Int( TAG_Int(0)));
   if (UNTAG_Bool(variable[3])) { /*if*/
-    variable[3] = variable[0];
     exit(UNTAG_Int( TAG_Int(1)));
   }
-  variable[3] = variable[0];
-  ((control_flow___MMSrcModule___do_control_flow_t)CALL(variable[3],COLOR_control_flow___MMSrcModule___do_control_flow))(variable[3],  variable[1] /*tc*/) /*MMSrcModule::do_control_flow*/;
-  variable[3] = ((mmloader___ToolContext___error_count_t)CALL( variable[1] /*tc*/,COLOR_mmloader___ToolContext___error_count))( variable[1] /*tc*/) /*ToolContext::error_count*/;
+  CALL_typing___MMSrcModule___do_typing(variable[0])(variable[0],  variable[1] /*tc*/) /*MMSrcModule::do_typing*/;
+  /* Register variable[3]: Result */
+  variable[3] = CALL_mmloader___ToolContext___error_count( variable[1] /*tc*/)( variable[1] /*tc*/) /*ToolContext::error_count*/;
+  /* Register variable[3]: Result */
   variable[3] = TAG_Bool(UNTAG_Int(variable[3])>UNTAG_Int( TAG_Int(0)));
   if (UNTAG_Bool(variable[3])) { /*if*/
-    variable[3] = variable[0];
     exit(UNTAG_Int( TAG_Int(1)));
   }
-  return_label5: while(false);
+  return_label9: while(false);
   tracehead = trace.prev;
   return;
 }