Branch: Tag:

1999-09-18

1999-09-18 09:21:30 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>

name tracking for constants underway (not yet finished)

Rev: src/docode.c:1.51
Rev: src/interpreter.h:1.13
Rev: src/language.yacc:1.123
Rev: src/las.c:1.88
Rev: src/lex.c:1.66
Rev: src/object.c:1.82
Rev: src/object.h:1.29
Rev: src/pike_types.h:1.21
Rev: src/program.c:1.151
Rev: src/program.h:1.59
Rev: src/program_areas.h:1.6
Rev: src/testsuite.in:1.197

5:   \*/   /**/   #include "global.h" - RCSID("$Id: lex.c,v 1.65 1999/08/03 00:45:13 hubbe Exp $"); + RCSID("$Id: lex.c,v 1.66 1999/09/18 09:21:22 hubbe Exp $");   #include "language.h"   #include "array.h"   #include "lex.h"
285:    }else if(n >= F_MAX_OPCODE) {    if(p &&    (int)p->num_constants > (int)(n-F_MAX_OPCODE) && -  p->constants[n-F_MAX_OPCODE].type==T_FUNCTION && -  (p->constants[n-F_MAX_OPCODE].subtype == FUNCTION_BUILTIN) && -  p->constants[n-F_MAX_OPCODE].u.efun) +  p->constants[n-F_MAX_OPCODE].sval.type==T_FUNCTION && +  (p->constants[n-F_MAX_OPCODE].sval.subtype == FUNCTION_BUILTIN) && +  p->constants[n-F_MAX_OPCODE].sval.u.efun)    { -  return p->constants[n-F_MAX_OPCODE].u.efun->name->str; +  return p->constants[n-F_MAX_OPCODE].sval.u.efun->name->str;    }else{    sprintf(buf, "Call efun %d", n - F_MAX_OPCODE);    return buf;
309:    }else if(n >= F_MAX_OPCODE) {    if(fp && fp->context.prog &&    (int)fp->context.prog->num_constants > (int)(n-F_MAX_OPCODE) && -  fp->context.prog->constants[n-F_MAX_OPCODE].type==T_FUNCTION && -  fp->context.prog->constants[n-F_MAX_OPCODE].subtype == FUNCTION_BUILTIN && -  fp->context.prog->constants[n-F_MAX_OPCODE].u.efun) +  fp->context.prog->constants[n-F_MAX_OPCODE].sval.type==T_FUNCTION && +  fp->context.prog->constants[n-F_MAX_OPCODE].sval.subtype == FUNCTION_BUILTIN && +  fp->context.prog->constants[n-F_MAX_OPCODE].sval.u.efun)    { -  return fp->context.prog->constants[n-F_MAX_OPCODE].u.efun->name->str; +  return fp->context.prog->constants[n-F_MAX_OPCODE].sval.u.efun->name->str;    }else{    sprintf(buf, "Call efun %d", n - F_MAX_OPCODE);    return buf;