pike.git/ lib/ master.pike.in

2003-05-31

2003-05-31 11:05:35 by Martin Stjernholm <mast@lysator.liu.se>

• b4718a7db0950507860428966e3047934d4680a4 (25 lines) (+13/-12) ^{[ Show | Annotate ]}
  Branch: 7.9

Fixed some too strict types.

Rev: lib/master.pike.in:1.284

6:   // Pike is distributed under GPL, LGPL and MPL. See the file COPYING   // for more information.   // - // $Id: master.pike.in,v 1.283 2003/05/31 11:03:16 mast Exp $ + // $Id: master.pike.in,v 1.284 2003/05/31 11:05:35 mast Exp $      #pike __REAL_VERSION__   
3158:    static mapping(mixed:string) rev_constants = ([]);    static mapping(mixed:string) rev_static_modules = ([]);    -  static array(string) find_index (object|program parent, mixed child) +  static array find_index (object|program parent, mixed child)    {    array id;   
3186:    return id;    }    -  string|array(string) nameof (mixed what) +  string|array nameof (mixed what)    {    ENC_MSG ("nameof (%t %O)\n", what, what);   
3225:       if (function|program prog = object_program (what))    if (object|program parent = function_object (prog) || function_program (prog)) { -  string|array(string) parent_name = nameof (parent); +  string|array parent_name = nameof (parent);    if (!parent_name) {    ENC_MSG (" inside the thing to encode - encoding recursively\n");    return UNDEFINED;
3246:    }       CONVERT_PARENT_TO_OBJ (parent_name, parent); -  array(string) id = find_index (parent, what); +  array id = find_index (parent, what);    ENC_RETURN ((arrayp (parent_name) ? parent_name : ({parent_name})) + id);    }    }
3264:    }       if (object|program parent = function_object (what) || function_program (what)) { -  string|array(string) parent_name = nameof (parent); +  string|array parent_name = nameof (parent);    if (!parent_name) {    ENC_MSG (" inside the thing to encode - encoding recursively\n");    return UNDEFINED;    }    else { -  string|array(string) id = function_name (what); +  string|array id = function_name (what);    if (stringp (id)) id = ({id});    else {    CONVERT_PARENT_TO_OBJ (parent_name, parent);
3349:    DEC_RETURN (0);    }    -  static mixed thingof (string|array(string) what) +  static mixed thingof (string|array what)    {    mixed res; -  array(string) sublist; +  array sublist;    if (arrayp (what)) sublist = what, what = sublist[0];       switch (what[0]) {
3401:    return res;    }    -  object objectof (string|array(string) what) +  object objectof (string|array what)    {    DEC_MSG ("objectof (%O)\n", what);    mixed res = thingof (what);
3409:    DEC_RETURN ([object] res);    }    -  function functionof (string|array(string) what) +  function functionof (string|array what)    {    DEC_MSG ("functionof (%O)\n", what);    mixed res = thingof (what);
3417:    DEC_RETURN ([function] res);    }    -  program programof (string|array(string) what) +  program programof (string|array what)    {    DEC_MSG ("programof (%O)\n", what);    mixed res = thingof (what);