pike.git/ src/ program.c

2014-12-04

2014-12-04 19:22:56 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• fce2b22266999e90240b20aac6d26c3bd16081c3 (36 lines) (+24/-12) ^{[ Show | Annotate ]}
  Branch: bill/master_archive_support

Compiler: Added low_program_from_svalue().

This allows for passing the parent object and identifier when needed.

This is needed for [bug 6573 (#6573)].

4775:    INT32 flags,    struct pike_string *name)   { -  struct program *p=program_from_svalue(s); -  low_inherit(p, -  TYPEOF(*s) == T_FUNCTION ? s->u.object : 0, -  TYPEOF(*s) == T_FUNCTION ? SUBTYPEOF(*s) : -1, -  0, -  flags, -  name); +  struct object *parent_obj = NULL; +  int parent_id = -1; +  struct program *p = low_program_from_svalue(s, &parent_obj, &parent_id); +  low_inherit(p, parent_obj, parent_id, 0, flags, name);   }      void compiler_do_inherit(node *n,
11026:   {    if(TYPEOF(*f) != T_FUNCTION) return 0;    if(SUBTYPEOF(*f) == FUNCTION_BUILTIN) return 0; +     return low_program_from_function(f->u.object, SUBTYPEOF(*f));   }      /* NOTE: Does not add references to the return value! */ - PMOD_EXPORT struct program *program_from_svalue(const struct svalue *s) + PMOD_EXPORT struct program *low_program_from_svalue(const struct svalue *s, +  struct object **parent_obj, +  int *parent_id)   {    switch(TYPEOF(*s))    {
11054:   #endif    push_svalue(s);    f_object_program(1); -  p=program_from_svalue(Pike_sp-1); +  p = low_program_from_svalue(Pike_sp-1, parent_obj, parent_id);    pop_stack();    return p; /* We trust that there is a reference somewhere... */    }       case T_FUNCTION: -  return program_from_function(s); +  if (SUBTYPEOF(*s) == FUNCTION_BUILTIN) return 0; +  return low_program_from_function(*parent_obj = s->u.object, +  *parent_id = SUBTYPEOF(*s)); +     case T_PROGRAM:    return s->u.program;    default:
11068:    }   }    + /* NOTE: Does not add references to the return value! */ + PMOD_EXPORT struct program *program_from_svalue(const struct svalue *s) + { +  struct object *parent_obj = NULL; +  int parent_id = -1; +  return low_program_from_svalue(s, &parent_obj, &parent_id); + } +    #define FIND_CHILD_HASHSIZE 5003   struct find_child_cache_s   {