matiec: comparison stage4/generate_c/il_code

equal deleted inserted replaced

-:56ee922d0112
+:c72748a12ae3
 if (IN_type_symbol == NULL)
 IN_type_symbol = last_type_symbol;
 ADD_PARAM_LIST(IN_param_value, IN_type_symbol, function_param_iterator_c::direction_in)
-symbol_c * return_type_symbol = &search_constant_type_c::constant_int_type_name;
+symbol_c * return_type_symbol = &search_constant_type_c::integer;
 function_type_prefix = (symbol_c*)(new pragma_c("int"));
 break;
 }
 function_name = (symbol_c*)(new pragma_c("__uint_to_bcd"));
 if (IN_type_symbol == NULL)
 IN_type_symbol = last_type_symbol;
 ADD_PARAM_LIST(IN_param_value, IN_type_symbol, function_param_iterator_c::direction_in)
-symbol_c * return_type_symbol = &search_constant_type_c::constant_int_type_name;
+symbol_c * return_type_symbol = &search_constant_type_c::integer;
 function_type_prefix = return_type_symbol;
 break;
 }
 function_name = (symbol_c*)(new pragma_c("__uint_to_bcd"));
 if (IN_type_symbol == NULL)
 IN_type_symbol = last_type_symbol;
 ADD_PARAM_LIST(IN_param_value, IN_type_symbol, function_param_iterator_c::direction_in)
-symbol_c * return_type_symbol = &search_constant_type_c::constant_int_type_name;
+symbol_c * return_type_symbol = &search_constant_type_c::integer;
 function_type_prefix = return_type_symbol;
 break;
 }
 function_name = (symbol_c*)(new pragma_c("__uint_to_bcd"));
 if (IN_type_symbol == NULL)
 IN_type_symbol = last_type_symbol;
 ADD_PARAM_LIST(IN_param_value, IN_type_symbol, function_param_iterator_c::direction_in)
-symbol_c * return_type_symbol = &search_constant_type_c::constant_int_type_name;
+symbol_c * return_type_symbol = &search_constant_type_c::integer;
 function_type_prefix = return_type_symbol;
 break;
 }
 function_name = (symbol_c*)(new pragma_c("__uint_to_bcd"));
 if (IN_type_symbol == NULL)
 IN_type_symbol = last_type_symbol;
 ADD_PARAM_LIST(IN_param_value, IN_type_symbol, function_param_iterator_c::direction_in)
-symbol_c * return_type_symbol = &search_constant_type_c::constant_int_type_name;
+symbol_c * return_type_symbol = &search_constant_type_c::integer;
 function_type_prefix = return_type_symbol;
 break;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("N");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *N_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *N_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *N_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (N_param_value == NULL)
