diff -r a745f7d38a5d -r e8de43eefcc5 stage3/narrow_candidate_datatypes.cc --- a/stage3/narrow_candidate_datatypes.cc Sun Feb 12 20:43:49 2012 +0100 +++ b/stage3/narrow_candidate_datatypes.cc Mon Feb 13 16:29:55 2012 +0000 @@ -382,12 +382,13 @@ // SYM_REF2(il_function_call_c, function_name, il_operand_list, symbol_c *called_function_declaration; int extensible_param_count;) void *narrow_candidate_datatypes_c::visit(il_function_call_c *symbol) { generic_function_call_t fcall_param = { - /* fcall_param.function_name = */ symbol->function_name, - /* fcall_param.nonformal_operand_list = */ symbol->il_operand_list, - /* fcall_param.formal_operand_list = */ NULL, - /* fcall_param.candidate_functions = */ symbol->candidate_functions, - /* fcall_param.called_function_declaration = */ symbol->called_function_declaration, - /* fcall_param.extensible_param_count = */ symbol->extensible_param_count + /* fcall_param.function_name = */ symbol->function_name, + /* fcall_param.nonformal_operand_list = */ symbol->il_operand_list, + /* fcall_param.formal_operand_list = */ NULL, + /* enum {POU_FB, POU_function} POU_type = */ generic_function_call_t::POU_function, + /* fcall_param.candidate_functions = */ symbol->candidate_functions, + /* fcall_param.called_function_declaration = */ symbol->called_function_declaration, + /* fcall_param.extensible_param_count = */ symbol->extensible_param_count }; /* The first parameter of a non formal function call in IL will be the 'current value' (i.e. the prev_il_instruction) @@ -453,12 +454,13 @@ // SYM_REF2(il_formal_funct_call_c, function_name, il_param_list, symbol_c *called_function_declaration; int extensible_param_count;) void *narrow_candidate_datatypes_c::visit(il_formal_funct_call_c *symbol) { generic_function_call_t fcall_param = { - /* fcall_param.function_name = */ symbol->function_name, - /* fcall_param.nonformal_operand_list = */ NULL, - /* fcall_param.formal_operand_list = */ symbol->il_param_list, - /* fcall_param.candidate_functions = */ symbol->candidate_functions, - /* fcall_param.called_function_declaration = */ symbol->called_function_declaration, - /* fcall_param.extensible_param_count = */ symbol->extensible_param_count + /* fcall_param.function_name = */ symbol->function_name, + /* fcall_param.nonformal_operand_list = */ NULL, + /* fcall_param.formal_operand_list = */ symbol->il_param_list, + /* enum {POU_FB, POU_function} POU_type = */ generic_function_call_t::POU_function, + /* fcall_param.candidate_functions = */ symbol->candidate_functions, + /* fcall_param.called_function_declaration = */ symbol->called_function_declaration, + /* fcall_param.extensible_param_count = */ symbol->extensible_param_count }; narrow_function_invocation(symbol, fcall_param); @@ -1143,12 +1145,13 @@ // SYM_REF3(function_invocation_c, function_name, formal_param_list, nonformal_param_list, symbol_c *called_function_declaration; int extensible_param_count; std::vector candidate_functions;) void *narrow_candidate_datatypes_c::visit(function_invocation_c *symbol) { generic_function_call_t fcall_param = { - /* fcall_param.function_name = */ symbol->function_name, - /* fcall_param.nonformal_operand_list = */ symbol->nonformal_param_list, - /* fcall_param.formal_operand_list = */ symbol->formal_param_list, - /* fcall_param.candidate_functions = */ symbol->candidate_functions, - /* fcall_param.called_function_declaration = */ symbol->called_function_declaration, - /* fcall_param.extensible_param_count = */ symbol->extensible_param_count + /* fcall_param.function_name = */ symbol->function_name, + /* fcall_param.nonformal_operand_list = */ symbol->nonformal_param_list, + /* fcall_param.formal_operand_list = */ symbol->formal_param_list, + /* enum {POU_FB, POU_function} POU_type = */ generic_function_call_t::POU_function, + /* fcall_param.candidate_functions = */ symbol->candidate_functions, + /* fcall_param.called_function_declaration = */ symbol->called_function_declaration, + /* fcall_param.extensible_param_count = */ symbol->extensible_param_count }; narrow_function_invocation(symbol, fcall_param);