Branch: Tag:

2001-04-01

2001-04-01 15:40:23 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Renamed copy_type() to copy_pike_type() to avoid conflict with <mach/mach.p>.

Rev: src/builtin_functions.c:1.357
Rev: src/language.yacc:1.242
Rev: src/las.c:1.249
Rev: src/operators.c:1.134
Rev: src/pike_types.c:1.177
Rev: src/pike_types.h:1.71
Rev: src/program.c:1.308

112:   /* This is the grammar definition of Pike. */      #include "global.h" - RCSID("$Id: language.yacc,v 1.241 2001/04/01 15:14:06 grubba Exp $"); + RCSID("$Id: language.yacc,v 1.242 2001/04/01 15:40:23 grubba Exp $");   #ifdef HAVE_MEMORY_H   #include <memory.h>   #endif
556:   #endif /* PIKE_DEBUG */    if(Pike_compiler->compiler_frame->current_type)    free_type(Pike_compiler->compiler_frame->current_type); -  copy_type(Pike_compiler->compiler_frame->current_type, $1->u.sval.u.type); +  copy_pike_type(Pike_compiler->compiler_frame->current_type, +  $1->u.sval.u.type);    free_node($1);    }    ;
596:    !Pike_compiler->compiler_frame->previous->current_type)    {    yyerror("Internal compiler fault."); -  copy_type(Pike_compiler->compiler_frame->current_type, +  copy_pike_type(Pike_compiler->compiler_frame->current_type,    mixed_type_string);    }else{ -  copy_type(Pike_compiler->compiler_frame->current_type, +  copy_pike_type(Pike_compiler->compiler_frame->current_type,    Pike_compiler->compiler_frame->previous->current_type);    }    }
696:    Pike_compiler->compiler_pass, $4->u.sval.u.string->str);       free_type(s); -  copy_type(s, id->type); +  copy_pike_type(s, id->type);       fprintf(stderr, "Resulting type:\n");   #ifdef PIKE_DEBUG
788:    * mksoftcastnode().    */    free_type(local_node->type); -  copy_type(local_node->type, mixed_type_string); +  copy_pike_type(local_node->type, mixed_type_string);       check_args =    mknode(F_COMMA_EXPR, check_args,
1780:    debug_malloc_touch(Pike_compiler->compiler_frame->current_return_type);    if(Pike_compiler->compiler_frame->current_return_type)    free_type(Pike_compiler->compiler_frame->current_return_type); -  copy_type(Pike_compiler->compiler_frame->current_return_type, +  copy_pike_type(Pike_compiler->compiler_frame->current_return_type,    any_type_string);    }    func_args
1871:    debug_malloc_touch(Pike_compiler->compiler_frame->current_return_type);    if(Pike_compiler->compiler_frame->current_return_type)    free_type(Pike_compiler->compiler_frame->current_return_type); -  copy_type(Pike_compiler->compiler_frame->current_return_type, +  copy_pike_type(Pike_compiler->compiler_frame->current_return_type,    $<n>0->u.sval.u.type);      
2232:    * mksoftcastnode().    */    free_type(local_node->type); -  copy_type(local_node->type, mixed_type_string); +  copy_pike_type(local_node->type, mixed_type_string);       local_node = mksoftcastnode(Pike_compiler->compiler_frame->    variable[e].type, local_node);
2900:    debug_malloc_touch(Pike_compiler->compiler_frame->current_return_type);    if(Pike_compiler->compiler_frame->current_return_type)    free_type(Pike_compiler->compiler_frame->current_return_type); -  copy_type(Pike_compiler->compiler_frame->current_return_type, +  copy_pike_type(Pike_compiler->compiler_frame->current_return_type,    any_type_string);       /* block code */
3718:    "(converted to type zero).");    }    free_type(type); -  copy_type(type, zero_type_string); +  copy_pike_type(type, zero_type_string);    }    frame->variable[frame->current_number_of_locals].type = type;    frame->variable[frame->current_number_of_locals].name = str;