Branch: Tag:

2002-09-21

2002-09-21 15:08:31 by Martin Stjernholm <mast@lysator.liu.se>

Replaced use of local:: to access hidden class variables with this_program::.

Rev: lib/modules/ADT.pmod/Table.pmod:1.24
Rev: lib/modules/Filesystem.pmod/Tar.pmod:1.16
Rev: lib/modules/Protocols.pmod/HTTP.pmod/Query.pike:1.43
Rev: lib/modules/Protocols.pmod/Line.pmod:1.18
Rev: lib/modules/Standards.pmod/URI.pike:1.13
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/CExtractor.pmod:1.15
Rev: lib/modules/Tools.pmod/AutoDoc.pmod/module.pmod:1.7
Rev: src/modules/Yp/module.pmod.in:1.17

4:   //! absolute form, as defined in RFC 2396      // Implemented by Johan Sundström and Johan Schön. - // $Id: URI.pike,v 1.12 2002/03/20 16:40:03 nilsson Exp $ + // $Id: URI.pike,v 1.13 2002/09/21 15:08:30 mast Exp $      #pragma strict_types   
170:    if(stringp(base_uri))    {    DEBUG("cloning base URI %O", base_uri); -  local::base_uri = object_program(this_object())(base_uri); // create a new URI object +  this_program::base_uri = object_program(this_object())(base_uri); // create a new URI object    }    else -  local::base_uri = [object(this_program)]base_uri; +  this_program::base_uri = [object(this_program)]base_uri;       // RFC 2396, §5.2:    // 1) The URI reference is parsed into the potential four components and
189:    {    DEBUG("Path is empty -- Inherit entire base URI "    "as per RFC 2396, §5.2 step 2. Done!"); -  inherit_properties(local::base_uri); +  inherit_properties(this_program::base_uri);    return;    }       if(uri[0] == '#')    {    DEBUG("Fragment only. Using entire base URI, except fragment."); -  inherit_properties(local::base_uri); +  inherit_properties(this_program::base_uri);    fragment = uri[1..];    return;    }
209:    if(sscanf(uri, "%[A-Za-z0-9+.-]:%s", scheme, uri) < 2)    {    scheme = 0; -  if(!local::base_uri) +  if(!this_program::base_uri)    error("Standards.URI: got a relative URI (no scheme) lacking a base_uri!\n");    }    DEBUG("Found scheme %O", scheme);
241:    "says we're absolute. Done!");    return;    } -  scheme = local::base_uri->scheme; +  scheme = this_program::base_uri->scheme;    DEBUG("Inherited scheme %O from base URI", scheme);       if(authority)
255:    // use an authority component.    if(!authority || !sizeof(authority))    { -  authority = local::base_uri->authority; +  authority = this_program::base_uri->authority;    DEBUG("Inherited authority %O from base URI", authority);    parse_authority();   
270:    // describe a simple method using a separate string buffer.       DEBUG("Combining base path %O with path %O => %O", -  local::base_uri->path, path, -  combine_uri_path(local::base_uri->path, path)); -  path = combine_uri_path(local::base_uri->path, path); +  this_program::base_uri->path, path, +  combine_uri_path(this_program::base_uri->path, path)); +  path = combine_uri_path(this_program::base_uri->path, path);       }    }