pike.git/ src/ program.c

2000-03-30

2000-03-30 08:43:07 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

• 281605014b053dcd92608665b2f59f452770af48 (24 lines) (+15/-9) ^{[ Show | Annotate ]}
  Branch: 7.9

bugfix for operators being overloaded by inherit

Rev: src/docode.c:1.67
Rev: src/language.yacc:1.171
Rev: src/las.c:1.171
Rev: src/program.c:1.219
Rev: src/program.h:1.85
Rev: src/testsuite.in:1.289

5:   \*/   /**/   #include "global.h" - RCSID("$Id: program.c,v 1.218 2000/03/29 04:56:22 hubbe Exp $"); + RCSID("$Id: program.c,v 1.219 2000/03/30 08:43:07 hubbe Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"
347:   }       - struct node_s *find_module_identifier(struct pike_string *ident) + struct node_s *find_module_identifier(struct pike_string *ident, +  int see_inherit)   {    struct node_s *ret;   
365:    int n;    for(n=0;n<compilation_depth;n++,p=p->previous)    { -  int i=really_low_find_shared_string_identifier(ident, +  int i; +  if(see_inherit) +  { +  i=really_low_find_shared_string_identifier(ident,    p->new_program,    SEE_STATIC);    if(i!=-1)
374:    id=ID_FROM_INT(p->new_program, i);    return mkexternalnode(n, i, id);    } +  }       if((ret=index_modules(ident,    &p->module_index_cache,