pike.git/ src/ interpret_functions.h

2002-05-11

2002-05-11 21:08:00 by Martin Stjernholm <mast@lysator.liu.se>

• 0ee38f3118251314d245ecdb85dd7835c2679070 (20 lines) (+17/-3) ^{[ Show | Annotate ]}
  Branch: 7.9

Cleaned up and fixed some bugs in the lookup of magic program identifiers
like this_program and ::`->. It's now possible to use e.g.
global::this_program. Added an optional level argument to this_object().

Added a magic identifier "this" that can be used instead of this_object().
Like this_program, it only exists when there's no other identifier with that
name. The object of a surrounding class can be adressed with Foo::this.

Rev: src/builtin_functions.c:1.428
Rev: src/interpret_functions.h:1.103
Rev: src/language.yacc:1.283
Rev: src/program.c:1.430
Rev: src/program.h:1.160

1:   /* -  * $Id: interpret_functions.h,v 1.102 2002/05/10 23:44:05 nilsson Exp $ +  * $Id: interpret_functions.h,v 1.103 2002/05/11 21:07:59 mast Exp $    *    * Opcode definitions for the interpreter.    */
2209:    DO_JUMP_TO(PROG_COUNTER-1);   });    - OPCODE0(F_THIS_OBJECT, "this_object", 0, { + OPCODE1(F_THIS_OBJECT, "this_object", 0, {    if(Pike_fp)    { -  ref_push_object(Pike_fp->current_object); +  struct object *o = Pike_fp->current_object; +  int level = arg1; +  for (; level > 0; level--) { +  struct program *p = o->prog; +  if (!p) +  Pike_error ("Cannot get the parent object of a destructed object.\n"); +  DO_IF_DEBUG ( +  if (!(p->flags & PROGRAM_USES_PARENT)) +  fatal ("optimize_this_object failed to set up parent pointers.\n"); +  ); +  o = PARENT_INFO(o)->parent; +  } +  ref_push_object(o);    }else{ -  +  /* Shouldn't this generate an error? /mast */    push_int(0);    }   });