Branch: Tag:

2002-12-04

2002-12-04 15:21:57 by Marcus Comstedt <marcus@mc.pp.se>

Repaired zealous objectp injection in describe_object().
Also, avoid generating "Foo.0" in descrive_program().

Rev: lib/master.pike.in:1.236

6:   // Pike is distributed under GPL, LGPL and MPL. See the file COPYING   // for more information.   // - // $Id: master.pike.in,v 1.235 2002/12/03 21:17:58 nilsson Exp $ + // $Id: master.pike.in,v 1.236 2002/12/04 15:21:57 marcus Exp $      #pike __REAL_VERSION__   
2457:    catch {    object|program parent_obj = function_object(parent_fun);    -  if (objectp (parent_obj)) { +  if (objectp (parent_obj) || parent_obj) {    /* Check if we have a constant object. */    object tmp = objects[parent_obj];    if (objectp (tmp)) parent_obj = tmp;
2499:    return s;       if(mixed tmp=function_object(p)) +  if(s = function_name(p))    { -  return describe_module(tmp) + function_name(p); +  return describe_module(tmp) + s;    }       if(s=_static_modules.Builtin()->program_defined(p))