pike.git/ lib/ master.pike.in

2003-01-09

2003-01-09 14:29:28 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• c3b5642090a3ed05e79100e8e1f2deee7ef009e2 (9 lines) (+6/-3) ^{[ Show | Annotate ]}
  Branch: 7.9

Update due to function_object() changes.

Rev: lib/master.pike.in:1.247
Rev: src/testsuite.in:1.582

6:   // Pike is distributed under GPL, LGPL and MPL. See the file COPYING   // for more information.   // - // $Id: master.pike.in,v 1.246 2003/01/07 19:41:57 nilsson Exp $ + // $Id: master.pike.in,v 1.247 2003/01/09 14:29:27 grubba Exp $      #pike __REAL_VERSION__   
2468:    // Begin by describing our parent.    array(object) parent_obj = ({ 0 });    string res = describe_module(function_object(parent_fun)|| +  function_program(parent_fun)||    object_program(parent_fun),    parent_obj);    // werror("So far: %O parent_obj:%O\n", res, parent_obj);
2519:       /* Constant object? */    catch { -  object|program parent_obj = function_object(parent_fun); +  object|program parent_obj = +  (function_object(parent_fun) || function_program(parent_fun));       if (objectp (parent_obj) || parent_obj) {    /* Check if we have a constant object. */
2562:    if(s=get_clean_program_path(p, "object_program(", ")", ""))    return s;    -  if(mixed tmp=function_object(p)) +  if(mixed tmp=(function_object(p) || function_program(p)))    if(s = function_name(p))    {    return describe_module(tmp) + s;