Mercurial > octave
comparison libinterp/corefcn/bsxfun.cc @ 28631:70cdf8de553d
move non-member octave_value operator functions to octave namespace
* ov.h, ov.cc (unary_op, binary_op, cat_op, colon_op): New functions
in octave namespace that replace do_unary_op, do_binary_op, do_cat_op,
and do_colon_op, respectively.
(do_unary_op, do_binary_op, do_cat_op, do_colon_op):
Deprecate global functions. Forward to corresponding new functions in
octave namespace.
* bsxfun.cc, cellfun.cc, data.cc, dot.cc, fft.cc, oct-stream.cc,
stack-frame.h, tril.cc, ov-base-diag.cc, ov-bool.cc, ov-class.cc,
ov-complex.cc, ov-float.cc, ov-flt-complex.cc, ov-intx.h,
ov-lazy-idx.h, ov-magic-int.cc, ov-perm.cc, ov-range.cc, ov-scalar.cc,
oct-lvalue.cc, oct-lvalue.h, pt-binop.cc, pt-cbinop.cc, pt-colon.cc,
pt-eval.cc, pt-tm-const.cc, pt-unop.cc: Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 30 Jul 2020 16:16:04 -0400 |
| parents | bd51beb6205e |
| children | 2883b3d08b7e |
comparison
equal
deleted
inserted
replaced
| 28630:35f974bab4c8 | 28631:70cdf8de553d |
|---|---|
| 538 { | 538 { |
| 539 if (! tmp(0).isfloat ()) | 539 if (! tmp(0).isfloat ()) |
| 540 { | 540 { |
| 541 have_NDArray = false; | 541 have_NDArray = false; |
| 542 C = result_NDArray; | 542 C = result_NDArray; |
| 543 C = do_cat_op (C, tmp(0), ra_idx); | 543 C = octave::cat_op (C, tmp(0), ra_idx); |
| 544 } | 544 } |
| 545 else if (tmp(0).isreal ()) | 545 else if (tmp(0).isreal ()) |
| 546 result_NDArray.insert (tmp(0).array_value (), ra_idx); | 546 result_NDArray.insert (tmp(0).array_value (), ra_idx); |
| 547 else | 547 else |
| 548 { | 548 { |
| 558 { | 558 { |
| 559 if (! tmp(0).isfloat ()) | 559 if (! tmp(0).isfloat ()) |
| 560 { | 560 { |
| 561 have_FloatNDArray = false; | 561 have_FloatNDArray = false; |
| 562 C = result_FloatNDArray; | 562 C = result_FloatNDArray; |
| 563 C = do_cat_op (C, tmp(0), ra_idx); | 563 C = octave::cat_op (C, tmp(0), ra_idx); |
| 564 } | 564 } |
| 565 else if (tmp(0).isreal ()) | 565 else if (tmp(0).isreal ()) |
| 566 result_FloatNDArray.insert | 566 result_FloatNDArray.insert |
| 567 (tmp(0).float_array_value (), ra_idx); | 567 (tmp(0).float_array_value (), ra_idx); |
| 568 else | 568 else |
| 581 { \ | 581 { \ |
| 582 if (tmp(0).class_name () != CLS) \ | 582 if (tmp(0).class_name () != CLS) \ |
| 583 { \ | 583 { \ |
| 584 have_ ## T = false; \ | 584 have_ ## T = false; \ |
| 585 C = result_ ## T; \ | 585 C = result_ ## T; \ |
| 586 C = do_cat_op (C, tmp(0), ra_idx); \ | 586 C = octave::cat_op (C, tmp(0), ra_idx); \ |
| 587 } \ | 587 } \ |
| 588 else \ | 588 else \ |
| 589 result_ ## T .insert (tmp(0). EXTRACTOR ## _array_value (), ra_idx); \ | 589 result_ ## T .insert (tmp(0). EXTRACTOR ## _array_value (), ra_idx); \ |
| 590 } | 590 } |
| 591 | 591 |
| 599 else if BSXLOOP(uint8NDArray, "uint8", uint8) | 599 else if BSXLOOP(uint8NDArray, "uint8", uint8) |
| 600 else if BSXLOOP(uint16NDArray, "uint16", uint16) | 600 else if BSXLOOP(uint16NDArray, "uint16", uint16) |
| 601 else if BSXLOOP(uint32NDArray, "uint32", uint32) | 601 else if BSXLOOP(uint32NDArray, "uint32", uint32) |
| 602 else if BSXLOOP(uint64NDArray, "uint64", uint64) | 602 else if BSXLOOP(uint64NDArray, "uint64", uint64) |
| 603 else | 603 else |
| 604 C = do_cat_op (C, tmp(0), ra_idx); | 604 C = octave::cat_op (C, tmp(0), ra_idx); |
| 605 } | 605 } |
| 606 } | 606 } |
| 607 | 607 |
| 608 #define BSXEND(T) \ | 608 #define BSXEND(T) \ |
| 609 (have_ ## T) \ | 609 (have_ ## T) \ |