pike.git/ src/ language.yacc

2018-11-03

2018-11-03 18:10:51 by Tobias S. Josefowitz <tobij@tobij.de>

• dbbb402ece9f8a4eebfa6abecadef9453426bc61 (5 lines) (+4/-1) ^{[ Show | Annotate ]}
  Branch: master

Compiler: Correctly handle errors from handle_import()

safe_apply_current() calls handle_error(), while we want to handle them
ourselves in handle_compilation_exception().

4966:   static int call_handle_import(struct pike_string *s)   {    ref_push_string(s); -  if (safe_apply_current(PC_HANDLE_IMPORT_FUN_NUM, 1)) { +  if (safe_apply_low2(Pike_fp->current_object, +  PC_HANDLE_IMPORT_FUN_NUM +  + Pike_fp->context->identifier_level, 1, NULL)) {    if ((1 << TYPEOF(Pike_sp[-1])) &    (BIT_MAPPING|BIT_OBJECT|BIT_PROGRAM|BIT_ZERO)) {    if (SAFE_IS_ZERO(Pike_sp - 1)) {