pike.git/ src/ program.c

2001-08-15

2001-08-15 20:58:44 by Martin Stjernholm <mast@lysator.liu.se>

• b34c9f0b27b267b772cfbc6c17cbf59119846809 (59 lines) (+53/-6) ^{[ Show | Annotate ]}
  Branch: 7.9

Added a handler function compile_exception which gets the exceptions thrown
during compilation, instead of calling master()->handle_error for them.

Rev: src/las.c:1.263
Rev: src/program.c:1.364
Rev: src/program.h:1.142

5:   \*/   /**/   #include "global.h" - RCSID("$Id: program.c,v 1.363 2001/08/13 23:31:34 hubbe Exp $"); + RCSID("$Id: program.c,v 1.364 2001/08/15 20:58:43 mast Exp $");   #include "program.h"   #include "object.h"   #include "dynamic_buffer.h"
760:       if(SETJMP(tmp))    { -  call_handle_error(); +  struct svalue s; +  assign_svalue_no_free(&s, &throw_value); +  +  if (!ident->size_shift) { +  my_yyerror("Couldn't index module '%s'.", ident->str); +  } else {    yyerror("Couldn't index module."); -  +  } +  +  push_svalue(&s); +  safe_apply_handler("compile_exception", error_handler, compat_handler, 1); +  if (IS_ZERO(sp-1)) yy_describe_exception(&s); +  pop_stack(); +  free_svalue(&s);    } else {    int e = num_used_modules;    struct svalue *m = modules - num_used_modules;
3749:       if(SETJMP(tmp2))    { -  struct svalue zero; +  struct svalue zero, s; +  assign_svalue_no_free(&s, &throw_value);    -  call_handle_error(); -  +     yyerror("Couldn't store constant.");    -  +  push_svalue(&s); +  safe_apply_handler("compile_exception", error_handler, compat_handler, 1); +  if (IS_ZERO(sp-1)) yy_describe_exception(&s); +  pop_stack(); +  free_svalue(&s); +     zero.type = T_INT;    zero.subtype = NUMBER_NUMBER;    zero.u.integer=0;
4181:    va_end(args);   }    + void yy_describe_exception(struct svalue *thrown) + { +  /* FIXME: Doesn't handle wide string error messages. */ +  struct pike_string *s = 0; +  +  if ((thrown->type == T_ARRAY) && thrown->u.array->size && +  (thrown->u.array->item[0].type == T_STRING)) { +  /* Old-style backtrace */ +  s = thrown->u.array->item[0].u.string; +  } else if (thrown->type == T_OBJECT) { +  struct generic_error_struct *ge; +  if ((ge = (struct generic_error_struct *) +  get_storage(thrown->u.object, generic_error_program))) { +  s = ge->desc; +  } +  } +  +  if (s && !s->size_shift) { +  extern void f_string_trim_all_whites(INT32 args); +  ref_push_string(s); +  f_string_trim_all_whites(1); +  push_constant_text("\n"); +  push_constant_text(" "); +  f_replace(3); +  my_yyerror(sp[-1].u.string->str); +  pop_stack(); +  } + } +    struct program *compile(struct pike_string *prog,    struct object *handler,/* error handler */    int major, int minor,