pike.git/ src/ interpret.c

Branch: Tag:

2017-11-18

2017-11-18 10:14:46 by Arne Goedeke <el@laramies.com>

Interpreter: rename callsite_resolve_fun

2126:   {    struct pike_callsite C;    callsite_init(&C, args); -  callsite_resolve_fun(&C, o, fun); +  callsite_resolve_identifier(&C, o, fun);    if (C.type == CALLTYPE_PIKEFUN) {    return C.ptr;    }
2250:    C.frame = frame;    }    -  callsite_resolve_fun(&C, o, fun); +  callsite_resolve_identifier(&C, o, fun);       if (C.frame == frame) {    if (C.type == CALLTYPE_PIKEFUN) {
2352:    struct pike_callsite C;       callsite_init(&C, args); -  callsite_resolve_fun(&C, o, fun); +  callsite_resolve_identifier(&C, o, fun);    callsite_prepare(&C);    callsite_execute(&C);    callsite_free(&C);
3251:    }   }    - PMOD_EXPORT void callsite_resolve_fun(struct pike_callsite *c, struct object *o, INT16 fun) { + PMOD_EXPORT void callsite_resolve_identifier(struct pike_callsite *c, struct object *o, INT16 fun) {    struct program *p = o->prog;    struct inherit *context;    struct reference *ref;
3272:    struct pike_frame *scope = ((struct pike_trampoline *)(o->storage))->frame;    fun = ((struct pike_trampoline *)(o->storage))->func;    o = scope->current_object; -  callsite_resolve_fun(c, o, fun); +  callsite_resolve_identifier(c, o, fun);    c->frame->scope = scope;    add_ref(scope);    return;
3372:    function = ID_FROM_INT(p, fun);    } while (IDENTIFIER_IS_ALIAS(function->identifier_flags));    -  callsite_resolve_fun(c, o, fun); +  callsite_resolve_identifier(c, o, fun);    return;    }   #ifdef PIKE_DEBUG
3459:    if (UNLIKELY(fun < 0))    Pike_error ("Cannot call undefined lfun %s.\n", lfun_names[lfun]);    -  callsite_resolve_fun(c, o, fun); +  callsite_resolve_identifier(c, o, fun);   }      PMOD_EXPORT void callsite_resolve_svalue(struct pike_callsite *c, struct svalue *s) {
3474:    c->type = CALLTYPE_EFUN;    c->ptr = s->u.efun->function;    }else{ -  callsite_resolve_fun(c, s->u.object, SUBTYPEOF(*s)); +  callsite_resolve_identifier(c, s->u.object, SUBTYPEOF(*s));    return;    }    break;