pike.git/ src/ builtin.cmod

2004-12-21

2004-12-21 20:46:09 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 2a8be1c6001464da46d139f25f40f82274d161d1 (35 lines) (+22/-13) ^{[ Show | Annotate ]}
  Branch: 7.9

More object subtypes.

Rev: src/builtin.cmod:1.175

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: builtin.cmod,v 1.174 2004/12/19 16:38:40 grubba Exp $ + || $Id: builtin.cmod,v 1.175 2004/12/21 20:46:09 grubba Exp $   */      #include "global.h"
85:    optflags OPT_TRY_OPTIMIZE;   {    int t=x->type; -  if(x->type == T_OBJECT && x->u.object->prog) +  struct program *p; +  if(x->type == T_OBJECT && (p = x->u.object->prog))    { -  ptrdiff_t fun=FIND_LFUN(x->u.object->prog, LFUN__SPRINTF); +  ptrdiff_t fun = FIND_LFUN(p->inherits[x->subtype].prog, LFUN__SPRINTF);    if(fun != -1)    {    push_int('t');    f_aggregate_mapping(0); -  apply_low(x->u.object, fun, 2); +  apply_low(x->u.object, +  fun + p->inherits[x->subtype].identifier_level, 2);    if(Pike_sp[-1].type == T_STRING)    {    stack_swap();
146:    optflags OPT_TRY_OPTIMIZE;   {    int c; -  if(x->type == T_OBJECT && x->u.object->prog) +  struct program *p; +  if(x->type == T_OBJECT && (p = x->u.object->prog))    { -  ptrdiff_t fun=FIND_LFUN(x->u.object->prog, LFUN__SPRINTF); +  ptrdiff_t fun = FIND_LFUN(p->inherits[x->subtype].prog, LFUN__SPRINTF);    if(fun != -1)    {    push_int('c');    f_aggregate_mapping(0); -  apply_low(x->u.object, fun, 2); +  apply_low(x->u.object, +  fun + p->inherits[x->subtype].identifier_level, 2);    if(Pike_sp[-1].type == T_STRING)    {    stack_swap();
199:    unsigned INT_TYPE n;    int len;    struct pike_string *s; +  struct program *p;    -  if(x->type == T_OBJECT && x->u.object->prog) +  if(x->type == T_OBJECT && (p = x->u.object->prog))    { -  ptrdiff_t fun=FIND_LFUN(x->u.object->prog, LFUN__SPRINTF); +  ptrdiff_t fun = FIND_LFUN(p->inherits[x->subtype].prog, LFUN__SPRINTF);    if(fun != -1)    {    push_int('x');    f_aggregate_mapping(0); -  apply_low(x->u.object, fun, 2); +  apply_low(x->u.object, +  fun + p->inherits[x->subtype].identifier_level, 2);    if(Pike_sp[-1].type == T_STRING)    {    stack_swap();
804:    *    * or similar    */ +  struct program *p;    if( map->type == T_MAPPING )    {    struct svalue s;
813:    Pike_sp++;    dmalloc_touch_svalue(Pike_sp-1);    } -  else if (map->type == T_OBJECT && map->u.object->prog) +  else if (map->type == T_OBJECT && (p = map->u.object->prog))    { -  int id = FIND_LFUN(map->u.object->prog, LFUN__M_DELETE); +  int id = FIND_LFUN(p->inherits[map->subtype].prog, LFUN__M_DELETE);       if( id == -1 )    SIMPLE_BAD_ARG_ERROR("m_delete", 1, "object containing the _m_delete method");    -  apply_low( map->u.object, id, 1 ); +  apply_low(map->u.object, +  id + p->inherits[map->subtype].identifier_level, 1);    stack_swap();    pop_stack();    } else {