Mercurial > hg > octave-lyh
view liboctave/array/MArray-defs.h @ 16169:0303fda3e929
Fix range behavior with -0 endpoints (bug #38423)
* libinterp/interpfcn/pr-output.cc(octave_print_internal): print base
or limit of range rather than using expression base+i*increment
which can destroy the signbit of base/limit.
* liboctave/array/Range.cc(Range constructor): Move trivial 2-line constructor
to .h file.
* liboctave/array/Range.cc(matrix_value, checkelem): Return base for first
element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(elem): Move function from Range.h Return base for
first element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(_rangeindex_helper, index): Return base for first
element of array. Return limit of range for end of array if appropriate.
* liboctave/array/Range.cc(min, max): Use '<=' or '>=' tests to
return base or limit if appropriate.
* liboctave/array/Range.cc(is_sorted): Place more common test first in
if/else if/else tree.
* liboctave/array/Range.cc(operator <<): Return base for first
element of array. Return limit of range for end of array if appropriate.
liboctave/array/Range.h(Range constructor): Put trivial 2-line constructor
in .h file.
liboctave/array/Range.h(elem): Move function which has become more complicated
to Range.cc.
* test/range.tst: Add %!tests for corner cases of base and limit of range.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 01 Mar 2013 14:06:02 -0800 |
| parents | 648dabbb4c6b |
| children |
line wrap: on
line source
/* Copyright (C) 1996-2012 John W. Eaton Copyright (C) 2009 VZLU Prague, a.s. This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_MArray_defs_h) #define octave_MArray_defs_h 1 #include "mx-inlines.cc" // Instantiate the OP= operators. #define MARRAY_OP_ASSIGN_DEFS(A_T, E_T, RHS_T, API) \ MARRAY_OP_ASSIGN_DECLS (A_T, E_T, template, API, , RHS_T) #define MARRAY_OP_ASSIGN_DEFS1(A_T, E_T, RHS_T, API) \ MARRAY_OP_ASSIGN_DECLS1 (A_T, E_T, template, API, , RHS_T) // Instantiate the unary operators. #define MARRAY_UNOP_DEFS(A_T, E_T, API) \ MARRAY_UNOP_DECLS (A_T, E_T, template, API, ) // Instantiate the binary operators. #define MARRAY_BINOP_DEFS(A_T, E_T, API) \ MARRAY_BINOP_DECLS (A_T, E_T, template, API, , A_T<E_T>, E_T) \ MARRAY_BINOP_DECLS (A_T, E_T, template, API, , E_T, A_T<E_T>) \ MARRAY_AA_BINOP_DECLS (A_T, E_T, template, API, ) #define MDIAGARRAY2_BINOP_DEFS(A_T, E_T, API) \ MDIAGARRAY2_DAS_BINOP_DECLS (A_T, E_T, template, API, , A_T<E_T>, E_T) \ MDIAGARRAY2_SDA_BINOP_DECLS (A_T, E_T, template, API, , E_T, A_T<E_T>) \ MDIAGARRAY2_DADA_BINOP_DECLS (A_T, E_T, template, API, ) // The following macros are for external use. // Instantiate all the MArray friends for MArray element type T. #define INSTANTIATE_MARRAY_FRIENDS(T, API) \ MARRAY_OP_ASSIGN_DEFS1 (MArray, T, T, API) \ MARRAY_OP_ASSIGN_DEFS (MArray, T, MArray<T>, API) \ MARRAY_UNOP_DEFS (MArray, T, API) \ MARRAY_BINOP_DEFS (MArray, T, API) // Instantiate all the MDiagArray2 friends for MDiagArray2 element type T. #define INSTANTIATE_MDIAGARRAY2_FRIENDS(T, API) \ MARRAY_UNOP_DEFS (MDiagArray2, T, API) \ MDIAGARRAY2_BINOP_DEFS (MDiagArray2, T, API) // Now we have all the definitions we need. #endif