pike.git/ src/ language.yacc

1999-11-04

1999-11-04 02:35:31 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 10e16f42f442721d6dba5538ba90a16d20d4bac6 (33 lines) (+27/-6) ^{[ Show | Annotate ]}
  Branch: 7.9

Added support to specify an error handler to compile() et al.

Rev: lib/master.pike.in:1.66
Rev: src/language.yacc:1.129
Rev: src/program.c:1.170
Rev: src/program.h:1.65

182:   /* This is the grammar definition of Pike. */      #include "global.h" - RCSID("$Id: language.yacc,v 1.128 1999/10/23 06:51:25 hubbe Exp $"); + RCSID("$Id: language.yacc,v 1.129 1999/11/04 02:35:30 grubba Exp $");   #ifdef HAVE_MEMORY_H   #include <memory.h>   #endif
416:    ref_push_string($1->u.sval.u.string);    ref_push_string($1->u.sval.u.string);    ref_push_string(lex.current_file); +  +  if (error_handler && error_handler->prog) { +  ref_push_object(error_handler); +  SAFE_APPLY_MASTER("handle_inherit", 3); +  } else {    SAFE_APPLY_MASTER("handle_inherit", 2); -  +  }       if(sp[-1].type != T_PROGRAM)    my_yyerror("Couldn't cast string \"%s\" to program",
494:    ref_push_string($2->u.sval.u.string);    free_node($2);    ref_push_string(lex.current_file); -  SAFE_APPLY_MASTER("handle_import",2); +  if (error_handler && error_handler->prog) { +  ref_push_object(error_handler); +  SAFE_APPLY_MASTER("handle_import", 3); +  } else { +  SAFE_APPLY_MASTER("handle_import", 2); +  }    use_module(sp-1);    pop_stack();    }
1705:    node *tmp;    push_text(".");    ref_push_string(lex.current_file); -  SAFE_APPLY_MASTER("handle_import",2); +  if (error_handler && error_handler->prog) { +  ref_push_object(error_handler); +  SAFE_APPLY_MASTER("handle_import", 3); +  } else { +  SAFE_APPLY_MASTER("handle_import", 2); +  }    tmp=mkconstantsvaluenode(sp-1);    pop_stack();    $$=index_node(tmp, ".", $2->u.sval.u.string);
2124:    num_parse_error++;    cumulative_parse_error++;    -  if ( get_master() ) +  if ((error_handler && error_handler->prog) || get_master())    {    if (lex.current_file) {    ref_push_string(lex.current_file);
2136:    }    push_int(lex.current_line);    push_text(str); -  SAFE_APPLY_MASTER("compile_error",3); +  if (error_handler && error_handler->prog) { +  safe_apply(error_handler, "compile_error", 3); +  } else { +  SAFE_APPLY_MASTER("compile_error", 3); +  }    pop_stack();    }else{    if (lex.current_file) {