Branch: Tag:

2018-07-06

2018-07-06 10:52:48 by Henrik Grubbström (Grubba) <grubba@grubba.org>

MasterObject: Add compat handler argument to resolv().

3113:       //! Look up @[identifier] in the root module.    mixed resolv_base(string identifier, string|void current_file, -  object|void current_handler) +  object|void current_handler, +  object|void current_compat_handler)    {    // werror("Resolv_base(%O)\n",identifier);    return get_root_module(current_handler)[identifier];
3135:    //! Returns the value of the @[identifier] if it exists,    //! and @[UNDEFINED] otherwise.    mixed resolv(string identifier, string|void current_file, -  object|void current_handler) +  object|void current_handler, +  object|void current_compat_handler)    {    resolv_debug("resolv(%O, %O)\n",identifier, current_file);    INC_RESOLV_MSG_DEPTH();
3148:    }       if (current_file && !stringp(current_file)) { -  error("resolv(%O, %O, %O): current_file is not a string!\n", -  identifier, current_file, current_handler); +  error("resolv(%O, %O, %O, %O): current_file is not a string!\n", +  identifier, current_file, current_handler, current_compat_handler);    }       array(string) tmp = identifier/"::";
3181:    }    } else {    tmp = identifier/"."; -  ret = resolv_base(tmp[0], current_file, current_handler); +  ret = resolv_base(tmp[0], current_file, +  current_handler, current_compat_handler);    tmp = tmp[1..];    }    foreach(tmp,string index) {