pike.git/ src/ program.c

Branch: Tag:

2008-06-29

2008-06-29 12:37:11 by Martin Nilsson <mani@lysator.liu.se>

ID_STATIC -> ID_PROTECTED

Rev: src/backend.cmod:1.229
Rev: src/builtin.cmod:1.217
Rev: src/errors.h:1.40
Rev: src/interpret_functions.h:1.208
Rev: src/iterators.cmod:1.70
Rev: src/language.yacc:1.440
Rev: src/object.c:1.299
Rev: src/pike_search.c:1.31
Rev: src/program.c:1.728
Rev: src/signal_handler.c:1.333
Rev: src/threads.c:1.259

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.727 2008/06/28 21:50:10 mast Exp $ + || $Id: program.c,v 1.728 2008/06/29 12:37:10 nilsson Exp $   */      #include "global.h"
2211:    my_yyerror("Missing definition for local function %S.",    fun->name);    } -  if (funp->id_flags & ID_STATIC) continue; +  if (funp->id_flags & ID_PROTECTED) continue;    add_to_identifier_index(i);    }    fsort_program_identifier_index(p->identifier_index,
3461:    Pike_compiler->init_node,    mknode(F_RETURN,mkintnode(0),0)),    function_type_string, -  ID_STATIC); +  ID_PROTECTED);    Pike_compiler->init_node=0;    } else if (finish == 2) {    /* Called from decode_value(). */
5548:    *    * FIXME: Force PRIVATE?    */ -  flags |= ID_STATIC; +  flags |= ID_PROTECTED;    free_type(symbol_type);    free_string(symbol);    }
5795: Inside #if 0
   for (r = state->new_program->identifier_references, j = 0;    j < state->new_program->num_identifier_references;    j++, r++) { -  if (((r->id_flags & (ID_PARENT_REF|ID_STATIC|ID_PRIVATE|ID_HIDDEN)) == -  ID_PARENT_REF|ID_STATIC|ID_PRIVATE|ID_HIDDEN) && +  if (((r->id_flags & (ID_PARENT_REF|ID_PROTECTED|ID_PRIVATE|ID_HIDDEN)) == +  ID_PARENT_REF|ID_PROTECTED|ID_PRIVATE|ID_HIDDEN) &&    (r->identifier_offset == i) &&    (!(r->inherit_offset))) {    return j;    }    } -  ref.id_flags = ID_PARENT_REF|ID_STATIC|ID_PRIVATE|ID_HIDDEN; +  ref.id_flags = ID_PARENT_REF|ID_PROTECTED|ID_PRIVATE|ID_HIDDEN;    ref.identifier_offset = i;    ref.inherit_offset = 0;    add_to_identifier_references(ref);
5895:    {    funp = prog->identifier_references + i;    if(funp->id_flags & ID_HIDDEN) continue; -  if(funp->id_flags & ID_STATIC) +  if(funp->id_flags & ID_PROTECTED)    if(!(flags & SEE_STATIC))    continue;    fun = ID_FROM_PTR(prog, funp);
6154:    for (e = p->num_identifier_references; e--; ) {    struct identifier *id;    if (p->identifier_references[e].id_flags & -  (ID_HIDDEN|ID_STATIC|ID_PRIVATE)) { +  (ID_HIDDEN|ID_PROTECTED|ID_PRIVATE)) {    continue;    }    id = ID_FROM_INT(p, e);
6193:    for(e = p->num_identifier_references; e--; ) {    struct identifier *id;    if (p->identifier_references[e].id_flags & -  (ID_HIDDEN|ID_STATIC|ID_PRIVATE)) { +  (ID_HIDDEN|ID_PROTECTED|ID_PRIVATE)) {    continue;    }    id = ID_FROM_INT(p, e);
9102:    tFunc(tOr(tStr, tVoid) tOr(tObj, tVoid)    tOr(tInt, tVoid) tOr(tInt, tVoid)    tOr(tPrg(tObj), tVoid) tOr(tObj, tVoid), tVoid), -  ID_STATIC); +  ID_PROTECTED);       ADD_FUNCTION("get_compilation_handler",    f_compilation_get_compilation_handler,
9133:    tType(tFunction)), 0);       ADD_FUNCTION("_sprintf", f_compilation__sprintf, -  tFunc(tInt tOr(tMap(tStr, tMix), tVoid), tStr), ID_STATIC); +  tFunc(tInt tOr(tMap(tStr, tMix), tVoid), tStr), ID_PROTECTED);       start_new_program();   
10343:    {    struct identifier *bid;    int i; -  if (b->identifier_references[e].id_flags & (ID_STATIC|ID_HIDDEN)) +  if (b->identifier_references[e].id_flags & (ID_PROTECTED|ID_HIDDEN))    continue; /* Skip protected & hidden */    bid = ID_FROM_INT(b,e);    if(s == bid->name) continue; /* Skip __INIT */
10424:    {    struct identifier *bid;    int i; -  if (b->identifier_references[e].id_flags & (ID_STATIC|ID_HIDDEN)) +  if (b->identifier_references[e].id_flags & (ID_PROTECTED|ID_HIDDEN))    continue; /* Skip protected & hidden */       /* FIXME: What if they aren't protected & hidden in a? */
10546:    {    struct identifier *bid;    int i; -  if (b->identifier_references[e].id_flags & (ID_STATIC|ID_HIDDEN)) +  if (b->identifier_references[e].id_flags & (ID_PROTECTED|ID_HIDDEN))    continue; /* Skip protected & hidden */       /* FIXME: What if they aren't protected & hidden in a? */
10608:    {    struct identifier *bid;    int i; -  if (b->identifier_references[e].id_flags & (ID_STATIC|ID_HIDDEN)) +  if (b->identifier_references[e].id_flags & (ID_PROTECTED|ID_HIDDEN))    continue; /* Skip protected & hidden */    bid = ID_FROM_INT(b,e);    if(s == bid->name) continue; /* Skip __INIT */