Roxen.git/ server/ etc/ modules/ RXML.pmod/ module.pmod

2000-03-03

2000-03-03 03:31:38 by Martin Stjernholm <mast@lysator.liu.se>

• 80954c45e87dd13b7aab3acebc1b32608dc82a5b (35 lines) (+22/-13) ^{[ Show | Annotate ]}
  Branch: 5.2

Leave the context a little later in Parser.write() and
Parser.write_end().

Rev: server/etc/modules/RXML.pmod/module.pmod:1.71

2:   //!   //! Created 1999-07-30 by Martin Stjernholm.   //! - //! $Id: module.pmod,v 1.70 2000/02/24 04:06:15 nilsson Exp $ + //! $Id: module.pmod,v 1.71 2000/03/03 03:31:38 mast Exp $      //! Kludge: Must use "RXML.refs" somewhere for the whole module to be   //! loaded correctly.
2141:    {    int res;    ENTER_CONTEXT (context); -  mixed err = catch { +  if (mixed err = catch {    if (context && context->unwind_state && context->unwind_state->top) {   #ifdef MODULE_DEBUG    if (context->unwind_state->top != this_object())
2153:    }    if (feed (in)) res = 1; // Might unwind.    if (res && data_callback) data_callback (this_object()); -  }; -  LEAVE_CONTEXT(); -  if (err) +  })    if (objectp (err) && ([object] err)->thrown_at_unwind) {   #ifdef DEBUG -  if (err != this_object()) +  if (err != this_object()) { +  LEAVE_CONTEXT();    fatal_error ("Internal error: Unexpected unwind object catched.\n"); -  +  }   #endif    if (!context->unwind_state) context->unwind_state = ([]);    context->unwind_state->top = err;    }    else if (context)    context->handle_exception (err, this_object()); // Will rethrow unknown errors. -  else throw_fatal (err); +  else { +  LEAVE_CONTEXT(); +  throw_fatal (err); +  } +  LEAVE_CONTEXT();    return res;    }   
2176:    {    int res;    ENTER_CONTEXT (context); -  mixed err = catch { +  if (mixed err = catch {    if (context && context->unwind_state && context->unwind_state->top) {   #ifdef MODULE_DEBUG    if (context->unwind_state->top != this_object())
2188:    }    finish (in); // Might unwind.    if (data_callback) data_callback (this_object()); -  }; -  LEAVE_CONTEXT(); -  if (err) +  })    if (objectp (err) && ([object] err)->thrown_at_unwind) {   #ifdef DEBUG -  if (err != this_object()) +  if (err != this_object()) { +  LEAVE_CONTEXT();    fatal_error ("Internal error: Unexpected unwind object catched.\n"); -  +  }   #endif    if (!context->unwind_state) context->unwind_state = ([]);    context->unwind_state->top = err;    }    else if (context)    context->handle_exception (err, this_object()); // Will rethrow unknown errors. -  else throw_fatal (err); +  else { +  LEAVE_CONTEXT(); +  throw_fatal (err);    } -  +  LEAVE_CONTEXT(); +  }       array handle_var (string varref)    // Parses and evaluates a possible variable reference, with the