pike.git/ lib/ master.pike.in

1999-12-21

1999-12-21 23:46:39 by Per Hedbor <ph@opera.com>

• e1188345803afc408b303ac5c39ff81f848fdb28 (36 lines) (+30/-6) ^{[ Show | Annotate ]}
  Branch: 7.9

o Directory modules now returns UNDEFINED when there is no chance of the indentifier beeing present in them, without trying to compile the non-existant identifier.

Rev: lib/master.pike.in:1.86

1:   /* -*- Pike -*-    * -  * $Id: master.pike.in,v 1.85 1999/12/13 22:15:31 grubba Exp $ +  * $Id: master.pike.in,v 1.86 1999/12/21 23:46:39 per Exp $    *    * Master-file for Pike.    *
543:    string dirname;    mixed module;    mapping cache=([]); +  array files;       void create(string name)    {
555:       object|program ind(string index)    { -  if(module) { +  if(module) +  {    object o;    if(!zero_type(o=module[index])) return o;    }    -  +  if( !files ) +  files = get_dir(dirname); +  +  int ret; +  foreach( files, string s ) +  { +  if( search(s, index)!=-1 || search(index,s)!=-1 ) +  { +  ret=1; +  break; +  } +  } +  if(!ret) +  return UNDEFINED;    index = dirname+"/"+index;    if(object o=findmodule(index))    {    if(mixed tmp=o->_module_value) o=tmp;    return o;    } -  return cast_to_program(index,0); +  return cast_to_program( index, 0 );    }       object|program `[](string index)
598:    }    }    -  foreach(get_dir(dirname), string fname) { +  if( !files ) +  files = get_dir(dirname); +  foreach(files, string fname) {    catch {    if (((< ".pike", ".pmod" >)[fname[sizeof(fname)-5..]]) &&    !zero_type(`[](fname[..sizeof(fname)-6]))) {
1456:    {    mixed tmp;    string row; -  +  if( arrayp(trace[e]) && +  (sizeof(trace[e]) > 2) && +  (trace[e][2] == _main) && +  (sizeof(trace)>1) ) +  continue;    if (mixed err=catch {    tmp = trace[e];    if(stringp(tmp))
1476:    mixed desc="Unknown program";    if(sizeof(tmp)>=3 && functionp(tmp[2]))    { -  catch { +  catch +  {    if(mixed tmp=function_object(tmp[2]))    if(tmp=object_program(tmp))    if(tmp=describe_program(tmp))