pike.git/ lib/ master.pike.in

2000-03-20

2000-03-20 05:18:21 by Martin Stjernholm <mast@lysator.liu.se>

• 51b0fbf58c51ccb24df559b1b911b8810fb1b1e5 (35 lines) (+15/-20) ^{[ Show | Annotate ]}
  Branch: 7.9

Can't trust sprintf("%t") to simply return "object" for objects
nowadays when _sprintf() is around.

Rev: lib/master.pike.in:1.103

1:   /* -*- Pike -*-    * -  * $Id: master.pike.in,v 1.102 2000/02/29 03:15:43 hubbe Exp $ +  * $Id: master.pike.in,v 1.103 2000/03/20 05:18:21 mast Exp $    *    * Master-file for Pike.    *
1326:    if(string tmp=describe_program(m)) return tmp;    return typ;    -  case "object": +  default: +  if (objectp(m))    if(string tmp=describe_object(m)) return tmp;    return typ; -  -  default: -  return typ; +     }   }   
1601:    (objectp(trace) && trace->is_generic_error))    {    if (catch { -  return trace[0] || "No error message!\n"; +  return trace[0] || "No error message.\n";    }) {    return "Error indexing backtrace!\n";    }
1619:    if(mixed tmp=search(f,x))    return "efun:"+tmp;    -  switch(sprintf("%t",x)) -  { -  case "program": +  if (programp(x)) {    if(mixed tmp=search(programs,x))    return tmp;       if(mixed tmp=search(values(_static_modules), x))    return "_static_modules."+(indices(_static_modules)[tmp]); -  break; -  -  case "object": +  } +  else if (objectp(x))    if(mixed tmp=search(objects,x))    if(tmp=search(programs,tmp))    return tmp; -  break; -  } +     return ([])[0];    }