Mercurial > octave
diff libinterp/parse-tree/pt-cbinop.cc @ 31607:aac27ad79be6 stable
maint: Re-indent code after switch to using namespace macros.
* build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc,
__ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc,
__pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h,
besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc,
call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc,
debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc,
dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h,
error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h,
event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc,
file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h,
gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h,
graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc,
gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h,
interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h,
inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc,
latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h,
lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc,
matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h,
oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc,
oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h,
oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc,
pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc,
settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc,
sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc,
syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h,
symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h,
text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc,
url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h,
variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc,
gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc,
cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h,
cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h,
cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc,
ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc,
ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc,
ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc,
ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h,
ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h,
octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc,
op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h,
anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h,
comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h,
parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h,
pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h,
pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc,
pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc,
pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h,
pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h,
pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h,
pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h,
pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h,
pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h,
pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h,
pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h,
idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h,
aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h,
gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc,
lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h,
oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc,
sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h,
oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc,
oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h,
action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h,
cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h,
lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc,
oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc,
oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc,
oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc,
pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h:
Re-indent code after switch to using namespace macros.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 01 Dec 2022 18:02:15 -0800 |
| parents | e88a07dec498 |
| children | 597f3ee61a48 |
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-cbinop.cc Thu Dec 01 14:23:45 2022 -0800 +++ b/libinterp/parse-tree/pt-cbinop.cc Thu Dec 01 18:02:15 2022 -0800 @@ -35,208 +35,208 @@ OCTAVE_BEGIN_NAMESPACE(octave) - octave_value - tree_compound_binary_expression::evaluate (tree_evaluator& tw, int) - { - octave_value val; +octave_value +tree_compound_binary_expression::evaluate (tree_evaluator& tw, int) +{ + octave_value val; - if (m_lhs) - { - octave_value a = m_lhs->evaluate (tw); + if (m_lhs) + { + octave_value a = m_lhs->evaluate (tw); - if (a.is_defined () && m_rhs) - { - octave_value b = m_rhs->evaluate (tw); + if (a.is_defined () && m_rhs) + { + octave_value b = m_rhs->evaluate (tw); - if (b.is_defined ()) - { - interpreter& interp = tw.get_interpreter (); + if (b.is_defined ()) + { + interpreter& interp = tw.get_interpreter (); - type_info& ti = interp.get_type_info (); + type_info& ti = interp.get_type_info (); - val = binary_op (ti, m_etype, a, b); - } - } - } + val = binary_op (ti, m_etype, a, b); + } + } + } - return val; - } + return val; +} - typedef tree_expression* tree_expression_ptr_t; +typedef tree_expression *tree_expression_ptr_t; - // If a tree expression is a transpose or hermitian transpose, return - // the argument and corresponding operator. +// If a tree expression is a transpose or hermitian transpose, return +// the argument and corresponding operator. - static octave_value::unary_op - strip_trans_herm (tree_expression_ptr_t& exp) - { - if (exp->is_unary_expression ()) - { - tree_unary_expression *uexp - = dynamic_cast<tree_unary_expression *> (exp); +static octave_value::unary_op +strip_trans_herm (tree_expression_ptr_t& exp) +{ + if (exp->is_unary_expression ()) + { + tree_unary_expression *uexp + = dynamic_cast<tree_unary_expression *> (exp); - octave_value::unary_op op = uexp->op_type (); + octave_value::unary_op op = uexp->op_type (); - if (op == octave_value::op_transpose - || op == octave_value::op_hermitian) - exp = uexp->operand (); - else - op = octave_value::unknown_unary_op; + if (op == octave_value::op_transpose + || op == octave_value::op_hermitian) + exp = uexp->operand (); + else + op = octave_value::unknown_unary_op; - return op; - } - else - return octave_value::unknown_unary_op; - } + return op; + } + else + return octave_value::unknown_unary_op; +} #if 0 - // Restore this code if short-circuit behavior can be preserved when needed. - // See bug #54465. +// Restore this code if short-circuit behavior can be preserved when needed. +// See bug #54465. - static octave_value::unary_op - strip_not (tree_expression_ptr_t& exp) - { - if (exp->is_unary_expression ()) - { - tree_unary_expression *uexp - = dynamic_cast<tree_unary_expression *> (exp); +static octave_value::unary_op +strip_not (tree_expression_ptr_t& exp) +{ + if (exp->is_unary_expression ()) + { + tree_unary_expression *uexp + = dynamic_cast<tree_unary_expression *> (exp); - octave_value::unary_op op = uexp->op_type (); + octave_value::unary_op op = uexp->op_type (); - if (op == octave_value::op_not) - exp = uexp->operand (); - else - op = octave_value::unknown_unary_op; + if (op == octave_value::op_not) + exp = uexp->operand (); + else + op = octave_value::unknown_unary_op; - return op; - } - else - return octave_value::unknown_unary_op; - } + return op; + } + else + return octave_value::unknown_unary_op; +} #endif - // Possibly convert multiplication to trans_mul, mul_trans, herm_mul, - // or mul_herm. +// Possibly convert multiplication to trans_mul, mul_trans, herm_mul, +// or mul_herm. - static octave_value::compound_binary_op - simplify_mul_op (tree_expression_ptr_t& a, tree_expression_ptr_t& b) - { - octave_value::compound_binary_op retop - = octave_value::unknown_compound_binary_op; +static octave_value::compound_binary_op +simplify_mul_op (tree_expression_ptr_t& a, tree_expression_ptr_t& b) +{ + octave_value::compound_binary_op retop + = octave_value::unknown_compound_binary_op; - octave_value::unary_op opa = strip_trans_herm (a); + octave_value::unary_op opa = strip_trans_herm (a); - if (opa == octave_value::op_hermitian) - retop = octave_value::op_herm_mul; - else if (opa == octave_value::op_transpose) - retop = octave_value::op_trans_mul; - else - { - octave_value::unary_op opb = strip_trans_herm (b); + if (opa == octave_value::op_hermitian) + retop = octave_value::op_herm_mul; + else if (opa == octave_value::op_transpose) + retop = octave_value::op_trans_mul; + else + { + octave_value::unary_op opb = strip_trans_herm (b); - if (opb == octave_value::op_hermitian) - retop = octave_value::op_mul_herm; - else if (opb == octave_value::op_transpose) - retop = octave_value::op_mul_trans; - } + if (opb == octave_value::op_hermitian) + retop = octave_value::op_mul_herm; + else if (opb == octave_value::op_transpose) + retop = octave_value::op_mul_trans; + } - return retop; - } + return retop; +} - // Possibly convert left division to trans_ldiv or herm_ldiv. +// Possibly convert left division to trans_ldiv or herm_ldiv. - static octave_value::compound_binary_op - simplify_ldiv_op (tree_expression_ptr_t& a, tree_expression_ptr_t&) - { - octave_value::compound_binary_op retop - = octave_value::unknown_compound_binary_op; +static octave_value::compound_binary_op +simplify_ldiv_op (tree_expression_ptr_t& a, tree_expression_ptr_t&) +{ + octave_value::compound_binary_op retop + = octave_value::unknown_compound_binary_op; - octave_value::unary_op opa = strip_trans_herm (a); + octave_value::unary_op opa = strip_trans_herm (a); - if (opa == octave_value::op_hermitian) - retop = octave_value::op_herm_ldiv; - else if (opa == octave_value::op_transpose) - retop = octave_value::op_trans_ldiv; + if (opa == octave_value::op_hermitian) + retop = octave_value::op_herm_ldiv; + else if (opa == octave_value::op_transpose) + retop = octave_value::op_trans_ldiv; - return retop; - } + return retop; +} - // Possibly contract and/or with negation. +// Possibly contract and/or with negation. #if 0 - // Restore this code if short-circuit behavior can be preserved when needed. - // See bug #54465. - static octave_value::compound_binary_op - simplify_and_or_op (tree_expression_ptr_t& a, tree_expression_ptr_t& b, - octave_value::binary_op op) - { - octave_value::compound_binary_op retop - = octave_value::unknown_compound_binary_op; +// Restore this code if short-circuit behavior can be preserved when needed. +// See bug #54465. +static octave_value::compound_binary_op +simplify_and_or_op (tree_expression_ptr_t& a, tree_expression_ptr_t& b, + octave_value::binary_op op) +{ + octave_value::compound_binary_op retop + = octave_value::unknown_compound_binary_op; - octave_value::unary_op opa = strip_not (a); + octave_value::unary_op opa = strip_not (a); - if (opa == octave_value::op_not) - { - if (op == octave_value::op_el_and) - retop = octave_value::op_el_not_and; - else if (op == octave_value::op_el_or) - retop = octave_value::op_el_not_or; - } - else - { - octave_value::unary_op opb = strip_not (b); + if (opa == octave_value::op_not) + { + if (op == octave_value::op_el_and) + retop = octave_value::op_el_not_and; + else if (op == octave_value::op_el_or) + retop = octave_value::op_el_not_or; + } + else + { + octave_value::unary_op opb = strip_not (b); - if (opb == octave_value::op_not) - { - if (op == octave_value::op_el_and) - retop = octave_value::op_el_and_not; - else if (op == octave_value::op_el_or) - retop = octave_value::op_el_or_not; - } - } + if (opb == octave_value::op_not) + { + if (op == octave_value::op_el_and) + retop = octave_value::op_el_and_not; + else if (op == octave_value::op_el_or) + retop = octave_value::op_el_or_not; + } + } - return retop; - } + return retop; +} #endif - tree_binary_expression * - maybe_compound_binary_expression (tree_expression *a, tree_expression *b, - int l, int c, octave_value::binary_op t) - { - tree_expression *ca = a; - tree_expression *cb = b; - octave_value::compound_binary_op ct; +tree_binary_expression * +maybe_compound_binary_expression (tree_expression *a, tree_expression *b, + int l, int c, octave_value::binary_op t) +{ + tree_expression *ca = a; + tree_expression *cb = b; + octave_value::compound_binary_op ct; - switch (t) - { - case octave_value::op_mul: - ct = simplify_mul_op (ca, cb); - break; + switch (t) + { + case octave_value::op_mul: + ct = simplify_mul_op (ca, cb); + break; - case octave_value::op_ldiv: - ct = simplify_ldiv_op (ca, cb); - break; + case octave_value::op_ldiv: + ct = simplify_ldiv_op (ca, cb); + break; #if 0 - // Restore this case if short-circuit behavior can be preserved - // when needed. See bug #54465. - case octave_value::op_el_and: - case octave_value::op_el_or: - ct = simplify_and_or_op (ca, cb, t); - break; + // Restore this case if short-circuit behavior can be preserved + // when needed. See bug #54465. + case octave_value::op_el_and: + case octave_value::op_el_or: + ct = simplify_and_or_op (ca, cb, t); + break; #endif - default: - ct = octave_value::unknown_compound_binary_op; - break; - } + default: + ct = octave_value::unknown_compound_binary_op; + break; + } - tree_binary_expression *ret - = (ct == octave_value::unknown_compound_binary_op - ? new tree_binary_expression (a, b, l, c, t) - : new tree_compound_binary_expression (a, b, l, c, t, ca, cb, ct)); + tree_binary_expression *ret + = (ct == octave_value::unknown_compound_binary_op + ? new tree_binary_expression (a, b, l, c, t) + : new tree_compound_binary_expression (a, b, l, c, t, ca, cb, ct)); - return ret; - } + return ret; +} OCTAVE_END_NAMESPACE(octave)