Branch: Tag:

2003-01-09

2003-01-09 16:50:20 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Backported function_object() fixes from Pike 7.5.

Rev: lib/master.pike.in:1.239
Rev: src/testsuite.in:1.579

6:   // Pike is distributed under GPL, LGPL and MPL. See the file COPYING   // for more information.   // - // $Id: master.pike.in,v 1.238 2002/12/09 22:19:13 mast Exp $ + // $Id: master.pike.in,v 1.239 2003/01/09 16:50:19 grubba Exp $      #pike __REAL_VERSION__   
335:   //! @appears getenv   //!   //! When called with no arguments, a mapping with all current environment - //! variables will be returned. + //! variables will be returned. Destructive opreations on the mapping + //! will not affect the internal environment representation.   //!   //! If the @[varname] argument has been given, the value of the environment   //! variable with the name @[varname] will be returned. If no such
1360:    m_delete (predefines, name);    }    -  //! +  //! Returns a mapping with the current predefines.    mapping get_predefines()    {    return predefines;
1695:    case "threads":    // not really 100% correct, but good enough for most things.    no_resolv[ "Thread" ] = 1; -  add_constant( "thread_create", UNDEFINED ); +  add_constant( "thread_create" );    break;    default:    no_resolv[ feature ] = 1;
2413:    // 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);
2464:       /* 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. */
2507:    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;