Branch: Tag:

2002-10-25

2002-10-25 13:13:57 by Marcus Comstedt <marcus@mc.pp.se>

Don't discard error messages when doing inherits etc.

Rev: src/builtin_functions.c:1.449
Rev: src/docode.c:1.151
Rev: src/language.yacc:1.303
Rev: src/las.c:1.306
Rev: src/las.h:1.59

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: las.c,v 1.305 2002/10/21 09:13:17 grubba Exp $ + || $Id: las.c,v 1.306 2002/10/25 13:13:57 marcus Exp $   */      #include "global.h" - RCSID("$Id: las.c,v 1.305 2002/10/21 09:13:17 grubba Exp $"); + RCSID("$Id: las.c,v 1.306 2002/10/25 13:13:57 marcus Exp $");      #include "language.h"   #include "interpret.h"
1607:    char fnord[1000];    if(is_const(n))    { -  ptrdiff_t args=eval_low(n); +  ptrdiff_t args=eval_low(n,1);    if(args==1) return;       if(args!=-1)
5282:    }   }    - ptrdiff_t eval_low(node *n) + ptrdiff_t eval_low(node *n,int print_error)   {    unsigned INT16 num_strings, num_constants;    INT32 jump;
5337:       if(apply_low_safe_and_stupid(Pike_compiler->fake_object, jump))    { - #if 0 +  if(print_error)    /* Generate error message */    if(!Pike_compiler->catch_level)    {
5355: Inside #if 0
   free_svalue(&throw_value);    throw_value.type = T_INT;    } - #else /* !0 */ +  else {    free_svalue(&throw_value);    throw_value.type = T_INT;    /* Assume the node will throw errors at runtime too. */    n->tree_info |= OPT_SIDE_EFFECT;    n->node_info |= OPT_SIDE_EFFECT; - #endif /* 0 */ +  }    }else{    if(foo.yes)    pop_n_elems(Pike_sp-save_sp);
5408:    if(!is_const(n) || n->token==':')    return n;    -  args=eval_low(n); +  args=eval_low(n,0);       switch(args)    {