pike.git/ lib/ master.pike.in

2000-03-26

2000-03-26 15:11:34 by Martin Stjernholm <mast@lysator.liu.se>

• 19c327a5552ccc03a50168e8f751dc98e1775e6d (16 lines) (+11/-5) ^{[ Show | Annotate ]}
  Branch: 7.9

Yet more robustness when describing backtraces.

Rev: lib/master.pike.in:1.108

1:   /* -*- Pike -*-    * -  * $Id: master.pike.in,v 1.107 2000/03/25 21:28:37 hubbe Exp $ +  * $Id: master.pike.in,v 1.108 2000/03/26 15:11:34 mast Exp $    *    * Master-file for Pike.    *
1331:    if(string tmp=describe_program(m)) return tmp;    if(object o=function_object(m))    return (describe_object(o)||"")+"->"+function_name(m); -  else -  return function_name(m) || "function"; +  else { +  string tmp; +  if (catch (tmp = function_name(m))) +  // The function object has probably been destructed. +  return "function"; +  return tmp || "function"; +  }       case "program":    if(string tmp=describe_program(m)) return tmp;
1585:    }    }    }) { -  row += sprintf("Error indexing backtrace line %d (%O)!", e, err[1]); +  row += sprintf("Error indexing backtrace line %d: %s (%O)!", e, err[0], err[1]);    }    ret += row + "\n";    }