pike.git / src / program.c

version» Context lines:

pike.git/src/program.c:1:   /*   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: program.c,v 1.535 2003/11/18 11:19:41 grubba Exp $ + || $Id: program.c,v 1.536 2003/11/18 13:08:33 grubba Exp $   */      #include "global.h" - RCSID("$Id: program.c,v 1.535 2003/11/18 11:19:41 grubba Exp $"); + RCSID("$Id: program.c,v 1.536 2003/11/18 13:08:33 grubba Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"   #include "pike_types.h"   #include "stralloc.h"   #include "las.h"   #include "language.h"   #include "lex.h"   #include "pike_macros.h"   #include "fsort.h"
pike.git/src/program.c:7595:    /* FIXME: What if they aren't static & hidden in a? */       bid = ID_FROM_INT(b,e);    if(s == bid->name) continue; /* Skip __INIT */    i = find_shared_string_identifier(bid->name,a);    if (i == -1) {    continue; /* It's ok... */    }       /* Note: Use weaker check for constant integers. */ -  if((ID_FROM_INT(a, i)->run_time_type != bid->run_time_type) || -  ((bid->run_time_type != PIKE_T_INT) && -  !match_types(ID_FROM_INT(a,i)->type, bid->type))) { +  if(((bid->run_time_type != PIKE_T_INT) || +  (ID_FROM_INT(a, i)->run_time_type != PIKE_T_INT)) && +  !match_types(ID_FROM_INT(a,i)->type, bid->type)) {   #if 0    fprintf(stderr, "Identifier \"%s\" is incompatible.\n",    bid->name->str);   #endif /* 0 */    return 0;    }    }    return 1;   }   
pike.git/src/program.c:7702:    /* FIXME: What if they aren't static & hidden in a? */       bid = ID_FROM_INT(b,e);    if(s == bid->name) continue; /* Skip __INIT */    i = find_shared_string_identifier(bid->name,a);    if (i == -1) {    continue; /* It's ok... */    }       /* Note: Use weaker check for constant integers. */ -  if((ID_FROM_INT(a, i)->run_time_type != bid->run_time_type) || -  ((bid->run_time_type != PIKE_T_INT) && -  !match_types(ID_FROM_INT(a,i)->type, bid->type))) { +  if(((bid->run_time_type != PIKE_T_INT) || +  (ID_FROM_INT(a, i)->run_time_type != PIKE_T_INT)) && +  !match_types(ID_FROM_INT(a,i)->type, bid->type)) {    if (flags & YYTE_IS_WARNING)    yywarning("Identifier \"%s\" is incompatible.",    bid->name->str);    else    my_yyerror("Identifier \"%s\" is incompatible.",    bid->name->str); -  +  yytype_error(NULL, ID_FROM_INT(a,i)->type, bid->type, flags);    res = 0;    }    }    return res;   }      /* returns 1 if a implements b */   int yyexplain_not_implements(struct program *a, struct program *b, int flags)   {    int e;