Branch: Tag:

2008-08-14

2008-08-14 13:14:10 by Martin Stjernholm <mast@lysator.liu.se>

Removed the no longer used CompatAllConstants. Added a FIXME to
unregister(). Fixed some indentation.

Rev: lib/master.pike.in:1.451

6:   // Pike is distributed under GPL, LGPL and MPL. See the file COPYING   // for more information.   // - // $Id: master.pike.in,v 1.450 2008/06/29 12:33:23 agehall Exp $ + // $Id: master.pike.in,v 1.451 2008/08/14 13:14:10 mast Exp $      #pike __REAL_VERSION__   //#pragma strict_types
681:   //! @[get_compat_master()]   protected inherit Pike_7_6_master;    - class CompatAllConstants (mapping(string:mixed) compat_overrides) - // Wrapper for the mapping returned by all_constants in compat mode. - { -  protected mixed `[] (string sym) -  { -  mixed val = compat_overrides[sym]; -  if (zero_type (val)) val = predef::all_constants()[sym]; -  return val; -  } -  protected mixed `-> (string sym) -  {return `[] (sym);} -  -  protected mixed `[]= (string sym, mixed val) -  {return predef::all_constants()[sym]= val;} -  protected mixed `->= (string sym, mixed val) -  {return `[]= (sym, val);} -  -  protected array(string) _indices() -  {return indices (predef::all_constants() | compat_overrides);} -  protected array(mixed) _values() -  {return values (predef::all_constants() | compat_overrides);} -  -  protected mapping `+ (mapping other) -  {return (predef::all_constants() | compat_overrides) + other;} -  protected mapping ``+ (mapping other) -  {return other + (predef::all_constants() | compat_overrides);} -  protected mapping `| (mapping other) -  {return (predef::all_constants() | compat_overrides) | other;} -  protected mapping ``| (mapping other) -  {return other | (predef::all_constants() | compat_overrides);} - } -  +    //! @appears error   //! Throws an error. A more readable version of the code   //! @expr{throw( ({ sprintf(f, @@args), backtrace() }) )@}.
1725:    m_delete (fc, name);    else    fc[name] = no_value; +  +  // FIXME: Delete from caches in dirnodes and joinnodes.   }      protected program findprog(string pname,
2611:    {    this_program::joined_modules = joined_modules;    } - }; + }      joinnode handle_import(string path, string|void current_file,    object|void current_handler)
4822:    }       protected string|array compare_resolved (string name, mixed what, -  mixed resolved, array(object) module_object) +  mixed resolved, +  array(object) module_object)    {    array append;