pike.git/ lib/ master.pike.in

2002-11-24

2002-11-24 16:46:33 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 0a064ea418d2286d78cffd376da00903552419a0 (77 lines) (+36/-41) ^{[ Show | Annotate ]}
  Branch: 7.9

Clean up of master()->describe().

Rev: lib/master.pike.in:1.227

6:   // Pike is distributed under GPL, LGPL and MPL. See the file COPYING   // for more information.   // - // $Id: master.pike.in,v 1.226 2002/11/23 18:40:05 marcus Exp $ + // $Id: master.pike.in,v 1.227 2002/11/24 16:46:33 grubba Exp $      #pike __REAL_VERSION__   
2197:    else if (intp (ident[m]) && ident[m] > 1)    ident[m] = "@" + identcount++;    -  string res, typ; -  catch { -  if (catch (typ=sprintf("%t",m))) -  typ = "object"; // Object with a broken _sprintf(), probably. -  switch(typ) +  string res; +  if (catch (res=sprintf("%t",m))) +  res = "object"; // Object with a broken _sprintf(), probably. +  switch(res)    {    case "int":    case "float":
2219:    break;    case "function":    if (string tmp=describe_function(m)) res = tmp; -  else res = typ; +     break;    case "program":    if(string tmp=describe_program(m)) res = tmp; -  else res = typ; +     break;    default: -  if (objectp(m)) -  if(string tmp=sprintf("%O", m)) { -  res = tmp; -  break; -  } -  res = typ; -  } -  }; -  if (!res) { +  /* object or type. */ +  if (catch { +  if(string tmp=sprintf("%O", m)) res = tmp; +  }) {    // Extra paranoia case.    res = sprintf("Instance of %O", _typeof(m));    } -  if (stringp (ident[m])) +  break; +  } +  if (stringp(ident[m]))    return ident[m] + "=" + res;    return res;    }