pike.git/ src/ program.c

2009-06-21

2009-06-21 17:16:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 0a7438a3629708748a325dbde13e17559c9ea48c (12 lines) (+9/-3) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed issue where symbols could be hidden by a later inherit of the same symbol but protected.

Rev: src/program.c:1.763

2:   || 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.762 2009/06/17 15:39:05 grubba Exp $ + || $Id: program.c,v 1.763 2009/06/21 17:16:06 grubba Exp $   */      #include "global.h"
2135:    (p->identifiers[i].run_time_type == T_MIXED)) {    /* Get rid of the remaining tentative type marker. */    /* FIXME: Should probably never be reachable. -  * Consider a fatal? +  * Consider this a fatal?    */    p->identifiers[i].run_time_type = T_FUNCTION;    }
2185:       if(fun->name==funb->name)    { +  if (!(funpb->id_flags & ID_PROTECTED)) { +  /* Only regard this symbol as better if it +  * will end up in the index further below. +  */    found_better=t; -  +  }       /* FIXME: Is this stuff needed?    * It looks like it already is done by define_function().