Mercurial > octave
diff liboctave/cruft/misc/quit.h @ 22197:e43d83253e28
refill multi-line macro definitions
Use the Emacs C++ mode style for line continuation markers in
multi-line macro definitions.
* make_int.cc, __dsearchn__.cc, __magick_read__.cc, besselj.cc,
bitfcns.cc, bsxfun.cc, cellfun.cc, data.cc, defun-dld.h, defun-int.h,
defun.h, det.cc, error.h, find.cc, gcd.cc, graphics.cc, interpreter.h,
jit-ir.h, jit-typeinfo.h, lookup.cc, ls-mat5.cc, max.cc, mexproto.h,
mxarray.in.h, oct-stream.cc, ordschur.cc, pr-output.cc, profiler.h,
psi.cc, regexp.cc, sparse-xdiv.cc, sparse-xpow.cc, tril.cc, txt-eng.h,
utils.cc, variables.cc, variables.h, xdiv.cc, xpow.cc, __glpk__.cc,
ov-base.cc, ov-base.h, ov-cell.cc, ov-ch-mat.cc, ov-classdef.cc,
ov-complex.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-float.cc, ov-float.h,
ov-flt-complex.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc,
ov-int-traits.h, ov-lazy-idx.h, ov-perm.cc, ov-re-mat.cc,
ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc,
ov-type-conv.h, ov.cc, ov.h, op-class.cc, op-int-conv.cc, op-int.h,
op-str-str.cc, ops.h, lex.ll, Array.cc, CMatrix.cc, CSparse.cc,
MArray.cc, MArray.h, MDiagArray2.cc, MDiagArray2.h, MSparse.h,
Sparse.cc, dMatrix.cc, dSparse.cc, fCMatrix.cc, fMatrix.cc,
idx-vector.cc, f77-fcn.h, quit.h, bsxfun-decl.h, bsxfun-defs.cc,
lo-specfun.cc, oct-convn.cc, oct-convn.h, oct-norm.cc, oct-norm.h,
oct-rand.cc, Sparse-op-decls.h, Sparse-op-defs.h, mx-inlines.cc,
mx-op-decl.h, mx-op-defs.h, mach-info.cc, oct-group.cc, oct-passwd.cc,
oct-syscalls.cc, oct-time.cc, data-conv.cc, kpse.cc, lo-ieee.h,
lo-macros.h, oct-cmplx.h, oct-glob.cc, oct-inttypes.cc,
oct-inttypes.h, oct-locbuf.h, oct-sparse.h, url-transfer.cc,
oct-conf-post.in.h, shared-fcns.h: Refill macro definitions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 01 Aug 2016 12:40:18 -0400 |
| parents | 9203833cab7d |
| children | bac0d6f07a3e |
line wrap: on
line diff
--- a/liboctave/cruft/misc/quit.h Tue Jul 12 14:28:07 2016 -0400 +++ b/liboctave/cruft/misc/quit.h Mon Aug 01 12:40:18 2016 -0400 @@ -197,15 +197,15 @@ #else -#define OCTAVE_QUIT \ - do \ - { \ - if (octave_signal_caught) \ - { \ - octave_signal_caught = 0; \ - octave_handle_signal (); \ - } \ - } \ +#define OCTAVE_QUIT \ + do \ + { \ + if (octave_signal_caught) \ + { \ + octave_signal_caught = 0; \ + octave_handle_signal (); \ + } \ + } \ while (0) #endif @@ -225,72 +225,72 @@ so that you can perform extra clean up operations before throwing the interrupt exception. */ -#define BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE \ - BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_1; \ - octave_rethrow_exception (); \ +#define BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE \ + BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_1; \ + octave_rethrow_exception (); \ BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_2 -#define BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_1 \ - do \ - { \ - octave_jmp_buf saved_context; \ - \ - octave_save_current_context (saved_context); \ - \ - if (octave_set_current_context) \ - { \ +#define BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_1 \ + do \ + { \ + octave_jmp_buf saved_context; \ + \ + octave_save_current_context (saved_context); \ + \ + if (octave_set_current_context) \ + { \ octave_restore_current_context (saved_context) -#define BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_2 \ - } \ - else \ - { \ - octave_interrupt_immediately++ +#define BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_2 \ + } \ + else \ + { \ + octave_interrupt_immediately++ -#define END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE \ - octave_interrupt_immediately--; \ - octave_restore_current_context (saved_context); \ - } \ - } \ +#define END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE \ + octave_interrupt_immediately--; \ + octave_restore_current_context (saved_context); \ +} \ +} \ while (0) #if defined (__cplusplus) -#define BEGIN_INTERRUPT_WITH_EXCEPTIONS \ +#define BEGIN_INTERRUPT_WITH_EXCEPTIONS \ sig_atomic_t saved_octave_interrupt_immediately = octave_interrupt_immediately; \ - \ - try \ - { \ + \ + try \ + { \ octave_interrupt_immediately = 0; -#define END_INTERRUPT_WITH_EXCEPTIONS \ - } \ - catch (const octave_interrupt_exception&) \ - { \ +#define END_INTERRUPT_WITH_EXCEPTIONS \ + } \ + catch (const octave_interrupt_exception&) \ + { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ - octave_jump_to_enclosing_context (); \ - } \ - catch (const octave_execution_exception&) \ - { \ + octave_jump_to_enclosing_context (); \ + } \ + catch (const octave_execution_exception&) \ + { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ - octave_exception_state = octave_exec_exception; \ - octave_jump_to_enclosing_context (); \ - } \ - catch (const std::bad_alloc&) \ - { \ + octave_exception_state = octave_exec_exception; \ + octave_jump_to_enclosing_context (); \ + } \ + catch (const std::bad_alloc&) \ + { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ - octave_exception_state = octave_alloc_exception; \ - octave_jump_to_enclosing_context (); \ - } \ - catch (const octave_exit_exception& ex) \ - { \ + octave_exception_state = octave_alloc_exception; \ + octave_jump_to_enclosing_context (); \ + } \ + catch (const octave_exit_exception& ex) \ + { \ octave_interrupt_immediately = saved_octave_interrupt_immediately; \ - octave_exception_state = octave_quit_exception; \ - octave_exit_exception_status = ex.exit_status (); \ - octave_exit_exception_safe_to_return = ex.safe_to_return (); \ - octave_jump_to_enclosing_context (); \ - } \ - \ + octave_exception_state = octave_quit_exception; \ + octave_exit_exception_status = ex.exit_status (); \ + octave_exit_exception_safe_to_return = ex.safe_to_return (); \ + octave_jump_to_enclosing_context (); \ + } \ + \ octave_interrupt_immediately = saved_octave_interrupt_immediately #endif