pike.git/ src/ language.yacc

2004-12-22

2004-12-22 18:46:15 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• f54c78921a05e913a37d1c67eb0b384858caef6e (11 lines) (+7/-4) ^{[ Show | Annotate ]}
  Branch: 7.9

Various object subtype related fixes and FIXME:s.

Rev: src/array.c:1.178
Rev: src/backend.cmod:1.148
Rev: src/builtin_functions.c:1.584
Rev: src/cpp.c:1.157
Rev: src/error.c:1.143
Rev: src/interpret.c:1.360
Rev: src/iterators.cmod:1.57
Rev: src/language.yacc:1.352

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: language.yacc,v 1.351 2004/11/06 07:05:41 nilsson Exp $ + || $Id: language.yacc,v 1.352 2004/12/22 18:46:15 grubba Exp $   */      %pure_parser
441:    else {    resolv_constant($4);    if (Pike_sp[-1].type == T_OBJECT) { +  /* FIXME: Object subtypes! */    o = Pike_sp[-1].u.object;    ref_push_string($2->u.sval.u.string);    push_int(Pike_compiler->new_program->id);
1313:    struct program *p = NULL;       if (Pike_sp[-1].type == T_OBJECT) { -  if(!Pike_sp[-1].u.object->prog) +  if(!(p = Pike_sp[-1].u.object->prog))    {    pop_stack();    push_int(0);    yyerror("Destructed object used as program identifier.");    }else{ -  int f=FIND_LFUN(Pike_sp[-1].u.object->prog,LFUN_CALL); +  int f = FIND_LFUN(p->inherits[Pike_sp[-1].subtype].prog, LFUN_CALL);    if(f!=-1)    { -  Pike_sp[-1].subtype=f; +  Pike_sp[-1].subtype = +  f + p->inherits[Pike_sp[-1].subtype].identifier_level;    Pike_sp[-1].type=T_FUNCTION;    }else{    extern void f_object_program(INT32);