-N_param_value = function_call_param_iterator.next();
+N_param_value = function_call_param_iterator.next_nf();
 if (N_param_value != NULL) {
 N_type_symbol = search_expression_type->get_type(N_param_value);
 last_type_symbol = last_type_symbol && N_type_symbol && search_expression_type->is_same_type(N_type_symbol, last_type_symbol) ? search_expression_type->common_type(N_type_symbol, last_type_symbol) : N_type_symbol ;
 }
 {
 {
 identifier_c param_name("N");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *N_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *N_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *N_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (N_param_value == NULL)
-N_param_value = function_call_param_iterator.next();
+N_param_value = function_call_param_iterator.next_nf();
 if (N_param_value != NULL) {
 N_type_symbol = search_expression_type->get_type(N_param_value);
 last_type_symbol = last_type_symbol && N_type_symbol && search_expression_type->is_same_type(N_type_symbol, last_type_symbol) ? search_expression_type->common_type(N_type_symbol, last_type_symbol) : N_type_symbol ;
 }
 {
 {
 identifier_c param_name("N");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *N_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *N_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *N_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (N_param_value == NULL)
-N_param_value = function_call_param_iterator.next();
+N_param_value = function_call_param_iterator.next_nf();
 if (N_param_value != NULL) {
 N_type_symbol = search_expression_type->get_type(N_param_value);
 last_type_symbol = last_type_symbol && N_type_symbol && search_expression_type->is_same_type(N_type_symbol, last_type_symbol) ? search_expression_type->common_type(N_type_symbol, last_type_symbol) : N_type_symbol ;
 }
 {
 {
 identifier_c param_name("N");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *N_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *N_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *N_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (N_param_value == NULL)
-N_param_value = function_call_param_iterator.next();
+N_param_value = function_call_param_iterator.next_nf();
 if (N_param_value != NULL) {
 N_type_symbol = search_expression_type->get_type(N_param_value);
 last_type_symbol = last_type_symbol && N_type_symbol && search_expression_type->is_same_type(N_type_symbol, last_type_symbol) ? search_expression_type->common_type(N_type_symbol, last_type_symbol) : N_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN0");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN0_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN0_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN0_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN0_param_value == NULL)
-IN0_param_value = function_call_param_iterator.next();
+IN0_param_value = function_call_param_iterator.next_nf();
 if (IN0_param_value != NULL) {
 IN0_type_symbol = search_expression_type->get_type(IN0_param_value);
 last_type_symbol = last_type_symbol && IN0_type_symbol && search_expression_type->is_same_type(IN0_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN0_type_symbol, last_type_symbol) : IN0_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN1");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN1_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN1_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN1_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN1_param_value == NULL)
-IN1_param_value = function_call_param_iterator.next();
+IN1_param_value = function_call_param_iterator.next_nf();
 if (IN1_param_value != NULL) {
 IN1_type_symbol = search_expression_type->get_type(IN1_param_value);
 last_type_symbol = last_type_symbol && IN1_type_symbol && search_expression_type->is_same_type(IN1_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN1_type_symbol, last_type_symbol) : IN1_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN_param_value == NULL)
-IN_param_value = function_call_param_iterator.next();
+IN_param_value = function_call_param_iterator.next_nf();
 if (IN_param_value != NULL) {
 IN_type_symbol = search_expression_type->get_type(IN_param_value);
 last_type_symbol = last_type_symbol && IN_type_symbol && search_expression_type->is_same_type(IN_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN_type_symbol, last_type_symbol) : IN_type_symbol ;
 }
 {
 {
 identifier_c param_name("MX");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *MX_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *MX_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *MX_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (MX_param_value == NULL)
-MX_param_value = function_call_param_iterator.next();
+MX_param_value = function_call_param_iterator.next_nf();
 if (MX_param_value != NULL) {
 MX_type_symbol = search_expression_type->get_type(MX_param_value);
 last_type_symbol = last_type_symbol && MX_type_symbol && search_expression_type->is_same_type(MX_type_symbol, last_type_symbol) ? search_expression_type->common_type(MX_type_symbol, last_type_symbol) : MX_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN0");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN0_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN0_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN0_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN0_param_value == NULL)
-IN0_param_value = function_call_param_iterator.next();
+IN0_param_value = function_call_param_iterator.next_nf();
 if (IN0_param_value != NULL) {
 IN0_type_symbol = search_expression_type->get_type(IN0_param_value);
 last_type_symbol = last_type_symbol && IN0_type_symbol && search_expression_type->is_same_type(IN0_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN0_type_symbol, last_type_symbol) : IN0_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN1");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN1_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN1_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN1_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN1_param_value == NULL)
-IN1_param_value = function_call_param_iterator.next();
+IN1_param_value = function_call_param_iterator.next_nf();
 if (IN1_param_value != NULL) {
 IN1_type_symbol = search_expression_type->get_type(IN1_param_value);
 last_type_symbol = last_type_symbol && IN1_type_symbol && search_expression_type->is_same_type(IN1_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN1_type_symbol, last_type_symbol) : IN1_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("L");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *L_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *L_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *L_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (L_param_value == NULL)
-L_param_value = function_call_param_iterator.next();
+L_param_value = function_call_param_iterator.next_nf();
 if (L_param_value != NULL) {
 L_type_symbol = search_expression_type->get_type(L_param_value);
 last_type_symbol = last_type_symbol && L_type_symbol && search_expression_type->is_same_type(L_type_symbol, last_type_symbol) ? search_expression_type->common_type(L_type_symbol, last_type_symbol) : L_type_symbol ;
 }
 {
 {
 identifier_c param_name("L");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *L_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *L_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *L_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (L_param_value == NULL)
-L_param_value = function_call_param_iterator.next();
+L_param_value = function_call_param_iterator.next_nf();
 if (L_param_value != NULL) {
 L_type_symbol = search_expression_type->get_type(L_param_value);
 last_type_symbol = last_type_symbol && L_type_symbol && search_expression_type->is_same_type(L_type_symbol, last_type_symbol) ? search_expression_type->common_type(L_type_symbol, last_type_symbol) : L_type_symbol ;
 }
 {
 {
 identifier_c param_name("L");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *L_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *L_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *L_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (L_param_value == NULL)
-L_param_value = function_call_param_iterator.next();
+L_param_value = function_call_param_iterator.next_nf();
 if (L_param_value != NULL) {
 L_type_symbol = search_expression_type->get_type(L_param_value);
 last_type_symbol = last_type_symbol && L_type_symbol && search_expression_type->is_same_type(L_type_symbol, last_type_symbol) ? search_expression_type->common_type(L_type_symbol, last_type_symbol) : L_type_symbol ;
 }
 {
 {
 identifier_c param_name("P");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *P_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *P_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *P_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (P_param_value == NULL)
-P_param_value = function_call_param_iterator.next();
+P_param_value = function_call_param_iterator.next_nf();
 if (P_param_value != NULL) {
 P_type_symbol = search_expression_type->get_type(P_param_value);
 last_type_symbol = last_type_symbol && P_type_symbol && search_expression_type->is_same_type(P_type_symbol, last_type_symbol) ? search_expression_type->common_type(P_type_symbol, last_type_symbol) : P_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 char my_name[10];
 sprintf(my_name, "IN%d", base_num++);
 identifier_c param_name(my_name);
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-param_value = function_call_param_iterator.search(&param_name);
+param_value = function_call_param_iterator.search_f(&param_name);
 /* Get the value from a foo(<param_value>) style call */
 if (param_value == NULL)
-param_value = function_call_param_iterator.next();
+param_value = function_call_param_iterator.next_nf();
 if (param_value != NULL){
 symbol_c *current_type_symbol = search_expression_type->get_type(param_value);
 last_type_symbol = last_type_symbol && search_expression_type->is_same_type(current_type_symbol, last_type_symbol) ? search_expression_type->common_type(current_type_symbol, last_type_symbol) : current_type_symbol ;
 /*Function specific CODE */
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("P");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *P_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *P_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *P_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (P_param_value == NULL)
-P_param_value = function_call_param_iterator.next();
+P_param_value = function_call_param_iterator.next_nf();
 if (P_param_value != NULL) {
 P_type_symbol = search_expression_type->get_type(P_param_value);
 last_type_symbol = last_type_symbol && P_type_symbol && search_expression_type->is_same_type(P_type_symbol, last_type_symbol) ? search_expression_type->common_type(P_type_symbol, last_type_symbol) : P_type_symbol ;
 }
 {
 {
 identifier_c param_name("L");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *L_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *L_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *L_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (L_param_value == NULL)
-L_param_value = function_call_param_iterator.next();
+L_param_value = function_call_param_iterator.next_nf();
 if (L_param_value != NULL) {
 L_type_symbol = search_expression_type->get_type(L_param_value);
 last_type_symbol = last_type_symbol && L_type_symbol && search_expression_type->is_same_type(L_type_symbol, last_type_symbol) ? search_expression_type->common_type(L_type_symbol, last_type_symbol) : L_type_symbol ;
 }
 {
 {
 identifier_c param_name("P");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *P_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *P_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *P_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (P_param_value == NULL)
-P_param_value = function_call_param_iterator.next();
+P_param_value = function_call_param_iterator.next_nf();
 if (P_param_value != NULL) {
 P_type_symbol = search_expression_type->get_type(P_param_value);
 last_type_symbol = last_type_symbol && P_type_symbol && search_expression_type->is_same_type(P_type_symbol, last_type_symbol) ? search_expression_type->common_type(P_type_symbol, last_type_symbol) : P_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }
 {
 {
 identifier_c param_name("L");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *L_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *L_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *L_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (L_param_value == NULL)
-L_param_value = function_call_param_iterator.next();
+L_param_value = function_call_param_iterator.next_nf();
 if (L_param_value != NULL) {
 L_type_symbol = search_expression_type->get_type(L_param_value);
 last_type_symbol = last_type_symbol && L_type_symbol && search_expression_type->is_same_type(L_type_symbol, last_type_symbol) ? search_expression_type->common_type(L_type_symbol, last_type_symbol) : L_type_symbol ;
 }
 {
 {
 identifier_c param_name("P");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *P_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *P_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *P_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (P_param_value == NULL)
-P_param_value = function_call_param_iterator.next();
+P_param_value = function_call_param_iterator.next_nf();
 if (P_param_value != NULL) {
 P_type_symbol = search_expression_type->get_type(P_param_value);
 last_type_symbol = last_type_symbol && P_type_symbol && search_expression_type->is_same_type(P_type_symbol, last_type_symbol) ? search_expression_type->common_type(P_type_symbol, last_type_symbol) : P_type_symbol ;
 }
 {
 {
 identifier_c param_name("IN2");
 /* Get the value from a foo(<param_name> = <param_value>) style call */
-symbol_c *IN2_param_value = function_call_param_iterator.search(&param_name);
+symbol_c *IN2_param_value = function_call_param_iterator.search_f(&param_name);
 symbol_c *IN2_type_symbol = NULL;
 /* Get the value from a foo(<param_value>) style call */
 if (IN2_param_value == NULL)
-IN2_param_value = function_call_param_iterator.next();
+IN2_param_value = function_call_param_iterator.next_nf();
 if (IN2_param_value != NULL) {
 IN2_type_symbol = search_expression_type->get_type(IN2_param_value);
 last_type_symbol = last_type_symbol && IN2_type_symbol && search_expression_type->is_same_type(IN2_type_symbol, last_type_symbol) ? search_expression_type->common_type(IN2_type_symbol, last_type_symbol) : IN2_type_symbol ;
 }

changeset 208	c72748a12ae3
parent 199	b075f28ec081
child 210	8387cac2aba6