octave: libinterp/octave-value/ov.cc annotate

annotate libinterp/octave-value/ov.cc @ 30423:e658f400a30e stable

Fix possible lifetime issue (bug #61132). * libinterp/octave-value/ov.cc (make_range): Assign temporary value to variable with defined scope.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Fri, 03 Dec 2021 08:37:20 +0100
parents	4736bc8e9804
children	a5ca02c0ed7d 796f54d4ddbf

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	3 // Copyright (C) 1996-2021 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21295 diff changeset	27 # include "config.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	28 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	29
30142 a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	30 #include <cmath>
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	31
4970 25c2664861bc [project @ 2004-09-08 05:02:32 by jwe] jwe parents: 4966 diff changeset	32 #include "data-conv.h"
25c2664861bc [project @ 2004-09-08 05:02:32 by jwe] jwe parents: 4966 diff changeset	33 #include "quit.h"
2942 026f342c2019 [project @ 1997-05-08 02:20:57 by jwe] jwe parents: 2909 diff changeset	34 #include "str-vec.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	35
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	36 #include "ovl.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	37 #include "oct-stream.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	38 #include "ov.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	39 #include "ov-base.h"
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	40 #include "ov-bool.h"
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	41 #include "ov-bool-mat.h"
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3340 diff changeset	42 #include "ov-cell.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	43 #include "ov-scalar.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	44 #include "ov-float.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	45 #include "ov-re-mat.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	46 #include "ov-flt-re-mat.h"
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	47 #include "ov-re-diag.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	48 #include "ov-flt-re-diag.h"
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	49 #include "ov-perm.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	50 #include "ov-bool-sparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	51 #include "ov-cx-sparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	52 #include "ov-re-sparse.h"
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	53 #include "ov-int8.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	54 #include "ov-int16.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	55 #include "ov-int32.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	56 #include "ov-int64.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	57 #include "ov-uint8.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	58 #include "ov-uint16.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	59 #include "ov-uint32.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	60 #include "ov-uint64.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	61 #include "ov-complex.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	62 #include "ov-flt-complex.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	63 #include "ov-cx-mat.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	64 #include "ov-flt-cx-mat.h"
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	65 #include "ov-cx-diag.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	66 #include "ov-flt-cx-diag.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	67 #include "ov-ch-mat.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	68 #include "ov-str-mat.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	69 #include "ov-range.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	70 #include "ov-struct.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	71 #include "ov-class.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	72 #include "ov-classdef.h"
14015 77adde2e79ac fix include file name John W. Eaton <jwe@octave.org> parents: 14013 diff changeset	73 #include "ov-oncleanup.h"
3977 95663a3a2682 [project @ 2002-07-05 17:43:37 by jwe] jwe parents: 3961 diff changeset	74 #include "ov-cs-list.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	75 #include "ov-colon.h"
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	76 #include "ov-builtin.h"
4649 f7ce581b27fb [project @ 2003-11-23 21:46:44 by jwe] jwe parents: 4645 diff changeset	77 #include "ov-dld-fcn.h"
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	78 #include "ov-usr-fcn.h"
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4276 diff changeset	79 #include "ov-fcn-handle.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	80 #include "ov-typeinfo.h"
28588 ee9b1081471f allow integer constants > flintmax to be represented exactly (bug #45945) John W. Eaton <jwe@octave.org> parents: 28519 diff changeset	81 #include "ov-magic-int.h"
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	82 #include "ov-null-mat.h"
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	83 #include "ov-lazy-idx.h"
15754 bf77f7f66bdf register octave_java type at Octave startup John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	84 #include "ov-java.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	85
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	86 #include "defun.h"
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	87 #include "error.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21078 diff changeset	88 #include "errwarn.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23589 diff changeset	89 #include "interpreter-private.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	90 #include "pager.h"
4005 fc000ebb19df [project @ 2002-07-25 21:01:16 by jwe] jwe parents: 3977 diff changeset	91 #include "parse.h"
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24565 diff changeset	92 #include "pr-flt-fmt.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	93 #include "pr-output.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	94 #include "symtab.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	95 #include "utils.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	96 #include "variables.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	97
2477 3d905d3820a4 [project @ 1996-11-07 16:46:11 by jwe] jwe parents: 2475 diff changeset	98 // We are likely to have a lot of octave_value objects to allocate, so
3d905d3820a4 [project @ 1996-11-07 16:46:11 by jwe] jwe parents: 2475 diff changeset	99 // make the grow_size large.
3d905d3820a4 [project @ 1996-11-07 16:46:11 by jwe] jwe parents: 2475 diff changeset	100
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	101 // If TRUE, create special space-optimized diagonal matrix objects.
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	102
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	103 static bool Voptimize_diagonal_matrix = true;
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	104
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	105 // If TRUE, create special space-optimized permutation matrix objects.
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	106
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	107 static bool Voptimize_permutation_matrix = true;
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	108
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	109 // If TRUE, create special space-optimized range objects.
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	110
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	111 static bool Voptimize_range = true;
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	112
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5759 diff changeset	113 // FIXME
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	114
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	115 // Octave's value type.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	116
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	117 octave_base_value *
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	118 octave_value::nil_rep (void)
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	119 {
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	120 static octave_base_value nr;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	121 return &nr;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	122 }
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	123
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	124 std::string
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	125 octave_value::unary_op_as_string (unary_op op)
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	126 {
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	127 switch (op)
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	128 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	129 case op_not:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	130 return "!";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	131
4965 c0d8e8afa82f [project @ 2004-09-06 20:19:57 by jwe] jwe parents: 4944 diff changeset	132 case op_uplus:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	133 return "+";
4965 c0d8e8afa82f [project @ 2004-09-06 20:19:57 by jwe] jwe parents: 4944 diff changeset	134
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	135 case op_uminus:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	136 return "-";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	137
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	138 case op_transpose:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	139 return ".'";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	140
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	141 case op_hermitian:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	142 return "'";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	143
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	144 case op_incr:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	145 return "++";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	146
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	147 case op_decr:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	148 return "--";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	149
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	150 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	151 return "<unknown>";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	152 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	153 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	154
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	155 std::string
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	156 octave_value::unary_op_fcn_name (unary_op op)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	157 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	158 switch (op)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	159 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	160 case op_not:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	161 return "not";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	162
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	163 case op_uplus:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	164 return "uplus";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	165
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	166 case op_uminus:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	167 return "uminus";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	168
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	169 case op_transpose:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	170 return "transpose";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	171
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	172 case op_hermitian:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	173 return "ctranspose";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	174
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	175 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	176 return "<unknown>";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	177 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	178 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	179
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	180 std::string
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	181 octave_value::binary_op_as_string (binary_op op)
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	182 {
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	183 switch (op)
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	184 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	185 case op_add:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	186 return "+";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	187
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	188 case op_sub:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	189 return "-";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	190
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	191 case op_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	192 return "*";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	193
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	194 case op_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	195 return "/";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	196
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	197 case op_pow:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	198 return "^";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	199
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	200 case op_ldiv:
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23795 diff changeset	201 return R"(\)";
2903 facd9d10e5c1 [project @ 1997-04-30 03:53:07 by jwe] jwe parents: 2891 diff changeset	202
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	203 case op_lt:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	204 return "<";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	205
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	206 case op_le:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	207 return "<=";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	208
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	209 case op_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	210 return "==";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	211
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	212 case op_ge:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	213 return ">=";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	214
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	215 case op_gt:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	216 return ">";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	217
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	218 case op_ne:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	219 return "!=";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	220
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	221 case op_el_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	222 return ".*";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	223
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	224 case op_el_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	225 return "./";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	226
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	227 case op_el_pow:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	228 return ".^";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	229
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	230 case op_el_ldiv:
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23795 diff changeset	231 return R"(.\)";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	232
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	233 case op_el_and:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	234 return "&";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	235
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	236 case op_el_or:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	237 return "\|";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	238
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	239 case op_struct_ref:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	240 return ".";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	241
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	242 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	243 return "<unknown>";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	244 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	245 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	246
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	247 std::string
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	248 octave_value::binary_op_fcn_name (binary_op op)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	249 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	250 switch (op)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	251 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	252 case op_add:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	253 return "plus";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	254
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	255 case op_sub:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	256 return "minus";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	257
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	258 case op_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	259 return "mtimes";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	260
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	261 case op_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	262 return "mrdivide";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	263
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	264 case op_pow:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	265 return "mpower";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	266
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	267 case op_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	268 return "mldivide";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	269
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	270 case op_lt:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	271 return "lt";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	272
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	273 case op_le:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	274 return "le";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	275
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	276 case op_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	277 return "eq";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	278
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	279 case op_ge:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	280 return "ge";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	281
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	282 case op_gt:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	283 return "gt";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	284
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	285 case op_ne:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	286 return "ne";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	287
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	288 case op_el_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	289 return "times";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	290
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	291 case op_el_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	292 return "rdivide";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	293
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	294 case op_el_pow:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	295 return "power";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	296
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	297 case op_el_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	298 return "ldivide";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	299
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	300 case op_el_and:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	301 return "and";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	302
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	303 case op_el_or:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	304 return "or";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	305
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	306 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	307 return "<unknown>";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	308 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	309 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	310
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	311 std::string
7800 5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	312 octave_value::binary_op_fcn_name (compound_binary_op op)
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	313 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	314 switch (op)
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	315 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	316 case op_trans_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	317 return "transtimes";
7800 5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	318
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	319 case op_mul_trans:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	320 return "timestrans";
7800 5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	321
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	322 case op_herm_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	323 return "hermtimes";
7800 5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	324
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	325 case op_mul_herm:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	326 return "timesherm";
7800 5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	327
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	328 case op_trans_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	329 return "transldiv";
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	330
afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	331 case op_herm_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	332 return "hermldiv";
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	333
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	334 case op_el_and_not:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	335 return "andnot";
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	336
dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	337 case op_el_or_not:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	338 return "ornot";
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	339
dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	340 case op_el_not_and:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	341 return "notand";
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	342
dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	343 case op_el_not_or:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	344 return "notor";
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	345
7800 5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	346 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	347 return "<unknown>";
7800 5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	348 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	349 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	350
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	351 std::string
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	352 octave_value::assign_op_as_string (assign_op op)
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	353 {
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	354 switch (op)
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	355 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	356 case op_asn_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	357 return "=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	358
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	359 case op_add_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	360 return "+=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	361
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	362 case op_sub_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	363 return "-=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	364
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	365 case op_mul_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	366 return "*=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	367
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	368 case op_div_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	369 return "/=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	370
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	371 case op_ldiv_eq:
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23795 diff changeset	372 return R"(\=)";
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	373
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	374 case op_pow_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	375 return "^=";
2903 facd9d10e5c1 [project @ 1997-04-30 03:53:07 by jwe] jwe parents: 2891 diff changeset	376
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	377 case op_el_mul_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	378 return ".*=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	379
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	380 case op_el_div_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	381 return "./=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	382
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	383 case op_el_ldiv_eq:
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23795 diff changeset	384 return R"(.\=)";
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	385
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	386 case op_el_pow_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	387 return ".^=";
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	388
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	389 case op_el_and_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	390 return "&=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	391
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	392 case op_el_or_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	393 return "\|=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	394
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	395 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	396 return "<unknown>";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	397 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	398 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	399
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	400 octave_value::binary_op
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	401 octave_value::assign_op_to_binary_op (assign_op op)
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	402 {
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	403 switch (op)
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	404 {
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	405 case op_add_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	406 return op_add;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	407
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	408 case op_sub_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	409 return op_sub;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	410
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	411 case op_mul_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	412 return op_mul;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	413
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	414 case op_div_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	415 return op_div;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	416
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	417 case op_ldiv_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	418 return op_ldiv;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	419
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	420 case op_pow_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	421 return op_pow;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	422
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	423 case op_el_mul_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	424 return op_el_mul;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	425
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	426 case op_el_div_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	427 return op_el_div;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	428
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	429 case op_el_ldiv_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	430 return op_el_ldiv;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	431
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	432 case op_el_pow_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	433 return op_el_pow;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	434
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	435 case op_el_and_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	436 return op_el_and;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	437
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	438 case op_el_or_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	439 return op_el_or;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	440
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	441 default:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	442 return unknown_binary_op;
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	443 }
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	444 }
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	445
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	446 octave_value::assign_op
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	447 octave_value::binary_op_to_assign_op (binary_op op)
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	448 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	449 switch (op)
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	450 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	451 case op_add:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	452 return op_add_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	453
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	454 case op_sub:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	455 return op_sub_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	456
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	457 case op_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	458 return op_mul_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	459
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	460 case op_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	461 return op_div_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	462
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	463 case op_el_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	464 return op_el_mul_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	465
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	466 case op_el_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	467 return op_el_div_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	468
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	469 case op_el_and:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	470 return op_el_and_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	471
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	472 case op_el_or:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	473 return op_el_or_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	474
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	475 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	476 return unknown_assign_op;
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	477 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	478 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	479
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	480 octave_value::octave_value (short int i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	481 : m_rep (new octave_scalar (i))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	482 { }
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	483
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	484 octave_value::octave_value (unsigned short int i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	485 : m_rep (new octave_scalar (i))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	486 { }
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	487
4233 ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	488 octave_value::octave_value (int i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	489 : m_rep (new octave_scalar (i))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	490 { }
4233 ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	491
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	492 octave_value::octave_value (unsigned int i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	493 : m_rep (new octave_scalar (i))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	494 { }
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	495
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	496 octave_value::octave_value (long int i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	497 : m_rep (new octave_scalar (i))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	498 { }
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	499
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	500 octave_value::octave_value (unsigned long int i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	501 : m_rep (new octave_scalar (i))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	502 { }
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	503
21354 06d15e4e611a move public data type macros to octave-config.h John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	504 #if defined (OCTAVE_HAVE_LONG_LONG_INT)
4353 ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	505 octave_value::octave_value (long long int i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	506 : m_rep (new octave_scalar (i))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	507 { }
4353 ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	508 #endif
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	509
21354 06d15e4e611a move public data type macros to octave-config.h John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	510 #if defined (OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT)
4353 ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	511 octave_value::octave_value (unsigned long long int i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	512 : m_rep (new octave_scalar (i))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	513 { }
4353 ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	514 #endif
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	515
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	516 octave_value::octave_value (octave::sys::time t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	517 : m_rep (new octave_scalar (t.double_value ()))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	518 { }
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	519
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	520 octave_value::octave_value (double d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	521 : m_rep (new octave_scalar (d))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	522 { }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	523
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	524 octave_value::octave_value (float d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	525 : m_rep (new octave_float_scalar (d))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	526 { }
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	527
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4584 diff changeset	528 octave_value::octave_value (const Cell& c, bool is_csl)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	529 : m_rep (is_csl
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	530 ? dynamic_cast<octave_base_value *> (new octave_cs_list (c))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	531 : dynamic_cast<octave_base_value *> (new octave_cell (c)))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	532 { }
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3340 diff changeset	533
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	534 octave_value::octave_value (const Array<octave_value>& a, bool is_csl)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	535 : m_rep (is_csl
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	536 ? dynamic_cast<octave_base_value *> (new octave_cs_list (Cell (a)))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	537 : dynamic_cast<octave_base_value *> (new octave_cell (Cell (a))))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	538 { }
5147 47e4c91e5799 [project @ 2005-02-16 21:06:19 by jwe] jwe parents: 5146 diff changeset	539
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	540 octave_value::octave_value (const Matrix& m, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	541 : m_rep (new octave_matrix (m, t))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	542 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	543 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	544 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	545
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	546 octave_value::octave_value (const FloatMatrix& m, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	547 : m_rep (new octave_float_matrix (m, t))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	548 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	549 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	550 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	551
4507 65f47f8a92a2 [project @ 2003-09-10 15:48:02 by jwe] jwe parents: 4505 diff changeset	552 octave_value::octave_value (const NDArray& a)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	553 : m_rep (new octave_matrix (a))
4478 7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	554 {
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	555 maybe_mutate ();
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	556 }
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	557
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	558 octave_value::octave_value (const FloatNDArray& a)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	559 : m_rep (new octave_float_matrix (a))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	560 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	561 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	562 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	563
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	564 octave_value::octave_value (const Array<double>& a)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	565 : m_rep (new octave_matrix (a))
4911 14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	566 {
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	567 maybe_mutate ();
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	568 }
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	569
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	570 octave_value::octave_value (const Array<float>& a)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	571 : m_rep (new octave_float_matrix (a))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	572 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	573 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	574 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	575
15428 fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	576 octave_value::octave_value (const DiagArray2<double>& d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	577 : m_rep (Voptimize_diagonal_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	578 ? dynamic_cast<octave_base_value *> (new octave_diag_matrix (d))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	579 : dynamic_cast<octave_base_value *> (new octave_matrix (Matrix (d))))
15428 fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	580 {
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	581 maybe_mutate ();
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	582 }
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	583
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	584 octave_value::octave_value (const DiagArray2<float>& d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	585 : m_rep (Voptimize_diagonal_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	586 ? dynamic_cast<octave_base_value *> (new octave_float_diag_matrix (d))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	587 : dynamic_cast<octave_base_value *> (new octave_float_matrix (FloatMatrix (d))))
15428 fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	588 {
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	589 maybe_mutate ();
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	590 }
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	591
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	592 octave_value::octave_value (const DiagArray2<Complex>& d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	593 : m_rep (Voptimize_diagonal_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	594 ? dynamic_cast<octave_base_value *> (new octave_complex_diag_matrix (d))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	595 : dynamic_cast<octave_base_value *> (new octave_complex_matrix (ComplexMatrix (d))))
15428 fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	596 {
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	597 maybe_mutate ();
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	598 }
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	599
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	600 octave_value::octave_value (const DiagArray2<FloatComplex>& d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	601 : m_rep (Voptimize_diagonal_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	602 ? dynamic_cast<octave_base_value *> (new octave_float_complex_diag_matrix (d))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	603 : dynamic_cast<octave_base_value *> (new octave_float_complex_matrix (FloatComplexMatrix (d))))
15428 fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	604 {
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	605 maybe_mutate ();
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	606 }
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	607
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	608 octave_value::octave_value (const DiagMatrix& d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	609 : m_rep (Voptimize_diagonal_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	610 ? dynamic_cast<octave_base_value *> (new octave_diag_matrix (d))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	611 : dynamic_cast<octave_base_value *> (new octave_matrix (Matrix (d))))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	612 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	613 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	614 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	615
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	616 octave_value::octave_value (const FloatDiagMatrix& d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	617 : m_rep (Voptimize_diagonal_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	618 ? dynamic_cast<octave_base_value *> (new octave_float_diag_matrix (d))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	619 : dynamic_cast<octave_base_value *> (new octave_float_matrix (FloatMatrix (d))))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	620 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	621 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	622 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	623
3418 ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	624 octave_value::octave_value (const RowVector& v)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	625 : m_rep (new octave_matrix (v))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	626 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	627 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	628 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	629
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	630 octave_value::octave_value (const FloatRowVector& v)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	631 : m_rep (new octave_float_matrix (v))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	632 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	633 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	634 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	635
3418 ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	636 octave_value::octave_value (const ColumnVector& v)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	637 : m_rep (new octave_matrix (v))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	638 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	639 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	640 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	641
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	642 octave_value::octave_value (const FloatColumnVector& v)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	643 : m_rep (new octave_float_matrix (v))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	644 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	645 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	646 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	647
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	648 octave_value::octave_value (const Complex& C)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	649 : m_rep (new octave_complex (C))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	650 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	651 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	652 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	653
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	654 octave_value::octave_value (const FloatComplex& C)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	655 : m_rep (new octave_float_complex (C))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	656 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	657 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	658 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	659
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	660 octave_value::octave_value (const ComplexMatrix& m, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	661 : m_rep (new octave_complex_matrix (m, t))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	662 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	663 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	664 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	665
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	666 octave_value::octave_value (const FloatComplexMatrix& m, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	667 : m_rep (new octave_float_complex_matrix (m, t))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	668 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	669 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	670 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	671
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	672 octave_value::octave_value (const ComplexNDArray& a)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	673 : m_rep (new octave_complex_matrix (a))
4478 7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	674 {
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	675 maybe_mutate ();
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	676 }
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	677
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	678 octave_value::octave_value (const FloatComplexNDArray& a)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	679 : m_rep (new octave_float_complex_matrix (a))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	680 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	681 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	682 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	683
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	684 octave_value::octave_value (const Array<Complex>& a)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	685 : m_rep (new octave_complex_matrix (a))
4911 14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	686 {
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	687 maybe_mutate ();
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	688 }
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	689
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	690 octave_value::octave_value (const Array<FloatComplex>& a)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	691 : m_rep (new octave_float_complex_matrix (a))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	692 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	693 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	694 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	695
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	696 octave_value::octave_value (const ComplexDiagMatrix& d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	697 : m_rep (Voptimize_diagonal_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	698 ? dynamic_cast<octave_base_value *> (new octave_complex_diag_matrix (d))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	699 : dynamic_cast<octave_base_value *> (new octave_complex_matrix (ComplexMatrix (d))))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	700 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	701 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	702 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	703
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	704 octave_value::octave_value (const FloatComplexDiagMatrix& d)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	705 : m_rep (Voptimize_diagonal_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	706 ? dynamic_cast<octave_base_value *> (new octave_float_complex_diag_matrix (d))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	707 : dynamic_cast<octave_base_value *> (new octave_float_complex_matrix (FloatComplexMatrix (d))))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	708 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	709 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	710 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	711
3418 ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	712 octave_value::octave_value (const ComplexRowVector& v)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	713 : m_rep (new octave_complex_matrix (v))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	714 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	715 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	716 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	717
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	718 octave_value::octave_value (const FloatComplexRowVector& v)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	719 : m_rep (new octave_float_complex_matrix (v))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	720 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	721 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	722 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	723
3418 ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	724 octave_value::octave_value (const ComplexColumnVector& v)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	725 : m_rep (new octave_complex_matrix (v))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	726 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	727 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	728 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	729
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	730 octave_value::octave_value (const FloatComplexColumnVector& v)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	731 : m_rep (new octave_float_complex_matrix (v))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	732 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	733 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	734 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	735
8960 93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	736 octave_value::octave_value (const PermMatrix& p)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	737 : m_rep (Voptimize_permutation_matrix
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	738 ? dynamic_cast<octave_base_value *> (new octave_perm_matrix (p))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	739 : dynamic_cast<octave_base_value *> (new octave_matrix (Matrix (p))))
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	740 {
8960 93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	741 maybe_mutate ();
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	742 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	743
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	744 octave_value::octave_value (bool b)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	745 : m_rep (new octave_bool (b))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	746 { }
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	747
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	748 octave_value::octave_value (const boolMatrix& bm, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	749 : m_rep (new octave_bool_matrix (bm, t))
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	750 {
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	751 maybe_mutate ();
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	752 }
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	753
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	754 octave_value::octave_value (const boolNDArray& bnda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	755 : m_rep (new octave_bool_matrix (bnda))
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	756 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	757 maybe_mutate ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	758 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	759
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	760 octave_value::octave_value (const Array<bool>& bnda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	761 : m_rep (new octave_bool_matrix (bnda))
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	762 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	763 maybe_mutate ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	764 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	765
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	766 octave_value::octave_value (char c, char type)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	767 : m_rep (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	768 ? new octave_char_matrix_dq_str (c)
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	769 : new octave_char_matrix_sq_str (c))
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3018 diff changeset	770 {
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3018 diff changeset	771 maybe_mutate ();
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3018 diff changeset	772 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3018 diff changeset	773
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	774 octave_value::octave_value (const char *s, char type)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	775 : m_rep (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	776 ? new octave_char_matrix_dq_str (s)
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	777 : new octave_char_matrix_sq_str (s))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	778 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	779 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	780 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	781
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	782 octave_value::octave_value (const std::string& s, char type)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	783 : m_rep (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	784 ? new octave_char_matrix_dq_str (s)
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	785 : new octave_char_matrix_sq_str (s))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	786 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	787 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	788 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	789
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	790 octave_value::octave_value (const string_vector& s, char type)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	791 : m_rep (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	792 ? new octave_char_matrix_dq_str (s)
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	793 : new octave_char_matrix_sq_str (s))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	794 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	795 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	796 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	797
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	798 octave_value::octave_value (const charMatrix& chm, char type)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	799 : m_rep (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	800 ? new octave_char_matrix_dq_str (chm)
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	801 : new octave_char_matrix_sq_str (chm))
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	802 {
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	803 maybe_mutate ();
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	804 }
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	805
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	806 octave_value::octave_value (const charNDArray& chm, char type)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	807 : m_rep (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	808 ? new octave_char_matrix_dq_str (chm)
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	809 : new octave_char_matrix_sq_str (chm))
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	810 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	811 maybe_mutate ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	812 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	813
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	814 octave_value::octave_value (const Array<char>& chm, char type)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	815 : m_rep (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	816 ? new octave_char_matrix_dq_str (chm)
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	817 : new octave_char_matrix_sq_str (chm))
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	818 {
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	819 maybe_mutate ();
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	820 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	821
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23352 diff changeset	822 octave_value::octave_value (const SparseMatrix& m, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	823 : m_rep (new octave_sparse_matrix (m, t))
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	824 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	825 maybe_mutate ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	826 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	827
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23352 diff changeset	828 octave_value::octave_value (const Sparse<double>& m, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	829 : m_rep (new octave_sparse_matrix (m, t))
6863 3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	830 {
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	831 maybe_mutate ();
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	832 }
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	833
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23352 diff changeset	834 octave_value::octave_value (const SparseComplexMatrix& m, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	835 : m_rep (new octave_sparse_complex_matrix (m, t))
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	836 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	837 maybe_mutate ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	838 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	839
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23352 diff changeset	840 octave_value::octave_value (const Sparse<Complex>& m, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	841 : m_rep (new octave_sparse_complex_matrix (m, t))
6863 3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	842 {
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	843 maybe_mutate ();
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	844 }
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	845
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23352 diff changeset	846 octave_value::octave_value (const SparseBoolMatrix& bm, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	847 : m_rep (new octave_sparse_bool_matrix (bm, t))
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	848 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	849 maybe_mutate ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	850 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	851
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23352 diff changeset	852 octave_value::octave_value (const Sparse<bool>& bm, const MatrixType& t)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	853 : m_rep (new octave_sparse_bool_matrix (bm, t))
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	854 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	855 maybe_mutate ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	856 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	857
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	858 octave_value::octave_value (const octave_int8& i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	859 : m_rep (new octave_int8_scalar (i))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	860 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	861 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	862 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	863
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	864 octave_value::octave_value (const octave_uint8& i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	865 : m_rep (new octave_uint8_scalar (i))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	866 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	867 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	868 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	869
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	870 octave_value::octave_value (const octave_int16& i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	871 : m_rep (new octave_int16_scalar (i))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	872 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	873 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	874 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	875
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	876 octave_value::octave_value (const octave_uint16& i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	877 : m_rep (new octave_uint16_scalar (i))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	878 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	879 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	880 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	881
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	882 octave_value::octave_value (const octave_int32& i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	883 : m_rep (new octave_int32_scalar (i))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	884 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	885 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	886 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	887
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	888 octave_value::octave_value (const octave_uint32& i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	889 : m_rep (new octave_uint32_scalar (i))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	890 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	891 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	892 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	893
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	894 octave_value::octave_value (const octave_int64& i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	895 : m_rep (new octave_int64_scalar (i))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	896 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	897 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	898 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	899
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	900 octave_value::octave_value (const octave_uint64& i)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	901 : m_rep (new octave_uint64_scalar (i))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	902 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	903 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	904 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	905
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	906 octave_value::octave_value (const int8NDArray& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	907 : m_rep (new octave_int8_matrix (inda))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	908 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	909 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	910 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	911
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	912 octave_value::octave_value (const Array<octave_int8>& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	913 : m_rep (new octave_int8_matrix (inda))
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	914 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	915 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	916 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	917
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	918 octave_value::octave_value (const uint8NDArray& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	919 : m_rep (new octave_uint8_matrix (inda))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	920 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	921 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	922 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	923
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	924 octave_value::octave_value (const Array<octave_uint8>& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	925 : m_rep (new octave_uint8_matrix (inda))
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	926 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	927 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	928 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	929
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	930 octave_value::octave_value (const int16NDArray& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	931 : m_rep (new octave_int16_matrix (inda))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	932 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	933 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	934 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	935
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	936 octave_value::octave_value (const Array<octave_int16>& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	937 : m_rep (new octave_int16_matrix (inda))
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	938 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	939 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	940 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	941
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	942 octave_value::octave_value (const uint16NDArray& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	943 : m_rep (new octave_uint16_matrix (inda))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	944 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	945 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	946 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	947
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	948 octave_value::octave_value (const Array<octave_uint16>& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	949 : m_rep (new octave_uint16_matrix (inda))
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	950 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	951 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	952 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	953
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	954 octave_value::octave_value (const int32NDArray& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	955 : m_rep (new octave_int32_matrix (inda))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	956 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	957 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	958 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	959
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	960 octave_value::octave_value (const Array<octave_int32>& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	961 : m_rep (new octave_int32_matrix (inda))
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	962 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	963 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	964 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	965
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	966 octave_value::octave_value (const uint32NDArray& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	967 : m_rep (new octave_uint32_matrix (inda))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	968 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	969 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	970 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	971
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	972 octave_value::octave_value (const Array<octave_uint32>& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	973 : m_rep (new octave_uint32_matrix (inda))
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	974 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	975 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	976 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	977
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	978 octave_value::octave_value (const int64NDArray& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	979 : m_rep (new octave_int64_matrix (inda))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	980 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	981 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	982 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	983
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	984 octave_value::octave_value (const Array<octave_int64>& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	985 : m_rep (new octave_int64_matrix (inda))
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	986 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	987 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	988 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	989
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	990 octave_value::octave_value (const uint64NDArray& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	991 : m_rep (new octave_uint64_matrix (inda))
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	992 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	993 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	994 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	995
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	996 octave_value::octave_value (const Array<octave_uint64>& inda)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	997 : m_rep (new octave_uint64_matrix (inda))
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	998 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	999 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1000 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1001
9351 e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1002 octave_value::octave_value (const Array<octave_idx_type>& inda, bool zero_based,
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1003 bool cache_index)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1004 : m_rep (new octave_matrix (inda, zero_based, cache_index))
9351 e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1005 {
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1006 maybe_mutate ();
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1007 }
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1008
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1009 octave_value::octave_value (const octave::idx_vector& idx, bool lazy)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1010 : m_rep ()
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1011 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1012 double scalar;
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	1013 octave::range<double> range;
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1014 NDArray array;
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1015 boolNDArray mask;
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1016 octave::idx_vector::idx_class_type idx_class;
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1017
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1018 if (lazy)
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1019 {
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1020 // Only make lazy indices out of ranges and index vectors.
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1021 switch (idx.idx_class ())
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1022 {
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1023 case octave::idx_vector::class_range:
29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1024 case octave::idx_vector::class_vector:
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1025 m_rep = new octave_lazy_index (idx);
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1026 maybe_mutate ();
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1027 return;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1028
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1029 default:
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1030 break;
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1031 }
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1032 }
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1033
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1034 idx.unconvert (idx_class, scalar, range, array, mask);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1035
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1036 switch (idx_class)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1037 {
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1038 case octave::idx_vector::class_colon:
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1039 m_rep = new octave_magic_colon ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1040 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1041
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1042 case octave::idx_vector::class_range:
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1043 m_rep = new octave_range (range, idx);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1044 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1045
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1046 case octave::idx_vector::class_scalar:
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1047 m_rep = new octave_scalar (scalar);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1048 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1049
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1050 case octave::idx_vector::class_vector:
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1051 m_rep = new octave_matrix (array, idx);
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1052 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1053
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	1054 case octave::idx_vector::class_mask:
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1055 m_rep = new octave_bool_matrix (mask, idx);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1056 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1057
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1058 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1059 panic_impossible ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1060 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1061 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1062
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1063 // FIXME: needed?
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1064 maybe_mutate ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1065 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1066
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1067 octave_value::octave_value (const Array<std::string>& cellstr)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1068 : m_rep (new octave_cell (cellstr))
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1069 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1070 maybe_mutate ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1071 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1072
29954 4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work John W. Eaton <jwe@octave.org> parents: 29930 diff changeset	1073 // Remove when public constructor that uses this function is removed.
4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work John W. Eaton <jwe@octave.org> parents: 29930 diff changeset	1074 octave_base_value *
30022 85d8dfe7e483 fix error in defn of make_range_rep_deprecated introduced in 4c88a452519c John W. Eaton <jwe@octave.org> parents: 30001 diff changeset	1075 octave_value::make_range_rep_deprecated (double base, double inc, double limit)
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1076 {
29954 4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work John W. Eaton <jwe@octave.org> parents: 29930 diff changeset	1077 return dynamic_cast<octave_base_value *>
4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work John W. Eaton <jwe@octave.org> parents: 29930 diff changeset	1078 (new ov_range<double> (octave::range<double> (base, inc, limit)));
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1079 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1080
29954 4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work John W. Eaton <jwe@octave.org> parents: 29930 diff changeset	1081 // Remove when public constructor that uses this function is removed.
4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work John W. Eaton <jwe@octave.org> parents: 29930 diff changeset	1082 octave_base_value *
30022 85d8dfe7e483 fix error in defn of make_range_rep_deprecated introduced in 4c88a452519c John W. Eaton <jwe@octave.org> parents: 30001 diff changeset	1083 octave_value::make_range_rep_deprecated (const Range& r, bool force_range)
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1084 {
28592 e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28588 diff changeset	1085 if (! force_range && ! r.ok ())
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28588 diff changeset	1086 error ("invalid range");
e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28588 diff changeset	1087
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	1088 if (force_range \|\| Voptimize_range)
29954 4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work John W. Eaton <jwe@octave.org> parents: 29930 diff changeset	1089 return make_range_rep_deprecated (r.base (), r.increment (), r.limit ());
28592 e70c859c4bff allow infinite limits on for loop ranges (bug #45143) John W. Eaton <jwe@octave.org> parents: 28588 diff changeset	1090 else
29954 4c88a452519c rename OCTAVE_USE_DEPRECATED_FUNCTIONS macro and attempt to make it work John W. Eaton <jwe@octave.org> parents: 29930 diff changeset	1091 return dynamic_cast<octave_base_value *> (new octave_matrix (r.matrix_value ()));
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1092 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1093
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1094 octave_value::octave_value (const octave::range<char>& r, char type,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1095 bool /force_range/)
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1096 #if 0
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1097 : m_rep (force_range \|\| optimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1098 ? dynamic_cast<octave_base_value *> (new octave_char_range (r, type))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1099 : dynamic_cast<octave_base_value *> (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1100 ? new octave_char_matrix_dq_str (r.array_value ())
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1101 : new octave_char_matrix_sq_str (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1102 #else
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1103 : m_rep (type == '"'
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1104 ? new octave_char_matrix_dq_str (r.array_value ())
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1105 : new octave_char_matrix_sq_str (r.array_value ()))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1106 #endif
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1107 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1108 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1109 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1110
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1111 octave_value::octave_value (const octave::range<float>& r, bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1112 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1113 ? dynamic_cast<octave_base_value *> (new ov_range<float> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1114 : dynamic_cast<octave_base_value *> (new octave_float_matrix (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1115 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1116 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1117 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1118
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	1119 octave_value::octave_value (const octave::range<double>& r, bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1120 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1121 ? dynamic_cast<octave_base_value *> (new ov_range<double> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1122 : dynamic_cast<octave_base_value *> (new octave_matrix (r.array_value ())))
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	1123 {
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	1124 maybe_mutate ();
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	1125 }
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	1126
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1127 octave_value::octave_value (const octave::range<octave_int8>& r,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1128 bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1129 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1130 ? dynamic_cast<octave_base_value *> (new ov_range<octave_int8> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1131 : dynamic_cast<octave_base_value *> (new octave_int8_matrix (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1132 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1133 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1134 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1135
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1136 octave_value::octave_value (const octave::range<octave_int16>& r,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1137 bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1138 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1139 ? dynamic_cast<octave_base_value *> (new ov_range<octave_int16> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1140 : dynamic_cast<octave_base_value *> (new octave_int16_matrix (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1141 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1142 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1143 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1144
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1145 octave_value::octave_value (const octave::range<octave_int32>& r,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1146 bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1147 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1148 ? dynamic_cast<octave_base_value *> (new ov_range<octave_int32> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1149 : dynamic_cast<octave_base_value *> (new octave_int32_matrix (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1150 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1151 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1152 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1153
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1154 octave_value::octave_value (const octave::range<octave_int64>& r,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1155 bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1156 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1157 ? dynamic_cast<octave_base_value *> (new ov_range<octave_int64> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1158 : dynamic_cast<octave_base_value *> (new octave_int64_matrix (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1159 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1160 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1161 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1162
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1163 octave_value::octave_value (const octave::range<octave_uint8>& r,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1164 bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1165 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1166 ? dynamic_cast<octave_base_value *> (new ov_range<octave_uint8> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1167 : dynamic_cast<octave_base_value *> (new octave_uint8_matrix (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1168 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1169 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1170 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1171
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1172 octave_value::octave_value (const octave::range<octave_uint16>& r,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1173 bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1174 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1175 ? dynamic_cast<octave_base_value *> (new ov_range<octave_uint16> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1176 : dynamic_cast<octave_base_value *> (new octave_uint16_matrix (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1177 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1178 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1179 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1180
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1181 octave_value::octave_value (const octave::range<octave_uint32>& r,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1182 bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1183 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1184 ? dynamic_cast<octave_base_value *> (new ov_range<octave_uint32> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1185 : dynamic_cast<octave_base_value *> (new octave_uint32_matrix (r.array_value ())))
28639 7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1186 {
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1187 maybe_mutate ();
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1188 }
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1189
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1190 octave_value::octave_value (const octave::range<octave_uint64>& r,
7ebe185e3818 new octave_value constructors for integer and float ranges. John W. Eaton <jwe@octave.org> parents: 28638 diff changeset	1191 bool force_range)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1192 : m_rep (force_range \|\| Voptimize_range
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1193 ? dynamic_cast<octave_base_value *> (new ov_range<octave_uint64> (r))
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1194 : dynamic_cast<octave_base_value *> (new octave_uint64_matrix (r.array_value ())))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1195 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1196 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1197 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1198
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1199 octave_value::octave_value (const octave_map& m)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1200 : m_rep (new octave_struct (m))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1201 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1202 maybe_mutate ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1203 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1204
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1205 octave_value::octave_value (const octave_scalar_map& m)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1206 : m_rep (new octave_scalar_struct (m))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	1207 { }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1208
23678 dcba41788495 new struct/map constructors John W. Eaton <jwe@octave.org> parents: 23614 diff changeset	1209 octave_value::octave_value (const std::map<std::string, octave_value>& m)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1210 : m_rep (new octave_scalar_struct (m))
23678 dcba41788495 new struct/map constructors John W. Eaton <jwe@octave.org> parents: 23614 diff changeset	1211 { }
dcba41788495 new struct/map constructors John W. Eaton <jwe@octave.org> parents: 23614 diff changeset	1212
18402 4c064d3d2750 Remove Octave_map class deprecated in 3.8. Rik <rik@octave.org> parents: 18306 diff changeset	1213 octave_value::octave_value (const octave_map& m, const std::string& id,
4c064d3d2750 Remove Octave_map class deprecated in 3.8. Rik <rik@octave.org> parents: 18306 diff changeset	1214 const std::list<std::string>& plist)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1215 : m_rep (new octave_class (m, id, plist))
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1216 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1217 maybe_mutate ();
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1218 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1219
18402 4c064d3d2750 Remove Octave_map class deprecated in 3.8. Rik <rik@octave.org> parents: 18306 diff changeset	1220 octave_value::octave_value (const octave_scalar_map& m, const std::string& id,
13294 7dce7e110511 make concatenation of class objects work John W. Eaton <jwe@octave.org> parents: 13101 diff changeset	1221 const std::list<std::string>& plist)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1222 : m_rep (new octave_class (m, id, plist))
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	1223 { }
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1224
23352 778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1225 octave_value::octave_value (const octave_value_list& l)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1226 : m_rep (new octave_cs_list (l))
23352 778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1227 { }
778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1228
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1229 octave_value::octave_value (octave_value::magic_colon)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1230 : m_rep (new octave_magic_colon ())
22417 48c00363dc74 maint: Use '{ }' for empty function bodies in C++. Rik <rik@octave.org> parents: 22390 diff changeset	1231 { }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1232
9728 70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	1233 octave_value::octave_value (octave_base_value *new_rep, bool borrow)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1234 : m_rep (new_rep)
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1235 {
9728 70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	1236 if (borrow)
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	1237 m_rep->count++;
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1238 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1239
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	1240 octave_base_value *
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1241 octave_value::clone (void) const
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1242 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1243 return m_rep->clone ();
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1244 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1245
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1246 void
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1247 octave_value::break_closure_cycles (const std::shared_ptr<octave::stack_frame>& frame)
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1248 {
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1249 if (is_function_handle ())
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1250 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1251 octave_fcn_handle *fhdl = m_rep->fcn_handle_value ();
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1252
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1253 if (fhdl->is_nested (frame) && ! fhdl->is_weak_nested ())
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1254 *this = fhdl->make_weak_nested_handle ();
29477 34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	1255 else if (fhdl->is_anonymous () && ! fhdl->is_weak_anonymous ())
34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	1256 *this = fhdl->make_weak_anonymous_handle ();
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1257 }
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1258 else
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1259 {
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1260 // FIXME: Is there a efficient way to avoid calling make_unique
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1261 // if REP doesn't contain any nested function handles?
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1262 //
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1263 // Probably we should be asking REP to make a modified copy IFF it
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1264 // is needed, then replace our REP with that if a copy is made,
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1265 // otherwise we leave it alone.
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1266
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1267 make_unique ();
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1268
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1269 m_rep->break_closure_cycles (frame);
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1270 }
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1271 }
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1272
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	1273 void
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1274 octave_value::maybe_mutate (void)
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1275 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1276 octave_base_value *tmp = m_rep->try_narrowing_conversion ();
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1277
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1278 if (tmp && tmp != m_rep)
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1279 {
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	1280 if (--m_rep->count == 0)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1281 delete m_rep;
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1282
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1283 m_rep = tmp;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1284 }
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1285 }
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1286
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29954 diff changeset	1287 OCTAVE_NAMESPACE_BEGIN
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29954 diff changeset	1288
22283 564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1289 DEFUN (double, args, ,
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1290 doc: /* -- texinfo --
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1291 @deftypefn {} {} double (@var{x})
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1292 Convert @var{x} to double precision type.
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1293 @seealso{single}
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1294 @end deftypefn */)
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1295 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1296 if (args.length () != 1)
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1297 print_usage ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1298
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1299 return ovl (args(0).as_double ());
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1300 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1301
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1302 /*
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1303 %!assert (class (double (single (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1304 %!assert (class (double (single (1 + i))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1305 %!assert (class (double (int8 (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1306 %!assert (class (double (uint8 (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1307 %!assert (class (double (int16 (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1308 %!assert (class (double (uint16 (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1309 %!assert (class (double (int32 (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1310 %!assert (class (double (uint32 (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1311 %!assert (class (double (int64 (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1312 %!assert (class (double (uint64 (1))), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1313 %!assert (class (double (true)), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1314 %!assert (class (double ("A")), "double")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1315 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1316 %! x = sparse (logical ([1 0; 0 1]));
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1317 %! y = double (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1318 %! assert (class (x), "logical");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1319 %! assert (class (y), "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1320 %! assert (issparse (y));
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1321 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1322 %! x = diag (single ([1 3 2]));
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1323 %! y = double (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1324 %! assert (class (x), "single");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1325 %! assert (class (y), "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1326 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1327 %! x = diag (single ([i 3 2]));
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1328 %! y = double (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1329 %! assert (class (x), "single");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1330 %! assert (class (y), "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1331 */
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1332
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1333 DEFUN (single, args, ,
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1334 doc: /* -- texinfo --
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1335 @deftypefn {} {} single (@var{x})
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1336 Convert @var{x} to single precision type.
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1337 @seealso{double}
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1338 @end deftypefn */)
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1339 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1340 if (args.length () != 1)
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1341 print_usage ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1342
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1343 return args(0).as_single ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1344
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1345 return ovl ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1346 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1347
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1348 /*
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1349 %!assert (class (single (1)), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1350 %!assert (class (single (1 + i)), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1351 %!assert (class (single (int8 (1))), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1352 %!assert (class (single (uint8 (1))), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1353 %!assert (class (single (int16 (1))), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1354 %!assert (class (single (uint16 (1))), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1355 %!assert (class (single (int32 (1))), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1356 %!assert (class (single (uint32 (1))), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1357 %!assert (class (single (int64 (1))), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1358 %!assert (class (single (uint64 (1))), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1359 %!assert (class (single (true)), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1360 %!assert (class (single ("A")), "single")
28930 2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests. Rik <rik@octave.org> parents: 28888 diff changeset	1361 %!error single (sparse (1))
22283 564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1362 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1363 %! x = diag ([1 3 2]);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1364 %! y = single (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1365 %! assert (class (x), "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1366 %! assert (class (y), "single");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1367 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1368 %! x = diag ([i 3 2]);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1369 %! y = single (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1370 %! assert (class (x), "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1371 %! assert (class (y), "single");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1372 */
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1373
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1374 DEFUN (int8, args, ,
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1375 doc: /* -- texinfo --
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1376 @deftypefn {} {} int8 (@var{x})
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1377 Convert @var{x} to 8-bit integer type.
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1378 @seealso{uint8, int16, uint16, int32, uint32, int64, uint64}
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1379 @end deftypefn */)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1380 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1381 if (args.length () != 1)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1382 print_usage ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1383
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1384 return args(0).as_int8 ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1385 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1386
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1387 /*
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1388 %!assert (class (int8 (1)), "int8")
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1389 %!assert (int8 (1.25), int8 (1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1390 %!assert (int8 (1.5), int8 (2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1391 %!assert (int8 (-1.5), int8 (-2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1392 %!assert (int8 (2^9), int8 (2^8-1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1393 %!assert (int8 (-2^9), int8 (-2^8))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1394 */
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1395
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1396 DEFUN (int16, args, ,
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1397 doc: /* -- texinfo --
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1398 @deftypefn {} {} int16 (@var{x})
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1399 Convert @var{x} to 16-bit integer type.
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1400 @seealso{int8, uint8, uint16, int32, uint32, int64, uint64}
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1401 @end deftypefn */)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1402 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1403 if (args.length () != 1)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1404 print_usage ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1405
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1406 return args(0).as_int16 ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1407 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1408
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1409 /*
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1410 %!assert (class (int16 (1)), "int16")
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1411 %!assert (int16 (1.25), int16 (1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1412 %!assert (int16 (1.5), int16 (2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1413 %!assert (int16 (-1.5), int16 (-2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1414 %!assert (int16 (2^17), int16 (2^16-1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1415 %!assert (int16 (-2^17), int16 (-2^16))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1416 */
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1417
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1418 DEFUN (int32, args, ,
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1419 doc: /* -- texinfo --
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1420 @deftypefn {} {} int32 (@var{x})
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1421 Convert @var{x} to 32-bit integer type.
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1422 @seealso{int8, uint8, int16, uint16, uint32, int64, uint64}
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1423 @end deftypefn */)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1424 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1425 if (args.length () != 1)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1426 print_usage ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1427
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1428 return args(0).as_int32 ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1429 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1430
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1431 /*
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1432 %!assert (class (int32 (1)), "int32")
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1433 %!assert (int32 (1.25), int32 (1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1434 %!assert (int32 (1.5), int32 (2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1435 %!assert (int32 (-1.5), int32 (-2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1436 %!assert (int32 (2^33), int32 (2^32-1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1437 %!assert (int32 (-2^33), int32 (-2^32))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1438 */
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1439
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1440 DEFUN (int64, args, ,
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1441 doc: /* -- texinfo --
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1442 @deftypefn {} {} int64 (@var{x})
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1443 Convert @var{x} to 64-bit integer type.
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1444 @seealso{int8, uint8, int16, uint16, int32, uint32, uint64}
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1445 @end deftypefn */)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1446 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1447 if (args.length () != 1)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1448 print_usage ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1449
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1450 return args(0).as_int64 ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1451 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1452
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1453 /*
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1454 %!assert (class (int64 (1)), "int64")
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1455 %!assert (int64 (1.25), int64 (1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1456 %!assert (int64 (1.5), int64 (2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1457 %!assert (int64 (-1.5), int64 (-2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1458 %!assert (int64 (2^65), int64 (2^64-1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1459 %!assert (int64 (-2^65), int64 (-2^64))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1460 */
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1461
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1462 DEFUN (uint8, args, ,
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1463 doc: /* -- texinfo --
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1464 @deftypefn {} {} uint8 (@var{x})
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1465 Convert @var{x} to unsigned 8-bit integer type.
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1466 @seealso{int8, int16, uint16, int32, uint32, int64, uint64}
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1467 @end deftypefn */)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1468 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1469 if (args.length () != 1)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1470 print_usage ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1471
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1472 return args(0).as_uint8 ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1473 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1474
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1475 /*
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1476 %!assert (class (uint8 (1)), "uint8")
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1477 %!assert (uint8 (1.25), uint8 (1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1478 %!assert (uint8 (1.5), uint8 (2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1479 %!assert (uint8 (-1.5), uint8 (0))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1480 %!assert (uint8 (2^9), uint8 (2^8-1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1481 %!assert (uint8 (-2^9), uint8 (0))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1482 */
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1483
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1484 DEFUN (uint16, args, ,
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1485 doc: /* -- texinfo --
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1486 @deftypefn {} {} uint16 (@var{x})
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1487 Convert @var{x} to unsigned 16-bit integer type.
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1488 @seealso{int8, uint8, int16, int32, uint32, int64, uint64}
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1489 @end deftypefn */)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1490 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1491 if (args.length () != 1)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1492 print_usage ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1493
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1494 return args(0).as_uint16 ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1495 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1496
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1497 /*
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1498 %!assert (class (uint16 (1)), "uint16")
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1499 %!assert (uint16 (1.25), uint16 (1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1500 %!assert (uint16 (1.5), uint16 (2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1501 %!assert (uint16 (-1.5), uint16 (0))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1502 %!assert (uint16 (2^17), uint16 (2^16-1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1503 %!assert (uint16 (-2^17), uint16 (0))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1504 */
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1505
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1506 DEFUN (uint32, args, ,
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1507 doc: /* -- texinfo --
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1508 @deftypefn {} {} uint32 (@var{x})
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1509 Convert @var{x} to unsigned 32-bit integer type.
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1510 @seealso{int8, uint8, int16, uint16, int32, int64, uint64}
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1511 @end deftypefn */)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1512 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1513 if (args.length () != 1)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1514 print_usage ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1515
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1516 return args(0).as_uint32 ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1517 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1518
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1519 /*
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1520 %!assert (class (uint32 (1)), "uint32")
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1521 %!assert (uint32 (1.25), uint32 (1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1522 %!assert (uint32 (1.5), uint32 (2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1523 %!assert (uint32 (-1.5), uint32 (0))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1524 %!assert (uint32 (2^33), uint32 (2^32-1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1525 %!assert (uint32 (-2^33), uint32 (0))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1526 */
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1527
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1528 DEFUN (uint64, args, ,
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1529 doc: /* -- texinfo --
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1530 @deftypefn {} {} uint64 (@var{x})
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1531 Convert @var{x} to unsigned 64-bit integer type.
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1532 @seealso{int8, uint8, int16, uint16, int32, uint32, int64}
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1533 @end deftypefn */)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1534 {
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1535 if (args.length () != 1)
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1536 print_usage ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1537
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1538 return args(0).as_uint64 ();
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1539 }
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1540
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1541 /*
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1542 %!assert (class (uint64 (1)), "uint64")
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1543 %!assert (uint64 (1.25), uint64 (1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1544 %!assert (uint64 (1.5), uint64 (2))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1545 %!assert (uint64 (-1.5), uint64 (0))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1546 %!assert (uint64 (2^65), uint64 (2^64-1))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1547 %!assert (uint64 (-2^65), uint64 (0))
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1548 */
8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1549
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29954 diff changeset	1550 OCTAVE_NAMESPACE_END
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29954 diff changeset	1551
22296 8b18f46f6427 revamp double, single, int type conversions John W. Eaton <jwe@octave.org> parents: 22283 diff changeset	1552 octave_value
4271 be631c1720ea [project @ 2003-01-03 19:36:04 by jwe] jwe parents: 4257 diff changeset	1553 octave_value::single_subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1554 const octave_value_list& idx)
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1555 {
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1556 std::list<octave_value_list> i;
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1557
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1558 i.push_back (idx);
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1559
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1560 return m_rep->subsref (type, i);
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1561 }
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1562
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	1563 octave_value_list
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1564 octave_value::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1565 const std::list<octave_value_list>& idx, int nargout)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1566 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1567 return m_rep->subsref (type, idx, nargout);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1568 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1569
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1570 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1571 octave_value::next_subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1572 const std::list<octave_value_list>& idx,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1573 std::size_t skip)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1574 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1575 if (idx.size () > skip)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1576 {
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4192 diff changeset	1577 std::list<octave_value_list> new_idx (idx);
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1578 for (std::size_t i = 0; i < skip; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1579 new_idx.erase (new_idx.begin ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1580 return subsref (type.substr (skip), new_idx);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1581 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1582 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1583 return *this;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1584 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1585
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1586 octave_value_list
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1587 octave_value::next_subsref (int nargout, const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1588 const std::list<octave_value_list>& idx,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1589 std::size_t skip)
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1590 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1591 if (idx.size () > skip)
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1592 {
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1593 std::list<octave_value_list> new_idx (idx);
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1594 for (std::size_t i = 0; i < skip; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1595 new_idx.erase (new_idx.begin ());
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1596 return subsref (type.substr (skip), new_idx, nargout);
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1597 }
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1598 else
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1599 return *this;
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1600 }
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1601
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1602 octave_value
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1603 octave_value::next_subsref (bool auto_add, const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1604 const std::list<octave_value_list>& idx,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1605 std::size_t skip)
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1606 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1607 if (idx.size () > skip)
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1608 {
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1609 std::list<octave_value_list> new_idx (idx);
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1610 for (std::size_t i = 0; i < skip; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1611 new_idx.erase (new_idx.begin ());
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1612 return subsref (type.substr (skip), new_idx, auto_add);
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1613 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1614 else
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1615 return *this;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1616 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1617
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1618 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1619 octave_value::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1620 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1621 const octave_value& rhs)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1622 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1623 return m_rep->subsasgn (type, idx, rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1624 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1625
12171 d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1626 octave_value
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1627 octave_value::undef_subsasgn (const std::string& type,
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1628 const std::list<octave_value_list>& idx,
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1629 const octave_value& rhs)
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1630 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1631 return m_rep->undef_subsasgn (type, idx, rhs);
12171 d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1632 }
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1633
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1634 octave_value&
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1635 octave_value::assign (assign_op op, const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1636 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1637 const octave_value& rhs)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1638 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1639 make_unique ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1640
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1641 octave_value t_rhs = rhs;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1642
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1643 if (op != op_asn_eq)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1644 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1645 if (! is_defined ())
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1646 error ("in computed assignment A(index) OP= X, A must be defined first");
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1647
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1648 octave_value t = subsref (type, idx);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1649
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1650 binary_op binop = op_eq_to_binary_op (op);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1651
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	1652 t_rhs = octave::binary_op (binop, t, rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1653 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1654
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	1655 *this = subsasgn (type, idx, t_rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1656
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1657 return *this;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1658 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1659
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1660 octave_value&
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	1661 octave_value::assign (assign_op op, const octave_value& rhs)
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1662 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	1663 if (op == op_asn_eq)
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	1664 // Regularize a null matrix if stored into a variable.
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	1665 operator = (rhs.storable_value ());
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1666 else if (is_defined ())
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	1667 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1668 octave::type_info::assign_op_fcn f = nullptr;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1669
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1670 // Only attempt to operate in-place if this variable is unshared.
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	1671 if (m_rep->count == 1)
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1672 {
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1673 int tthis = this->type_id ();
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1674 int trhs = rhs.type_id ();
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1675
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1676 octave::type_info& ti
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1677 = octave::__get_type_info__ ("octave_value::assign");
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1678
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	1679 f = ti.lookup_assign_op (op, tthis, trhs);
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1680 }
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1681
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1682 if (f)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1683 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1684 f (*m_rep, octave_value_list (), rhs.get_rep ());
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	1685 // Usually unnecessary, but may be needed (complex arrays).
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	1686 maybe_mutate ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1687 }
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1688 else
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1689 {
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1690
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1691 binary_op binop = op_eq_to_binary_op (op);
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1692
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	1693 octave_value t = octave::binary_op (binop, *this, rhs);
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1694
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1695 operator = (t);
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1696 }
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	1697 }
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1698 else
9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1699 error ("in computed assignment A OP= X, A must be defined first");
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	1700
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1701 return *this;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1702 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1703
26078 0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1704 // FIXME: This is a bit of a kluge. We'd like to just use val.dims()
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1705 // and if val is an object, expect that dims will call size if it is
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1706 // overloaded by a user-defined method. But there are currently some
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1707 // unresolved const issues that prevent that solution from working.
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1708
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1709 std::string
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1710 octave_value::get_dims_str (void) const
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1711 {
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1712 octave_value tmp = *this;
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1713
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1714 Matrix sz = tmp.size ();
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1715
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1716 dim_vector dv = dim_vector::alloc (sz.numel ());
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1717
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1718 for (octave_idx_type i = 0; i < dv.ndims (); i++)
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1719 dv(i) = sz(i);
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1720
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1721 return dv.str ();
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1722 }
0549d088f50e move get_dims_str from variables.cc to octave_value class John W. Eaton <jwe@octave.org> parents: 25927 diff changeset	1723
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	1724 octave_idx_type
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1725 octave_value::length (void) const
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1726 {
10654 984b8b6bee02 simplify octave_value::length Jaroslav Hajek <highegg@gmail.com> parents: 10614 diff changeset	1727 octave_idx_type retval = 0;
984b8b6bee02 simplify octave_value::length Jaroslav Hajek <highegg@gmail.com> parents: 10614 diff changeset	1728
984b8b6bee02 simplify octave_value::length Jaroslav Hajek <highegg@gmail.com> parents: 10614 diff changeset	1729 const dim_vector dv = dims ();
4584 f7697d703481 [project @ 2003-10-31 19:47:35 by jwe] jwe parents: 4582 diff changeset	1730
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	1731 for (int i = 0; i < dv.ndims (); i++)
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1732 {
4584 f7697d703481 [project @ 2003-10-31 19:47:35 by jwe] jwe parents: 4582 diff changeset	1733 if (dv(i) == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1734 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1735 retval = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1736 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1737 }
4584 f7697d703481 [project @ 2003-10-31 19:47:35 by jwe] jwe parents: 4582 diff changeset	1738
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1739 if (dv(i) > retval)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1740 retval = dv(i);
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1741 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1742
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1743 return retval;
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1744 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1745
8346 8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1746 bool
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1747 octave_value::is_equal (const octave_value& test) const
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1748 {
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1749 bool retval = false;
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1750
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1751 // If there is no op_eq for these types, we can't compare values.
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1752
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1753 if (rows () == test.rows () && columns () == test.columns ())
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1754 {
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	1755 octave_value tmp = octave::binary_op (octave_value::op_eq, *this, test);
8346 8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1756
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1757 // Empty array also means a match.
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1758 if (tmp.is_defined ())
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1759 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	1760 if (tmp.isempty ())
21990 efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1761 retval = true;
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1762 else
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1763 {
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1764 // Reshape into a vector and call all() explicitly,
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1765 // to avoid Octave:array-as-logical warning.
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1766 tmp = tmp.reshape (dim_vector (tmp.numel (), 1));
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1767 retval = tmp.all ().is_true ();
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1768 }
efce657ceb86 Provide a warning when an array is used in an if/while/until (bug #43098). Lachlan Andrew <lachlanbis@gmail.com> parents: 21966 diff changeset	1769 }
8346 8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1770 }
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1771
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1772 return retval;
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1773 }
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1774
8017 260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1775 // Define the idx_type_value function here instead of in ov.h to avoid
260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1776 // needing definitions for the SIZEOF_X macros in ov.h.
260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1777
260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1778 octave_idx_type
8024 dc36eb214129 ov.cc (octave_value::idx_type_value): don't include default argument value in definition John W. Eaton <jwe@octave.org> parents: 8017 diff changeset	1779 octave_value::idx_type_value (bool req_int, bool frc_str_conv) const
8017 260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1780 {
21229 a83e7a384ee0 create and install a subset of config.h in octave-config.h John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1781 #if defined (OCTAVE_ENABLE_64)
16323 e769440b39db provide int64 extractors for octave_value class John W. Eaton <jwe@octave.org> parents: 16091 diff changeset	1782 return int64_value (req_int, frc_str_conv);
e769440b39db provide int64 extractors for octave_value class John W. Eaton <jwe@octave.org> parents: 16091 diff changeset	1783 #else
8017 260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1784 return int_value (req_int, frc_str_conv);
260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1785 #endif
260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1786 }
260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1787
20703 85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1788 Cell
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1789 octave_value::cell_value (void) const
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1790 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1791 return m_rep->cell_value ();
20703 85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1792 }
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1793
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1794 octave_map
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1795 octave_value::map_value (void) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1796 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1797 return m_rep->map_value ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1798 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1799
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1800 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1801 octave_value::scalar_map_value (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1802 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1803 return m_rep->scalar_map_value ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1804 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1805
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	1806 octave_function *
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1807 octave_value::function_value (bool silent) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1808 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1809 return m_rep->function_value (silent);
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1810 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1811
23881 5aec653c88e7 new function for accessing classdef objects John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	1812 octave_classdef *
5aec653c88e7 new function for accessing classdef objects John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	1813 octave_value::classdef_object_value (bool silent) const
5aec653c88e7 new function for accessing classdef objects John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	1814 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1815 return m_rep->classdef_object_value (silent);
23881 5aec653c88e7 new function for accessing classdef objects John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	1816 }
5aec653c88e7 new function for accessing classdef objects John W. Eaton <jwe@octave.org> parents: 23807 diff changeset	1817
4700 ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1818 octave_user_function *
10075 84b0725f4b09 return class types by reference in const Array element access functions Jaroslav Hajek <highegg@gmail.com> parents: 10033 diff changeset	1819 octave_value::user_function_value (bool silent) const
4700 ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1820 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1821 return m_rep->user_function_value (silent);
4700 ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1822 }
ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1823
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	1824 octave_user_script *
10075 84b0725f4b09 return class types by reference in const Array element access functions Jaroslav Hajek <highegg@gmail.com> parents: 10033 diff changeset	1825 octave_value::user_script_value (bool silent) const
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	1826 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1827 return m_rep->user_script_value (silent);
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	1828 }
87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	1829
87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	1830 octave_user_code *
10075 84b0725f4b09 return class types by reference in const Array element access functions Jaroslav Hajek <highegg@gmail.com> parents: 10033 diff changeset	1831 octave_value::user_code_value (bool silent) const
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	1832 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1833 return m_rep->user_code_value (silent);
7719 87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	1834 }
87eda1f8faaa octave_user_code: new base class for octave_user_script and octave_user_function John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	1835
4346 d39de791ef9c [project @ 2003-02-20 21:38:39 by jwe] jwe parents: 4343 diff changeset	1836 octave_fcn_handle *
10075 84b0725f4b09 return class types by reference in const Array element access functions Jaroslav Hajek <highegg@gmail.com> parents: 10033 diff changeset	1837 octave_value::fcn_handle_value (bool silent) const
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: 4342 diff changeset	1838 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1839 return m_rep->fcn_handle_value (silent);
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: 4342 diff changeset	1840 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: 4342 diff changeset	1841
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1842 octave_value_list
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1843 octave_value::list_value (void) const
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1844 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	1845 return m_rep->list_value ();
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1846 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1847
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1848 static dim_vector
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1849 make_vector_dims (const dim_vector& dv, bool force_vector_conversion,
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1850 const std::string& my_type, const std::string& wanted_type)
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1851 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1852 dim_vector retval (dv);
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1853 retval.chop_trailing_singletons ();
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1854 octave_idx_type nel = dv.numel ();
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1855
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	1856 if (retval.ndims () > 2 \|\| (retval(0) != 1 && retval(1) != 1))
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1857 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	1858 if (! force_vector_conversion)
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21078 diff changeset	1859 warn_implicit_conversion ("Octave:array-to-vector",
e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21078 diff changeset	1860 my_type.c_str (), wanted_type.c_str ());
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10325 diff changeset	1861 retval = dim_vector (nel, 1);
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1862 }
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1863
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1864 return retval;
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1865 }
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1866
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1867 ColumnVector
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1868 octave_value::column_vector_value (bool force_string_conv,
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1869 bool frc_vec_conv) const
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1870 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1871 return ColumnVector (vector_value (force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1872 frc_vec_conv));
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1873 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1874
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1875 ComplexColumnVector
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1876 octave_value::complex_column_vector_value (bool force_string_conv,
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1877 bool frc_vec_conv) const
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1878 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1879 return ComplexColumnVector (complex_vector_value (force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1880 frc_vec_conv));
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1881 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1882
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1883 RowVector
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1884 octave_value::row_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1885 bool frc_vec_conv) const
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1886 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1887 return RowVector (vector_value (force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1888 frc_vec_conv));
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1889 }
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1890
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1891 ComplexRowVector
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1892 octave_value::complex_row_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1893 bool frc_vec_conv) const
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1894 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1895 return ComplexRowVector (complex_vector_value (force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1896 frc_vec_conv));
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1897 }
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1898
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1899 Array<double>
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1900 octave_value::vector_value (bool force_string_conv,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1901 bool force_vector_conversion) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1902 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1903 Array<double> retval = array_value (force_string_conv);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1904
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1905 return retval.reshape (make_vector_dims (retval.dims (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1906 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1907 type_name (), "real vector"));
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1908 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1909
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	1910 template <typename T>
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1911 static Array<int>
23534 b6498c088fca maint: Don't write '> >' for declaration of templates that use templates. Rik <rik@octave.org> parents: 23502 diff changeset	1912 convert_to_int_array (const Array<octave_int<T>>& A)
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1913 {
7999 f7f2d867c523 style fixes John W. Eaton <jwe@octave.org> parents: 7997 diff changeset	1914 Array<int> retval (A.dims ());
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1915 octave_idx_type n = A.numel ();
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1916
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1917 for (octave_idx_type i = 0; i < n; i++)
7999 f7f2d867c523 style fixes John W. Eaton <jwe@octave.org> parents: 7997 diff changeset	1918 retval.xelem (i) = octave_int<int> (A.xelem (i));
8039 cd90e2842080 Add additional integer math and conversion warnings, set their default state to be off and add the intwarning function David Bateman <dbateman@free.fr> parents: 8024 diff changeset	1919
7999 f7f2d867c523 style fixes John W. Eaton <jwe@octave.org> parents: 7997 diff changeset	1920 return retval;
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1921 }
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1922
4044 9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1923 Array<int>
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1924 octave_value::int_vector_value (bool require_int, bool force_string_conv,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1925 bool force_vector_conversion) const
4044 9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1926 {
9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1927 Array<int> retval;
9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1928
23580 2230f9e10fb3 maint: Deprecate is_integer_type and replace with isinteger. Rik <rik@octave.org> parents: 23577 diff changeset	1929 if (isinteger ())
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1930 {
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1931 if (is_int32_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1932 retval = convert_to_int_array (int32_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1933 else if (is_int64_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1934 retval = convert_to_int_array (int64_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1935 else if (is_int16_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1936 retval = convert_to_int_array (int16_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1937 else if (is_int8_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1938 retval = convert_to_int_array (int8_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1939 else if (is_uint32_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1940 retval = convert_to_int_array (uint32_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1941 else if (is_uint64_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1942 retval = convert_to_int_array (uint64_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1943 else if (is_uint16_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1944 retval = convert_to_int_array (uint16_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1945 else if (is_uint8_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1946 retval = convert_to_int_array (uint8_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1947 else
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1948 retval = array_value (force_string_conv);
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1949 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1950 else
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1951 {
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1952 const NDArray a = array_value (force_string_conv);
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1953
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1954 if (require_int)
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1955 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1956 retval.resize (a.dims ());
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1957 for (octave_idx_type i = 0; i < a.numel (); i++)
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1958 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1959 double ai = a.elem (i);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1960 int v = static_cast<int> (ai);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1961 if (ai == v)
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1962 retval.xelem (i) = v;
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1963 else
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1964 {
25927 d6581134daaa Emit an error when utility matrices (zeros, ones, rand, etc.) are given a fractional dimension in a dimension vector (bug #54781). Rik <rik@octave.org> parents: 25054 diff changeset	1965 error_with_cfn ("conversion of %g to int value failed", ai);
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1966 break;
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1967 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1968 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1969 }
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1970 else
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1971 retval = Array<int> (a);
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1972 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1973
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1974 return retval.reshape (make_vector_dims (retval.dims (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1975 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1976 type_name (), "integer vector"));
4044 9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1977 }
9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1978
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	1979 template <typename T>
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1980 static Array<octave_idx_type>
23534 b6498c088fca maint: Don't write '> >' for declaration of templates that use templates. Rik <rik@octave.org> parents: 23502 diff changeset	1981 convert_to_octave_idx_type_array (const Array<octave_int<T>>& A)
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1982 {
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1983 Array<octave_idx_type> retval (A.dims ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1984 octave_idx_type n = A.numel ();
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1985
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1986 for (octave_idx_type i = 0; i < n; i++)
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1987 retval.xelem (i) = octave_int<octave_idx_type> (A.xelem (i));
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1988
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1989 return retval;
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1990 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1991
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1992 Array<octave_idx_type>
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1993 octave_value::octave_idx_type_vector_value (bool require_int,
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1994 bool force_string_conv,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1995 bool force_vector_conversion) const
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1996 {
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1997 Array<octave_idx_type> retval;
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1998
23580 2230f9e10fb3 maint: Deprecate is_integer_type and replace with isinteger. Rik <rik@octave.org> parents: 23577 diff changeset	1999 if (isinteger ())
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2000 {
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2001 if (is_int32_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2002 retval = convert_to_octave_idx_type_array (int32_array_value ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2003 else if (is_int64_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2004 retval = convert_to_octave_idx_type_array (int64_array_value ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2005 else if (is_int16_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2006 retval = convert_to_octave_idx_type_array (int16_array_value ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2007 else if (is_int8_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2008 retval = convert_to_octave_idx_type_array (int8_array_value ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2009 else if (is_uint32_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2010 retval = convert_to_octave_idx_type_array (uint32_array_value ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2011 else if (is_uint64_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2012 retval = convert_to_octave_idx_type_array (uint64_array_value ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2013 else if (is_uint16_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2014 retval = convert_to_octave_idx_type_array (uint16_array_value ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2015 else if (is_uint8_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2016 retval = convert_to_octave_idx_type_array (uint8_array_value ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2017 else
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2018 retval = array_value (force_string_conv);
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2019 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2020 else
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2021 {
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2022 const NDArray a = array_value (force_string_conv);
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2023
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2024 if (require_int)
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2025 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2026 retval.resize (a.dims ());
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2027 for (octave_idx_type i = 0; i < a.numel (); i++)
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2028 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2029 double ai = a.elem (i);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2030 octave_idx_type v = static_cast<octave_idx_type> (ai);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2031 if (ai == v)
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2032 retval.xelem (i) = v;
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2033 else
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2034 {
25927 d6581134daaa Emit an error when utility matrices (zeros, ones, rand, etc.) are given a fractional dimension in a dimension vector (bug #54781). Rik <rik@octave.org> parents: 25054 diff changeset	2035 error_with_cfn ("conversion of %g to octave_idx_type value failed", ai);
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2036 break;
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2037 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2038 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2039 }
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2040 else
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2041 retval = Array<octave_idx_type> (a);
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2042 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2043
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2044 return retval.reshape (make_vector_dims (retval.dims (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2045 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2046 type_name (), "integer vector"));
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2047 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	2048
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	2049 Array<Complex>
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2050 octave_value::complex_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2051 bool force_vector_conversion) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2052 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2053 Array<Complex> retval = complex_array_value (force_string_conv);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2054
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2055 return retval.reshape (make_vector_dims (retval.dims (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2056 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2057 type_name (), "complex vector"));
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2058 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2059
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2060 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2061 octave_value::float_column_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2062 bool frc_vec_conv) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2063 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2064 return FloatColumnVector (float_vector_value (force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2065 frc_vec_conv));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2066 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2067
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2068 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2069 octave_value::float_complex_column_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2070 bool frc_vec_conv) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2071 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2072 return
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2073 FloatComplexColumnVector (float_complex_vector_value (force_string_conv,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2074 frc_vec_conv));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2075 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2076
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2077 FloatRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2078 octave_value::float_row_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2079 bool frc_vec_conv) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2080 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2081 return FloatRowVector (float_vector_value (force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2082 frc_vec_conv));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2083 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2084
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2085 FloatComplexRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2086 octave_value::float_complex_row_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2087 bool frc_vec_conv) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2088 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2089 return FloatComplexRowVector (float_complex_vector_value (force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2090 frc_vec_conv));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2091 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2092
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2093 Array<float>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2094 octave_value::float_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2095 bool force_vector_conversion) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2096 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2097 Array<float> retval = float_array_value (force_string_conv);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2098
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2099 return retval.reshape (make_vector_dims (retval.dims (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2100 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2101 type_name (), "real vector"));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2102 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2103
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2104 Array<FloatComplex>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2105 octave_value::float_complex_vector_value (bool force_string_conv,
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2106 bool force_vector_conversion) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2107 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	2108 Array<FloatComplex> retval = float_complex_array_value (force_string_conv);
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2109
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2110 return retval.reshape (make_vector_dims (retval.dims (),
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2111 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	2112 type_name (), "complex vector"));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2113 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2114
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2115 // NAME can't always be "x ## FCN" because some of the original
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2116 // value extraction functions perform implicit type conversions that we
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2117 // wish to avoid for these functions.
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2118
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2119 #define XVALUE_EXTRACTOR(TYPE, NAME, FCN) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2120 TYPE \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2121 octave_value::NAME (const char *fmt, ...) const \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2122 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2123 TYPE retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2124 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2125 try \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2126 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2127 retval = FCN (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2128 } \
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28975 diff changeset	2129 catch (octave::execution_exception& ee) \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2130 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2131 if (fmt) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2132 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2133 va_list args; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2134 va_start (args, fmt); \
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28975 diff changeset	2135 verror (ee, fmt, args); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2136 va_end (args); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2137 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2138 \
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28975 diff changeset	2139 throw ee; \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2140 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2141 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	2142 return retval; \
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2143 }
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2144
20703 85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2145 XVALUE_EXTRACTOR (short int, xshort_value, short_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2146
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2147 XVALUE_EXTRACTOR (unsigned short int, xushort_value, ushort_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2148
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2149 XVALUE_EXTRACTOR (int, xint_value, int_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2150
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2151 XVALUE_EXTRACTOR (unsigned int, xuint_value, uint_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2152
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2153 XVALUE_EXTRACTOR (int, xnint_value, nint_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2154
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2155 XVALUE_EXTRACTOR (long int, xlong_value, long_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2156
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2157 XVALUE_EXTRACTOR (unsigned long int, xulong_value, ulong_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2158
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2159 XVALUE_EXTRACTOR (int64_t, xint64_value, int64_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2160
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2161 XVALUE_EXTRACTOR (uint64_t, xuint64_value, uint64_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2162
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2163 XVALUE_EXTRACTOR (octave_idx_type, xidx_type_value, idx_type_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2164
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2165 XVALUE_EXTRACTOR (double, xdouble_value, double_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2166 XVALUE_EXTRACTOR (float, xfloat_value, float_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2167
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2168 XVALUE_EXTRACTOR (double, xscalar_value, scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2169 XVALUE_EXTRACTOR (float, xfloat_scalar_value, float_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2170
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2171 XVALUE_EXTRACTOR (Matrix, xmatrix_value, matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2172 XVALUE_EXTRACTOR (FloatMatrix, xfloat_matrix_value, float_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2173
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2174 XVALUE_EXTRACTOR (NDArray, xarray_value, array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2175 XVALUE_EXTRACTOR (FloatNDArray, xfloat_array_value, float_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2176
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2177 XVALUE_EXTRACTOR (Complex, xcomplex_value, complex_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2178 XVALUE_EXTRACTOR (FloatComplex, xfloat_complex_value, float_complex_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2179
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2180 XVALUE_EXTRACTOR (ComplexMatrix, xcomplex_matrix_value, complex_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2181 XVALUE_EXTRACTOR (FloatComplexMatrix, xfloat_complex_matrix_value, float_complex_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2182
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2183 XVALUE_EXTRACTOR (ComplexNDArray, xcomplex_array_value, complex_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2184 XVALUE_EXTRACTOR (FloatComplexNDArray, xfloat_complex_array_value, float_complex_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2185
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2186 XVALUE_EXTRACTOR (bool, xbool_value, bool_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2187 XVALUE_EXTRACTOR (boolMatrix, xbool_matrix_value, bool_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2188 XVALUE_EXTRACTOR (boolNDArray, xbool_array_value, bool_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2189
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2190 XVALUE_EXTRACTOR (charMatrix, xchar_matrix_value, char_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2191 XVALUE_EXTRACTOR (charNDArray, xchar_array_value, char_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2192
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2193 XVALUE_EXTRACTOR (SparseMatrix, xsparse_matrix_value, sparse_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2194 XVALUE_EXTRACTOR (SparseComplexMatrix, xsparse_complex_matrix_value, sparse_complex_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2195 XVALUE_EXTRACTOR (SparseBoolMatrix, xsparse_bool_matrix_value, sparse_bool_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2196
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2197 XVALUE_EXTRACTOR (DiagMatrix, xdiag_matrix_value, diag_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2198 XVALUE_EXTRACTOR (FloatDiagMatrix, xfloat_diag_matrix_value, float_diag_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2199 XVALUE_EXTRACTOR (ComplexDiagMatrix, xcomplex_diag_matrix_value, complex_diag_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2200 XVALUE_EXTRACTOR (FloatComplexDiagMatrix, xfloat_complex_diag_matrix_value, float_complex_diag_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2201
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2202 XVALUE_EXTRACTOR (PermMatrix, xperm_matrix_value, perm_matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2203
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2204 XVALUE_EXTRACTOR (octave_int8, xint8_scalar_value, int8_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2205 XVALUE_EXTRACTOR (octave_int16, xint16_scalar_value, int16_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2206 XVALUE_EXTRACTOR (octave_int32, xint32_scalar_value, int32_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2207 XVALUE_EXTRACTOR (octave_int64, xint64_scalar_value, int64_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2208
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2209 XVALUE_EXTRACTOR (octave_uint8, xuint8_scalar_value, uint8_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2210 XVALUE_EXTRACTOR (octave_uint16, xuint16_scalar_value, uint16_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2211 XVALUE_EXTRACTOR (octave_uint32, xuint32_scalar_value, uint32_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2212 XVALUE_EXTRACTOR (octave_uint64, xuint64_scalar_value, uint64_scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2213
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2214 XVALUE_EXTRACTOR (int8NDArray, xint8_array_value, int8_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2215 XVALUE_EXTRACTOR (int16NDArray, xint16_array_value, int16_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2216 XVALUE_EXTRACTOR (int32NDArray, xint32_array_value, int32_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2217 XVALUE_EXTRACTOR (int64NDArray, xint64_array_value, int64_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2218
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2219 XVALUE_EXTRACTOR (uint8NDArray, xuint8_array_value, uint8_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2220 XVALUE_EXTRACTOR (uint16NDArray, xuint16_array_value, uint16_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2221 XVALUE_EXTRACTOR (uint32NDArray, xuint32_array_value, uint32_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2222 XVALUE_EXTRACTOR (uint64NDArray, xuint64_array_value, uint64_array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2223
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2224 XVALUE_EXTRACTOR (std::string, xstring_value, m_rep->xstring_value)
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20978 diff changeset	2225 XVALUE_EXTRACTOR (string_vector, xstring_vector_value, string_vector_value)
20703 85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2226
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2227 XVALUE_EXTRACTOR (Cell, xcell_value, cell_value)
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2228 XVALUE_EXTRACTOR (Array<std::string>, xcellstr_value, cellstr_value)
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2229
28646 e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2230 XVALUE_EXTRACTOR (octave::range<float>, xfloat_range_value, float_range_value)
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	2231 XVALUE_EXTRACTOR (octave::range<double>, xrange_value, range_value)
28646 e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2232 XVALUE_EXTRACTOR (octave::range<octave_int8>, xint8_range_value, int8_range_value)
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2233 XVALUE_EXTRACTOR (octave::range<octave_int16>, xint16_range_value, int16_range_value)
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2234 XVALUE_EXTRACTOR (octave::range<octave_int32>, xint32_range_value, int32_range_value)
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2235 XVALUE_EXTRACTOR (octave::range<octave_int64>, xint64_range_value, int64_range_value)
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2236 XVALUE_EXTRACTOR (octave::range<octave_uint8>, xuint8_range_value, uint8_range_value)
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2237 XVALUE_EXTRACTOR (octave::range<octave_uint16>, xuint16_range_value, uint16_range_value)
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2238 XVALUE_EXTRACTOR (octave::range<octave_uint32>, xuint32_range_value, uint32_range_value)
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	2239 XVALUE_EXTRACTOR (octave::range<octave_uint64>, xuint64_range_value, uint64_range_value)
20703 85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2240
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2241 XVALUE_EXTRACTOR (octave_map, xmap_value, map_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2242 XVALUE_EXTRACTOR (octave_scalar_map, xscalar_map_value, scalar_map_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2243
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2244 XVALUE_EXTRACTOR (ColumnVector, xcolumn_vector_value, column_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2245 XVALUE_EXTRACTOR (ComplexColumnVector, xcomplex_column_vector_value, complex_column_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2246
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2247 XVALUE_EXTRACTOR (RowVector, xrow_vector_value, row_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2248 XVALUE_EXTRACTOR (ComplexRowVector, xcomplex_row_vector_value, complex_row_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2249
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2250 XVALUE_EXTRACTOR (FloatColumnVector, xfloat_column_vector_value, float_column_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2251 XVALUE_EXTRACTOR (FloatComplexColumnVector, xfloat_complex_column_vector_value, float_complex_column_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2252
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2253 XVALUE_EXTRACTOR (FloatRowVector, xfloat_row_vector_value, float_row_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2254 XVALUE_EXTRACTOR (FloatComplexRowVector, xfloat_complex_row_vector_value, float_complex_row_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2255
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2256 XVALUE_EXTRACTOR (Array<int>, xint_vector_value, int_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2257 XVALUE_EXTRACTOR (Array<octave_idx_type>, xoctave_idx_type_vector_value, octave_idx_type_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2258
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2259 XVALUE_EXTRACTOR (Array<double>, xvector_value, vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2260 XVALUE_EXTRACTOR (Array<Complex>, xcomplex_vector_value, complex_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2261
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2262 XVALUE_EXTRACTOR (Array<float>, xfloat_vector_value, float_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2263 XVALUE_EXTRACTOR (Array<FloatComplex>, xfloat_complex_vector_value, float_complex_vector_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2264
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2265 XVALUE_EXTRACTOR (octave_function *, xfunction_value, function_value)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2266 XVALUE_EXTRACTOR (octave_user_function *, xuser_function_value, user_function_value)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2267 XVALUE_EXTRACTOR (octave_user_script *, xuser_script_value, user_script_value)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2268 XVALUE_EXTRACTOR (octave_user_code *, xuser_code_value, user_code_value)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2269 XVALUE_EXTRACTOR (octave_fcn_handle *, xfcn_handle_value, fcn_handle_value)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2270
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2271 XVALUE_EXTRACTOR (octave_value_list, xlist_value, list_value)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2272
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2273 #undef XVALUE_EXTRACTOR
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2274
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2275 octave_value
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2276 octave_value::storable_value (void) const
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2277 {
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2278 octave_value retval = *this;
23589 63950abd2f81 maint: Deprecate is_null_type and replace with isnull. Rik <rik@octave.org> parents: 23587 diff changeset	2279 if (isnull ())
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2280 retval = octave_value (m_rep->empty_clone ());
28588 ee9b1081471f allow integer constants > flintmax to be represented exactly (bug #45945) John W. Eaton <jwe@octave.org> parents: 28519 diff changeset	2281 else if (is_magic_int ())
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2282 retval = octave_value (m_rep->double_value ());
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2283 else if (is_range () && ! m_rep->is_storable ())
29353 715344f405f0 improve handling of nan, infinite value, and empty ranges (bug #59229) John W. Eaton <jwe@octave.org> parents: 29163 diff changeset	2284 error ("range with infinite number of elements cannot be stored");
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2285 else
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2286 retval.maybe_economize ();
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2287
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2288 return retval;
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2289 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2290
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2291 void
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2292 octave_value::make_storable_value (void)
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2293 {
23589 63950abd2f81 maint: Deprecate is_null_type and replace with isnull. Rik <rik@octave.org> parents: 23587 diff changeset	2294 if (isnull ())
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2295 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2296 octave_base_value *rc = m_rep->empty_clone ();
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	2297 if (--m_rep->count == 0)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2298 delete m_rep;
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2299 m_rep = rc;
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2300 }
28588 ee9b1081471f allow integer constants > flintmax to be represented exactly (bug #45945) John W. Eaton <jwe@octave.org> parents: 28519 diff changeset	2301 else if (is_magic_int ())
ee9b1081471f allow integer constants > flintmax to be represented exactly (bug #45945) John W. Eaton <jwe@octave.org> parents: 28519 diff changeset	2302 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2303 octave_base_value *rc = new octave_scalar (m_rep->double_value ());
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	2304 if (--m_rep->count == 0)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2305 delete m_rep;
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2306 m_rep = rc;
28588 ee9b1081471f allow integer constants > flintmax to be represented exactly (bug #45945) John W. Eaton <jwe@octave.org> parents: 28519 diff changeset	2307 }
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2308 else if (is_range () && ! m_rep->is_storable ())
29353 715344f405f0 improve handling of nan, infinite value, and empty ranges (bug #59229) John W. Eaton <jwe@octave.org> parents: 29163 diff changeset	2309 error ("range with infinite number of elements cannot be stored");
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2310 else
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2311 maybe_economize ();
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2312 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2313
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24565 diff changeset	2314 float_display_format
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24565 diff changeset	2315 octave_value::get_edit_display_format (void) const
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24565 diff changeset	2316 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2317 return m_rep->get_edit_display_format ();
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24565 diff changeset	2318 }
d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24565 diff changeset	2319
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2320 int
23059 b98ebcd7f11c move some octave stream classes into octave namespace John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	2321 octave_value::write (octave::stream& os, int block_size,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2322 oct_data_conv::data_type output_type, int skip,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21730 diff changeset	2323 octave::mach_info::float_format flt_fmt) const
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2324 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2325 return m_rep->write (os, block_size, output_type, skip, flt_fmt);
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2326 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2327
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2328 void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2329 octave_value::print_info (std::ostream& os, const std::string& prefix) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2330 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2331 os << prefix << "type_name: " << type_name () << "\n"
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	2332 << prefix << "count: " << get_count () << "\n"
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2333 << prefix << "m_rep info: ";
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2334
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2335 m_rep->print_info (os, prefix + ' ');
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2336 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2337
30232 a2936935c7c8 attempt to limit possible const_cast damage John W. Eaton <jwe@octave.org> parents: 30142 diff changeset	2338 const void *
28126 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2339 octave_value::mex_get_data (mxClassID class_id, mxComplexity complexity) const
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2340 {
28126 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2341 // If class_id is set to mxUNKNOWN_CLASS, return data for any type.
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2342 // Otherwise, require that REP matches the requested type and
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2343 // complexity.
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2344
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2345 if (class_id != mxUNKNOWN_CLASS)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2346 {
28126 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2347 bool type_ok = false;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2348
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2349 switch (class_id)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2350 {
28126 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2351 case mxDOUBLE_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2352 type_ok = is_double_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2353 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2354
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2355 case mxSINGLE_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2356 type_ok = is_single_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2357 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2358
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2359 case mxINT8_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2360 type_ok = is_int8_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2361 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2362
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2363 case mxINT16_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2364 type_ok = is_int16_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2365 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2366
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2367 case mxINT32_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2368 type_ok = is_int32_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2369 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2370
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2371 case mxINT64_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2372 type_ok = is_int64_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2373 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2374
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2375 case mxUINT8_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2376 type_ok = is_uint8_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2377 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2378
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2379 case mxUINT16_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2380 type_ok = is_uint16_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2381 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2382
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2383 case mxUINT32_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2384 type_ok = is_uint32_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2385 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2386
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2387 case mxUINT64_CLASS:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2388 type_ok = is_uint64_type ();
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2389 break;
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2390
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2391 default:
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2392 // We only expect to see numeric types explicitly requested.
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2393 error ("mex_get_data: unexpected type requested");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2394 }
28126 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2395
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2396 if (! type_ok)
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2397 error ("mex_get_data: type mismatch");
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2398
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2399 if (complexity == mxCOMPLEX && ! iscomplex ())
4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	2400 error ("mex_get_data: objectis not complex as requested");
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2401 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2402
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2403 return m_rep->mex_get_data ();
24565 dbec1e04f499 accept type_info obj as arg to binary_op, unary_op, and cat_op functions John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	2404 }
dbec1e04f499 accept type_info obj as arg to binary_op, unary_op, and cat_op functions John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	2405
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2406 OCTAVE_NORETURN static void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2407 err_unary_op_conversion_failed (const std::string& op,
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2408 const std::string& tn)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2409 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15428 diff changeset	2410 error ("operator %s: type conversion for '%s' failed",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2411 op.c_str (), tn.c_str ());
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2412 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2413
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2414 OCTAVE_NORETURN static void
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2415 err_unary_op (const std::string& on, const std::string& tn)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2416 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2417 error ("unary operator '%s' not implemented for '%s' operands",
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2418 on.c_str (), tn.c_str ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2419 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2420
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2421 octave_value&
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2422 octave_value::non_const_unary_op (unary_op op)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2423 {
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2424 if (op == op_incr \|\| op == op_decr)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2425 {
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2426 // We want the error just here, because in the other branch this should
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2427 // not happen, and if it did anyway (internal error), the message would
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2428 // be confusing.
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2429 if (is_undefined ())
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2430 {
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2431 std::string op_str = unary_op_as_string (op);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2432 error ("in x%s or %sx, x must be defined first",
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2433 op_str.c_str (), op_str.c_str ());
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2434 return *this;
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2435 }
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2436
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2437 // Genuine.
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2438 int t = type_id ();
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2439
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2440 octave::type_info& ti = octave::__get_type_info__ ("non_const_unary_op");
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2441
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2442 octave::type_info::non_const_unary_op_fcn f
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2443 = ti.lookup_non_const_unary_op (op, t);
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2444
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2445 if (f)
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2446 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2447 make_unique ();
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2448
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2449 f (*m_rep);
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2450 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2451 else
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2452 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2453 octave_base_value::type_conv_fcn cf = numeric_conversion_function ();
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2454
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2455 if (! cf)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2456 err_unary_op (octave_value::unary_op_as_string (op), type_name ());
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2457
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2458 octave_base_value tmp = cf (m_rep);
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2459
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2460 if (! tmp)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2461 err_unary_op_conversion_failed
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2462 (octave_value::unary_op_as_string (op), type_name ());
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2463
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2464 octave_base_value *old_rep = m_rep;
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2465 m_rep = tmp;
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2466
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2467 t = type_id ();
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2468
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2469 f = ti.lookup_non_const_unary_op (op, t);
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2470
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2471 if (f)
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2472 {
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2473 f (*m_rep);
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2474
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	2475 if (old_rep && --old_rep->count == 0)
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2476 delete old_rep;
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2477 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2478 else
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2479 {
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2480 if (old_rep)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2481 {
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	2482 if (--m_rep->count == 0)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2483 delete m_rep;
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2484
5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2485 m_rep = old_rep;
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2486 }
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2487
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2488 err_unary_op (octave_value::unary_op_as_string (op),
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2489 type_name ());
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2490 }
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2491 }
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2492 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2493 else
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2494 {
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2495 // Non-genuine.
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2496 int t = type_id ();
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2497
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2498 octave::type_info::non_const_unary_op_fcn f = nullptr;
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2499
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2500 // Only attempt to operate in-place if this variable is unshared.
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	2501 if (m_rep->count == 1)
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2502 {
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2503 octave::type_info& ti
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2504 = octave::__get_type_info__ ("non_const_unary_op");
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2505
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2506 f = ti.lookup_non_const_unary_op (op, t);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	2507 }
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2508
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2509 if (f)
30128 5616702bffac maint: use "m_" prefix for member variable "m_rep" in class octave_value. Rik <rik@octave.org> parents: 30022 diff changeset	2510 f (*m_rep);
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2511 else
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2512 this = octave::unary_op (op, this);
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2513 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2514
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2515 return *this;
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2516 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2517
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2518 octave_value&
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2519 octave_value::non_const_unary_op (unary_op op, const std::string& type,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2520 const std::list<octave_value_list>& idx)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2521 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2522 if (idx.empty ())
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2523 non_const_unary_op (op);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2524 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2525 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2526 // FIXME: only do the following stuff if we can't find a
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2527 // specific function to call to handle the op= operation for the
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2528 // types we have.
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2529
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2530 assign_op assop = unary_op_to_assign_op (op);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2531
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2532 assign (assop, type, idx, 1.0);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2533 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2534
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2535 return *this;
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2536 }
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2537
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2538 octave_value::assign_op
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2539 octave_value::unary_op_to_assign_op (unary_op op)
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2540 {
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2541 switch (op)
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2542 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2543 case op_incr:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2544 return op_add_eq;
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2545
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2546 case op_decr:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2547 return op_sub_eq;
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2548
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2549 default:
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2550 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2551 std::string on = unary_op_as_string (op);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2552 error ("operator %s: no assign operator found", on.c_str ());
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2553 }
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2554 }
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2555 }
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2556
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2557 octave_value::binary_op
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2558 octave_value::op_eq_to_binary_op (assign_op op)
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2559 {
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2560 switch (op)
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2561 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2562 case op_add_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2563 return op_add;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2564
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2565 case op_sub_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2566 return op_sub;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2567
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2568 case op_mul_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2569 return op_mul;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2570
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2571 case op_div_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2572 return op_div;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2573
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2574 case op_ldiv_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2575 return op_ldiv;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2576
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	2577 case op_pow_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2578 return op_pow;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2579
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2580 case op_el_mul_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2581 return op_el_mul;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2582
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2583 case op_el_div_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2584 return op_el_div;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2585
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2586 case op_el_ldiv_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2587 return op_el_ldiv;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2588
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	2589 case op_el_pow_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2590 return op_el_pow;
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	2591
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2592 case op_el_and_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2593 return op_el_and;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2594
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2595 case op_el_or_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2596 return op_el_or;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2597
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2598 default:
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2599 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2600 std::string on = assign_op_as_string (op);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2601 error ("operator %s: no binary operator found", on.c_str ());
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2602 }
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2603 }
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2604 }
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2605
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2606 octave_value
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2607 octave_value::empty_conv (const std::string& type, const octave_value& rhs)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2608 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2609 if (type.length () > 0)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2610 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2611 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2612 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2613 case '(':
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2614 if (type.length () > 1 && type[1] == '.')
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2615 return octave_map ();
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2616 else
21295 29a0e9e70879 * ov.h: Fix typo in previous change. John W. Eaton <jwe@octave.org> parents: 21294 diff changeset	2617 return octave_value (rhs.empty_clone ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2618
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2619 case '{':
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2620 return Cell ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2621
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2622 case '.':
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2623 return octave_scalar_map ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2624
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2625 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2626 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2627 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2628 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2629 else
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2630 return octave_value (rhs.empty_clone ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2631 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2632
29960 939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2633 OCTAVE_NAMESPACE_BEGIN
939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2634
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2635 OCTAVE_NORETURN static void
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2636 err_binary_op (const std::string& on, const std::string& tn1,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2637 const std::string& tn2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2638 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2639 error ("binary operator '%s' not implemented for '%s' by '%s' operations",
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2640 on.c_str (), tn1.c_str (), tn2.c_str ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2641 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2642
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2643 OCTAVE_NORETURN static void
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2644 err_binary_op_conv (const std::string& on)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2645 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2646 error ("type conversion failed for binary operator '%s'", on.c_str ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2647 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2648
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2649 octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2650 binary_op (type_info& ti, octave_value::binary_op op,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2651 const octave_value& v1, const octave_value& v2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2652 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2653 octave_value retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2654
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2655 int t1 = v1.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2656 int t2 = v2.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2657
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2658 if (t1 == octave_class::static_type_id ()
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2659 \|\| t2 == octave_class::static_type_id ()
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2660 \|\| t1 == octave_classdef::static_type_id ()
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2661 \|\| t2 == octave_classdef::static_type_id ())
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2662 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2663 type_info::binary_class_op_fcn f = ti.lookup_binary_class_op (op);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2664
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2665 if (! f)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2666 err_binary_op (octave_value::binary_op_as_string (op),
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2667 v1.class_name (), v2.class_name ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2668
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2669 retval = f (v1, v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2670 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2671 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2672 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2673 // FIXME: we need to handle overloading operators for built-in
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2674 // classes (double, char, int8, etc.)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2675
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2676 type_info::binary_op_fcn f
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2677 = ti.lookup_binary_op (op, t1, t2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2678
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2679 if (f)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2680 retval = f (v1.get_rep (), v2.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2681 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2682 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2683 octave_value tv1;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2684 octave_base_value::type_conv_info cf1
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2685 = v1.numeric_conversion_function ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2686
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2687 octave_value tv2;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2688 octave_base_value::type_conv_info cf2
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2689 = v2.numeric_conversion_function ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2690
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2691 // Try biased (one-sided) conversions first.
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2692 if (cf2.type_id () >= 0
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2693 && ti.lookup_binary_op (op, t1, cf2.type_id ()))
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2694 cf1 = nullptr;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2695 else if (cf1.type_id () >= 0
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2696 && ti.lookup_binary_op (op, cf1.type_id (), t2))
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2697 cf2 = nullptr;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2698
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2699 if (cf1)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2700 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2701 octave_base_value *tmp = cf1 (v1.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2702
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2703 if (! tmp)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2704 err_binary_op_conv (octave_value::binary_op_as_string (op));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2705
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2706 tv1 = octave_value (tmp);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2707 t1 = tv1.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2708 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2709 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2710 tv1 = v1;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2711
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2712 if (cf2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2713 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2714 octave_base_value *tmp = cf2 (v2.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2715
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2716 if (! tmp)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2717 err_binary_op_conv (octave_value::binary_op_as_string (op));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2718
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2719 tv2 = octave_value (tmp);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2720 t2 = tv2.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2721 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2722 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2723 tv2 = v2;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2724
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2725 if (cf1 \|\| cf2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2726 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2727 retval = binary_op (op, tv1, tv2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2728 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2729 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2730 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2731 //demote double -> single and try again
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2732 cf1 = tv1.numeric_demotion_function ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2733
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2734 cf2 = tv2.numeric_demotion_function ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2735
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2736 // Try biased (one-sided) conversions first.
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2737 if (cf2.type_id () >= 0
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2738 && ti.lookup_binary_op (op, t1, cf2.type_id ()))
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2739 cf1 = nullptr;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2740 else if (cf1.type_id () >= 0
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2741 && ti.lookup_binary_op (op, cf1.type_id (), t2))
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2742 cf2 = nullptr;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2743
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2744 if (cf1)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2745 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2746 octave_base_value *tmp = cf1 (tv1.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2747
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2748 if (! tmp)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2749 err_binary_op_conv (octave_value::binary_op_as_string (op));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2750
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2751 tv1 = octave_value (tmp);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2752 t1 = tv1.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2753 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2754
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2755 if (cf2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2756 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2757 octave_base_value *tmp = cf2 (tv2.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2758
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2759 if (! tmp)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2760 err_binary_op_conv (octave_value::binary_op_as_string (op));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2761
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2762 tv2 = octave_value (tmp);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2763 t2 = tv2.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2764 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2765
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2766 if (! cf1 && ! cf2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2767 err_binary_op (octave_value::binary_op_as_string (op),
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2768 v1.type_name (), v2.type_name ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2769
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2770 f = ti.lookup_binary_op (op, t1, t2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2771
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2772 if (! f)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2773 err_binary_op (octave_value::binary_op_as_string (op),
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2774 v1.type_name (), v2.type_name ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2775
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2776 retval = f (tv1.get_rep (), tv2.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2777 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2778 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2779 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2780
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2781 return retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2782 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2783
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2784 octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2785 binary_op (octave_value::binary_op op, const octave_value& v1,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2786 const octave_value& v2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2787 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2788 type_info& ti = __get_type_info__ ("binary_op");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2789
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2790 return binary_op (ti, op, v1, v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2791 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2792
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2793 static octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2794 decompose_binary_op (type_info& ti, octave_value::compound_binary_op op,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2795 const octave_value& v1, const octave_value& v2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2796 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2797 switch (op)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2798 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2799 case octave_value::op_trans_mul:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2800 return binary_op (octave_value::op_mul,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2801 unary_op (octave_value::op_transpose, v1), v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2802
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2803 case octave_value::op_mul_trans:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2804 return binary_op (ti, octave_value::op_mul,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2805 v1, unary_op (octave_value::op_transpose, v2));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2806
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2807 case octave_value::op_herm_mul:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2808 return binary_op (ti, octave_value::op_mul,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2809 unary_op (octave_value::op_hermitian, v1), v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2810
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2811 case octave_value::op_mul_herm:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2812 return binary_op (ti, octave_value::op_mul,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2813 v1, unary_op (octave_value::op_hermitian, v2));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2814
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2815 case octave_value::op_trans_ldiv:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2816 return binary_op (ti, octave_value::op_ldiv,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2817 unary_op (octave_value::op_transpose, v1), v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2818
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2819 case octave_value::op_herm_ldiv:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2820 return binary_op (ti, octave_value::op_ldiv,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2821 unary_op (octave_value::op_hermitian, v1), v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2822
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2823 case octave_value::op_el_not_and:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2824 return binary_op (ti, octave_value::op_el_and,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2825 unary_op (octave_value::op_not, v1), v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2826
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2827 case octave_value::op_el_not_or:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2828 return binary_op (ti, octave_value::op_el_or,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2829 unary_op (octave_value::op_not, v1), v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2830
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2831 case octave_value::op_el_and_not:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2832 return binary_op (ti, octave_value::op_el_and,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2833 v1, unary_op (octave_value::op_not, v2));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2834
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2835 case octave_value::op_el_or_not:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2836 return binary_op (ti, octave_value::op_el_or,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2837 v1, unary_op (octave_value::op_not, v2));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2838
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2839 default:
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2840 error ("invalid compound operator");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2841 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2842 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2843
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2844 octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2845 binary_op (type_info& ti, octave_value::compound_binary_op op,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2846 const octave_value& v1, const octave_value& v2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2847 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2848 octave_value retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2849
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2850 int t1 = v1.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2851 int t2 = v2.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2852
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2853 if (t1 == octave_class::static_type_id ()
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2854 \|\| t2 == octave_class::static_type_id ()
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2855 \|\| t1 == octave_classdef::static_type_id ()
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2856 \|\| t2 == octave_classdef::static_type_id ())
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2857 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2858 type_info::binary_class_op_fcn f = ti.lookup_binary_class_op (op);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2859
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2860 if (f)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2861 retval = f (v1, v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2862 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2863 retval = decompose_binary_op (ti, op, v1, v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2864 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2865 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2866 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2867 type_info::binary_op_fcn f = ti.lookup_binary_op (op, t1, t2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2868
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2869 if (f)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2870 retval = f (v1.get_rep (), v2.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2871 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2872 retval = decompose_binary_op (ti, op, v1, v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2873 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2874
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2875 return retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2876 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2877
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2878 octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2879 binary_op (octave_value::compound_binary_op op,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2880 const octave_value& v1, const octave_value& v2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2881 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2882 type_info& ti = __get_type_info__ ("binary_op");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2883
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2884 return binary_op (ti, op, v1, v2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2885 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2886
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2887 OCTAVE_NORETURN static void
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2888 err_cat_op (const std::string& tn1, const std::string& tn2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2889 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2890 error ("concatenation operator not implemented for '%s' by '%s' operations",
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2891 tn1.c_str (), tn2.c_str ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2892 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2893
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2894 OCTAVE_NORETURN static void
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2895 err_cat_op_conv (void)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2896 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2897 error ("type conversion failed for concatenation operator");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2898 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2899
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2900 octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2901 cat_op (type_info& ti, const octave_value& v1,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2902 const octave_value& v2, const Array<octave_idx_type>& ra_idx)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2903 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2904 octave_value retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2905
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2906 // Can't rapid return for concatenation with an empty object here as
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2907 // something like cat(1,[],single([]) must return the correct type.
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2908
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2909 int t1 = v1.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2910 int t2 = v2.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2911
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2912 type_info::cat_op_fcn f = ti.lookup_cat_op (t1, t2);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2913
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2914 if (f)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2915 retval = f (v1.get_rep (), v2.get_rep (), ra_idx);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2916 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2917 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2918 octave_value tv1;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2919 octave_base_value::type_conv_info cf1 = v1.numeric_conversion_function ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2920
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2921 octave_value tv2;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2922 octave_base_value::type_conv_info cf2 = v2.numeric_conversion_function ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2923
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2924 // Try biased (one-sided) conversions first.
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2925 if (cf2.type_id () >= 0 && ti.lookup_cat_op (t1, cf2.type_id ()))
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2926 cf1 = nullptr;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2927 else if (cf1.type_id () >= 0 && ti.lookup_cat_op (cf1.type_id (), t2))
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2928 cf2 = nullptr;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2929
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2930 if (cf1)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2931 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2932 octave_base_value *tmp = cf1 (v1.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2933
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2934 if (! tmp)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2935 err_cat_op_conv ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2936
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2937 tv1 = octave_value (tmp);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2938 t1 = tv1.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2939 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2940 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2941 tv1 = v1;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2942
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2943 if (cf2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2944 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2945 octave_base_value *tmp = cf2 (v2.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2946
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2947 if (! tmp)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2948 err_cat_op_conv ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2949
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2950 tv2 = octave_value (tmp);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2951 t2 = tv2.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2952 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2953 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2954 tv2 = v2;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2955
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2956 if (! cf1 && ! cf2)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2957 err_cat_op (v1.type_name (), v2.type_name ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2958
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2959 retval = cat_op (ti, tv1, tv2, ra_idx);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2960 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2961
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2962 return retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2963 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2964
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2965 octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2966 cat_op (const octave_value& v1, const octave_value& v2,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2967 const Array<octave_idx_type>& ra_idx)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2968 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2969 type_info& ti = __get_type_info__ ("cat_op");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2970
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2971 return cat_op (ti, v1, v2, ra_idx);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2972 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	2973
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2974 // Unless the colon operator is used with a class or classdef object,
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2975 // then all arguments must be the same type or mixed with double
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2976 // values.
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2977
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2978 static builtin_type_t
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2979 get_colon_op_type (builtin_type_t op1_type, builtin_type_t op2_type)
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2980 {
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2981 if (op1_type == op2_type)
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2982 return op1_type;
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2983
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2984 if (op1_type == btyp_double)
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2985 return op2_type;
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2986
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2987 if (op2_type == btyp_double)
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2988 return op1_type;
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2989
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2990 return btyp_unknown;
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2991 }
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2992
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2993 static builtin_type_t
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2994 get_colon_op_type (const octave_value& base, const octave_value& increment,
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2995 const octave_value& limit)
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2996 {
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2997 builtin_type_t typ
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2998 = get_colon_op_type (base.builtin_type (), increment.builtin_type ());
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	2999
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3000 if (typ == btyp_unknown)
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3001 return typ;
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3002
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3003 return get_colon_op_type (typ, limit.builtin_type ());
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3004 }
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3005
30142 a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3006 // This check depends on the type of VAL either being the expected
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3007 // integer type or a double value.
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3008
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3009 template <typename T>
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3010 static void
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3011 check_colon_operand (const octave_value& val, const char *op_str)
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3012 {
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3013 if (! val.is_double_type ())
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3014 return;
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3015
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3016 double dval = val.double_value ();
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3017 double intpart;
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3018
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3019 if (dval > std::numeric_limits<typename T::val_type>::max ()
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3020 \|\| dval < std::numeric_limits<typename T::val_type>::min ()
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3021 \|\| std::modf (dval, &intpart) != 0.0)
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3022 error ("colon operator %s invalid (not an integer or out of range for given integer type)", op_str);
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3023 }
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3024
a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3025 // Templated version used for various integer types (int8, uint16, ...)
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3026 template <typename T>
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3027 octave_value
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3028 make_range (const octave_value& base, const octave_value& increment,
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3029 const octave_value& limit, bool for_cmd_expr)
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3030 {
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3031 if (base.isempty () \|\| increment.isempty () \|\| limit.isempty ())
28857 43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier John W. Eaton <jwe@octave.org> parents: 28646 diff changeset	3032 return octave_value (range<T> (), for_cmd_expr);
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3033
30416 4736bc8e9804 Allow descending ranges of all integer types (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30354 diff changeset	3034 bool reverse = (base.is_uint8_type () \|\| base.is_uint16_type ()
4736bc8e9804 Allow descending ranges of all integer types (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30354 diff changeset	3035 \|\| base.is_uint32_type () \|\| base.is_uint64_type ()
4736bc8e9804 Allow descending ranges of all integer types (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30354 diff changeset	3036 \|\| limit.is_uint8_type () \|\| limit.is_uint16_type ()
4736bc8e9804 Allow descending ranges of all integer types (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30354 diff changeset	3037 \|\| limit.is_uint32_type () \|\| limit.is_uint64_type ())
4736bc8e9804 Allow descending ranges of all integer types (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30354 diff changeset	3038 && increment.scalar_value () < 0;
4736bc8e9804 Allow descending ranges of all integer types (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30354 diff changeset	3039
30423 e658f400a30e Fix possible lifetime issue (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30416 diff changeset	3040 octave_value inc = (reverse ? -increment : increment);
e658f400a30e Fix possible lifetime issue (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30416 diff changeset	3041
30142 a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3042 check_colon_operand<T> (base, "lower bound");
30423 e658f400a30e Fix possible lifetime issue (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30416 diff changeset	3043 check_colon_operand<T> (inc, "increment");
30142 a4d1c080e445 fix construction of ranges with extreme integer values (bug #61132) John W. Eaton <jwe@octave.org> parents: 30139 diff changeset	3044 check_colon_operand<T> (limit, "upper bound");
29410 65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3045
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3046 T base_val = octave_value_extract<T> (base);
29410 65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3047
30423 e658f400a30e Fix possible lifetime issue (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30416 diff changeset	3048 T increment_val = octave_value_extract<T> (inc);
29410 65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3049
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3050 T limit_val = octave_value_extract<T> (limit);
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3051
30416 4736bc8e9804 Allow descending ranges of all integer types (bug #61132). Markus Mützel <markus.muetzel@gmx.de> parents: 30354 diff changeset	3052 range<T> r (base_val, increment_val, limit_val, reverse);
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3053
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3054 return octave_value (r, for_cmd_expr);
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3055 }
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3056
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3057 template <>
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3058 octave_value
29410 65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3059 make_range<double> (const octave_value& base, const octave_value& increment,
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3060 const octave_value& limit, bool for_cmd_expr)
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3061 {
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3062 if (base.isempty () \|\| increment.isempty () \|\| limit.isempty ())
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3063 return octave_value (range<double> (), for_cmd_expr);
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3064
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3065 double base_val = base.double_value ();
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3066 double increment_val = increment.double_value ();
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3067 double limit_val = limit.double_value ();
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3068
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3069 range<double> r (base_val, increment_val, limit_val);
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3070
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3071 return octave_value (r, for_cmd_expr);
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3072 }
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3073
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3074 template <>
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3075 octave_value
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3076 make_range<float> (const octave_value& base, const octave_value& increment,
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3077 const octave_value& limit, bool for_cmd_expr)
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3078 {
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3079 if (base.isempty () \|\| increment.isempty () \|\| limit.isempty ())
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3080 return octave_value (range<float> (), for_cmd_expr);
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3081
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3082 float base_val = base.float_value ();
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3083 float increment_val = increment.float_value ();
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3084 float limit_val = limit.float_value ();
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3085
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3086 range<float> r (base_val, increment_val, limit_val);
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3087
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3088 return octave_value (r, for_cmd_expr);
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3089 }
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3090
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3091 template <>
65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3092 octave_value
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3093 make_range<char> (const octave_value& base, const octave_value& increment,
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3094 const octave_value& limit, bool for_cmd_expr)
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3095 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3096 octave_value retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3097
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3098 bool dq_str = (base.is_dq_string () \|\| increment.is_dq_string ()
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3099 \|\| limit.is_dq_string ());
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3100
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3101 char type = dq_str ? '"' : '\'';
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3102
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3103 if (base.isempty () \|\| increment.isempty () \|\| limit.isempty ())
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3104 retval = octave_value ("", type);
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3105 else
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3106 {
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3107 Matrix mtx_base = base.matrix_value (true);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3108 Matrix mtx_increment = increment.matrix_value (true);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3109 Matrix mtx_limit = limit.matrix_value (true);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3110
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3111 range<double> tmp (mtx_base(0), mtx_increment(0), mtx_limit(0));
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3112
98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3113 retval = octave_value (tmp, for_cmd_expr);
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3114 }
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3115
28638 98192ec1621f replace Range with range<double> John W. Eaton <jwe@octave.org> parents: 28633 diff changeset	3116 return retval.convert_to_str (false, true, type);
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3117 }
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3118
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3119 octave_value
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3120 colon_op (const octave_value& base, const octave_value& increment_arg,
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3121 const octave_value& limit, bool is_for_cmd_expr)
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3122 {
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3123 if (base.isobject () \|\| increment_arg.isobject () \|\| limit.isobject ())
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3124 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3125 octave_value_list tmp1;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3126
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3127 if (increment_arg.is_defined ())
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3128 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3129 tmp1(2) = limit;
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3130 tmp1(1) = increment_arg;
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3131 tmp1(0) = base;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3132 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3133 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3134 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3135 tmp1(1) = limit;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3136 tmp1(0) = base;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3137 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3138
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3139 interpreter& interp = __get_interpreter__ ("colon_op");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3140
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3141 symbol_table& symtab = interp.get_symbol_table ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3142
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3143 octave_value fcn = symtab.find_function ("colon", tmp1);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3144
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3145 if (fcn.is_defined ())
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3146 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3147 octave_value_list tmp2 = interp.feval (fcn, tmp1, 1);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3148
29410 65979d33f147 Emit error if integer/floating point inputs to colon operator are incompatible (bug #59899). Rik <rik@octave.org> parents: 29369 diff changeset	3149 return tmp2(0);
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3150 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3151 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3152
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3153 octave_value increment
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3154 = increment_arg.is_defined () ? increment_arg : octave_value (1.0);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3155
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3156 if (base.numel () > 1 \|\| limit.numel () > 1 \|\| increment.numel () > 1)
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3157 warning_with_id ("Octave:colon-nonscalar-argument",
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3158 "colon arguments should be scalars");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3159
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3160 if (base.iscomplex () \|\| limit.iscomplex () \|\| increment.iscomplex ())
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3161 warning_with_id ("Octave:colon-complex-argument",
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3162 "imaginary part of complex colon arguments is ignored");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3163
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3164 // FIXME: is there a better way to do this job, maybe using type traits?
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3165
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3166 builtin_type_t type_id = get_colon_op_type (base, increment, limit);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3167
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3168 // For compatibility with Matlab, don't allow the range used in
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3169 // a FOR loop expression to be converted to a Matrix.
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3170
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3171 switch (type_id)
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3172 {
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3173 case btyp_double:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3174 case btyp_complex:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3175 return make_range<double> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3176
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3177 case btyp_float:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3178 case btyp_float_complex:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3179 return make_range<float> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3180
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3181 case btyp_int8:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3182 return make_range<octave_int8> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3183
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3184 case btyp_int16:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3185 return make_range<octave_int16> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3186
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3187 case btyp_int32:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3188 return make_range<octave_int32> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3189
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3190 case btyp_int64:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3191 return make_range<octave_int64> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3192
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3193 case btyp_uint8:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3194 return make_range<octave_uint8> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3195
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3196 case btyp_uint16:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3197 return make_range<octave_uint16> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3198
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3199 case btyp_uint32:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3200 return make_range<octave_uint32> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3201
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3202 case btyp_uint64:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3203 return make_range<octave_uint64> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3204
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3205 case btyp_char:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3206 return make_range<char> (base, increment, limit, is_for_cmd_expr);
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3207
29369 c75996cbe3ba Emit more specific error when two different integer types used in range (bug #59899). Rik <rik@octave.org> parents: 29359 diff changeset	3208 case btyp_unknown:
c75996cbe3ba Emit more specific error when two different integer types used in range (bug #59899). Rik <rik@octave.org> parents: 29359 diff changeset	3209 error ("incompatible types found in range expression");
c75996cbe3ba Emit more specific error when two different integer types used in range (bug #59899). Rik <rik@octave.org> parents: 29359 diff changeset	3210
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3211 default:
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3212 error ("invalid types found in range expression");
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3213 }
28633 c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3214
c897ec8fb5d1 refactor octave_value colon_op function John W. Eaton <jwe@octave.org> parents: 28631 diff changeset	3215 return octave_value ();
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3216 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3217
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3218 OCTAVE_NORETURN static void
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3219 err_unary_op_conv (const std::string& on)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3220 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3221 error ("type conversion failed for unary operator '%s'", on.c_str ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3222 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3223
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3224 octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3225 unary_op (type_info& ti, octave_value::unary_op op,
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3226 const octave_value& v)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3227 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3228 octave_value retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3229
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3230 int t = v.type_id ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3231
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3232 if (t == octave_class::static_type_id ()
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3233 \|\| t == octave_classdef::static_type_id ())
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3234 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3235 type_info::unary_class_op_fcn f = ti.lookup_unary_class_op (op);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3236
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3237 if (! f)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3238 err_unary_op (octave_value::unary_op_as_string (op), v.class_name ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3239
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3240 retval = f (v);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3241 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3242 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3243 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3244 // FIXME: we need to handle overloading operators for built-in
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3245 // classes (double, char, int8, etc.)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3246
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3247 type_info::unary_op_fcn f = ti.lookup_unary_op (op, t);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3248
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3249 if (f)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3250 retval = f (v.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3251 else
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3252 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3253 octave_value tv;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3254 octave_base_value::type_conv_fcn cf
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3255 = v.numeric_conversion_function ();
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3256
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3257 if (! cf)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3258 err_unary_op (octave_value::unary_op_as_string (op),
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3259 v.type_name ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3260
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3261 octave_base_value *tmp = cf (v.get_rep ());
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3262
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3263 if (! tmp)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3264 err_unary_op_conv (octave_value::unary_op_as_string (op));
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3265
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3266 tv = octave_value (tmp);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3267 retval = unary_op (op, tv);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3268 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3269 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3270
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3271 return retval;
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3272 }
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3273
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3274 octave_value
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3275 unary_op (octave_value::unary_op op, const octave_value& v)
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3276 {
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3277 type_info& ti = __get_type_info__ ("unary_op");
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3278
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3279 return unary_op (ti, op, v);
70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3280 }
29960 939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	3281
939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	3282 OCTAVE_NAMESPACE_END
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28592 diff changeset	3283
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	3284 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3285 install_types (octave::type_info& ti)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	3286 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3287 octave_base_value::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3288 octave_cell::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3289 octave_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3290 octave_complex::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3291 octave_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3292 octave_diag_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3293 octave_complex_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3294 octave_complex_diag_matrix::register_type (ti);
28646 e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3295 ov_range<float>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3296 ov_range<double>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3297 ov_range<octave_int8>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3298 ov_range<octave_int16>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3299 ov_range<octave_int32>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3300 ov_range<octave_int64>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3301 ov_range<octave_uint8>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3302 ov_range<octave_uint16>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3303 ov_range<octave_uint32>::register_type (ti);
e26201931ea3 new template class for octave_range objects John W. Eaton <jwe@octave.org> parents: 28639 diff changeset	3304 ov_range<octave_uint64>::register_type (ti);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3305 octave_bool::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3306 octave_bool_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3307 octave_char_matrix_str::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3308 octave_char_matrix_sq_str::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3309 octave_int8_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3310 octave_int16_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3311 octave_int32_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3312 octave_int64_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3313 octave_uint8_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3314 octave_uint16_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3315 octave_uint32_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3316 octave_uint64_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3317 octave_int8_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3318 octave_int16_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3319 octave_int32_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3320 octave_int64_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3321 octave_uint8_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3322 octave_uint16_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3323 octave_uint32_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3324 octave_uint64_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3325 octave_sparse_bool_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3326 octave_sparse_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3327 octave_sparse_complex_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3328 octave_struct::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3329 octave_scalar_struct::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3330 octave_class::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3331 octave_cs_list::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3332 octave_magic_colon::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3333 octave_builtin::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3334 octave_user_function::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3335 octave_dld_function::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3336 octave_fcn_handle::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3337 octave_float_scalar::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3338 octave_float_complex::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3339 octave_float_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3340 octave_float_diag_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3341 octave_float_complex_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3342 octave_float_complex_diag_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3343 octave_perm_matrix::register_type (ti);
28588 ee9b1081471f allow integer constants > flintmax to be represented exactly (bug #45945) John W. Eaton <jwe@octave.org> parents: 28519 diff changeset	3344 octave_magic_int::register_type (ti);
ee9b1081471f allow integer constants > flintmax to be represented exactly (bug #45945) John W. Eaton <jwe@octave.org> parents: 28519 diff changeset	3345 octave_magic_uint::register_type (ti);
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3346 octave_null_matrix::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3347 octave_null_str::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3348 octave_null_sq_str::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3349 octave_lazy_index::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3350 octave_oncleanup::register_type (ti);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	3351 octave_java::register_type (ti);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	3352 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	3353
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29954 diff changeset	3354 OCTAVE_NAMESPACE_BEGIN
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29954 diff changeset	3355
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	3356 DEFUN (sizeof, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3357 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3358 @deftypefn {} {} sizeof (@var{val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3359 Return the size of @var{val} in bytes.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3360 @seealso{whos}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3361 @end deftypefn */)
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	3362 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3363 if (args.length () != 1)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5785 diff changeset	3364 print_usage ();
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	3365
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3366 return ovl (args(0).byte_size ());
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	3367 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	3368
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3369 /*
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3370 %!assert (sizeof (uint64 (ones (3))), 72)
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3371 %!assert (sizeof (double (zeros (2,4))), 64)
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3372 %!assert (sizeof ({"foo", "bar", "baaz"}), 10)
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3373 */
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3374
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3375 static void
23449 c763214a8260 maint: Use convention 'int x' for naming pointers. Rik <rik@octave.org>* parents: 23433 diff changeset	3376 decode_subscripts (const char *name, const octave_value& arg,
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3377 std::string& type_string,
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3378 std::list<octave_value_list>& idx)
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3379 {
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20703 diff changeset	3380 const octave_map m = arg.xmap_value ("%s: second argument must be a structure with fields 'type' and 'subs'", name);
571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20703 diff changeset	3381
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3382 if (m.nfields () != 2 \|\| ! m.contains ("type") \|\| ! m.contains ("subs"))
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	3383 error ("%s: second argument must be a structure with fields 'type' and 'subs'",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	3384 name);
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3385
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3386 octave_idx_type nel = m.numel ();
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3387
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3388 type_string = std::string (nel, '\0');
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3389 idx = std::list<octave_value_list> ();
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3390
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3391 if (nel == 0)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3392 return;
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3393
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3394 const Cell type = m.contents ("type");
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3395 const Cell subs = m.contents ("subs");
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3396
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3397 for (int k = 0; k < nel; k++)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3398 {
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3399 std::string item = type(k).xstring_value ("%s: type(%d) must be a string", name, k+1);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3400
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3401 if (item == "{}")
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3402 type_string[k] = '{';
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3403 else if (item == "()")
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3404 type_string[k] = '(';
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3405 else if (item == ".")
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3406 type_string[k] = '.';
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3407 else
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3408 error ("%s: invalid indexing type '%s'", name, item.c_str ());
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3409
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3410 octave_value_list idx_item;
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3411
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3412 if (subs(k).is_string ())
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3413 idx_item(0) = subs(k);
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23534 diff changeset	3414 else if (subs(k).iscell ())
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3415 {
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3416 Cell subs_cell = subs(k).cell_value ();
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3417
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3418 for (int n = 0; n < subs_cell.numel (); n++)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3419 {
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3420 if (subs_cell(n).is_string ()
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3421 && subs_cell(n).string_value () == ":")
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3422 idx_item(n) = octave_value(octave_value::magic_colon_t);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3423 else
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3424 idx_item(n) = subs_cell(n);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3425 }
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3426 }
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3427 else
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3428 error ("%s: subs(%d) must be a string or cell array", name, k+1);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3429
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3430 idx.push_back (idx_item);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	3431 }
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3432 }
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3433
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3434 DEFUN (subsref, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3435 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3436 @deftypefn {} {} subsref (@var{val}, @var{idx})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3437 Perform the subscripted element selection operation on @var{val} according
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3438 to the subscript specified by @var{idx}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3439
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3440 The subscript @var{idx} must be a structure array with fields @samp{type}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3441 and @samp{subs}. Valid values for @samp{type} are @qcode{"()"},
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3442 @qcode{"@{@}"}, and @qcode{"."}. The @samp{subs} field may be either
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3443 @qcode{":"} or a cell array of index values.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3444
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3445 The following example shows how to extract the first two columns of a matrix
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3446
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3447 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3448 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3449 val = magic (3)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3450 @result{} val = [ 8 1 6
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3451 3 5 7
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3452 4 9 2 ]
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3453 idx.type = "()";
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3454 idx.subs = @{":", 1:2@};
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3455 subsref (val, idx)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3456 @result{} [ 8 1
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3457 3 5
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3458 4 9 ]
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3459 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3460 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3461
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3462 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3463 Note that this is the same as writing @code{val(:, 1:2)}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3464
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3465 If @var{idx} is an empty structure array with fields @samp{type} and
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3466 @samp{subs}, return @var{val}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3467 @seealso{subsasgn, substruct}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3468 @end deftypefn */)
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3469 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3470 if (args.length () != 2)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3471 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3472
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3473 std::string type;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3474 std::list<octave_value_list> idx;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3475
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3476 decode_subscripts ("subsref", args(1), type, idx);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3477
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3478 octave_value arg0 = args(0);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3479
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3480 if (type.empty ())
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3481 return ovl (arg0);
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3482 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3483 return arg0.subsref (type, idx, nargout);
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3484 }
e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3485
e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3486 DEFUN (subsasgn, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3487 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3488 @deftypefn {} {} subsasgn (@var{val}, @var{idx}, @var{rhs})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3489 Perform the subscripted assignment operation according to the subscript
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3490 specified by @var{idx}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3491
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3492 The subscript @var{idx} must be a structure array with fields @samp{type}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3493 and @samp{subs}. Valid values for @samp{type} are @qcode{"()"},
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3494 @qcode{"@{@}"}, and @qcode{"."}. The @samp{subs} field may be either
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3495 @qcode{":"} or a cell array of index values.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3496
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3497 The following example shows how to set the two first columns of a 3-by-3
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3498 matrix to zero.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3499
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3500 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3501 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3502 val = magic (3);
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3503 idx.type = "()";
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3504 idx.subs = @{":", 1:2@};
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3505 subsasgn (val, idx, 0)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3506 @result{} [ 0 0 6
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3507 0 0 7
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3508 0 0 2 ]
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3509 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3510 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3511
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3512 Note that this is the same as writing @code{val(:, 1:2) = 0}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3513
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3514 If @var{idx} is an empty structure array with fields @samp{type} and
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3515 @samp{subs}, return @var{rhs}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3516 @seealso{subsref, substruct, optimize_subsasgn_calls}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3517 @end deftypefn */)
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3518 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3519 if (args.length () != 3)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3520 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3521
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3522 std::string type;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3523 std::list<octave_value_list> idx;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3524
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3525 decode_subscripts ("subsasgn", args(1), type, idx);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3526
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3527 if (type.empty ())
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3528 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3529 // Regularize a null matrix if stored into a variable.
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3530 return ovl (args(2).storable_value ());
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3531 }
e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3532 else
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3533 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3534 octave_value arg0 = args(0);
22390 6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3535 octave_value arg2 = args(2);
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3536
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3537 arg0.make_unique ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3538
22390 6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3539 bool arg2_null = arg2.is_zero_by_zero () && arg2.is_double_type ();
6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3540
6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3541 return ovl (arg0.subsasgn (type, idx, (arg2_null
6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3542 ? octave_null_matrix::instance
6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3543 : arg2)));
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3544 }
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3545 }
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3546
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3547 /*
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3548 %!test
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3549 %! a = reshape ([1:25], 5,5);
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3550 %! idx1 = substruct ("()", {3, 3});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3551 %! idx2 = substruct ("()", {2:2:5, 2:2:5});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3552 %! idx3 = substruct ("()", {":", [1,5]});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3553 %! idx4 = struct ("type", {}, "subs", {});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3554 %! assert (subsref (a, idx1), 13);
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3555 %! assert (subsref (a, idx2), [7 17; 9 19]);
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3556 %! assert (subsref (a, idx3), [1:5; 21:25]');
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3557 %! assert (subsref (a, idx4), a);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3558 %! a = subsasgn (a, idx1, 0);
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3559 %! a = subsasgn (a, idx2, 0);
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3560 %! a = subsasgn (a, idx3, 0);
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3561 %!# a = subsasgn (a, idx4, 0);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3562 %! b = [0 6 11 16 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3563 %! 0 0 12 0 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3564 %! 0 8 0 18 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3565 %! 0 0 14 0 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3566 %! 0 10 15 20 0];
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3567 %! assert (a, b);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3568
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3569 %!test
22390 6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3570 %! x = 1:10;
6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3571 %! assert (subsasgn (x, substruct ("()", {1}), zeros (0, 0)), 2:10);
6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3572
6cbbd550aa91 allow subsasgn (x, idx, zeros(0,0)) to remove elements (bug #48867) John W. Eaton <jwe@octave.org> parents: 22327 diff changeset	3573 %!test
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3574 %! c = num2cell (reshape ([1:25],5,5));
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3575 %! idx1 = substruct ("{}", {3, 3});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3576 %! idx2 = substruct ("()", {2:2:5, 2:2:5});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3577 %! idx3 = substruct ("()", {":", [1,5]});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3578 %! idx2p = substruct ("{}", {2:2:5, 2:2:5});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3579 %! idx3p = substruct ("{}", {":", [1,5]});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3580 %! idx4 = struct ("type", {}, "subs", {});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3581 %! assert ({ subsref(c, idx1) }, {13});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3582 %! assert ({ subsref(c, idx2p) }, {7 9 17 19});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3583 %! assert ({ subsref(c, idx3p) }, num2cell ([1:5, 21:25]));
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14528 diff changeset	3584 %! assert (subsref (c, idx4), c);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3585 %! c = subsasgn (c, idx1, 0);
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3586 %! c = subsasgn (c, idx2, 0);
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3587 %! c = subsasgn (c, idx3, 0);
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3588 %!# c = subsasgn (c, idx4, 0);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3589 %! d = {0 6 11 16 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3590 %! 0 0 12 0 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3591 %! 0 8 0 18 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3592 %! 0 0 14 0 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3593 %! 0 10 15 20 0};
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3594 %! assert (c, d);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3595
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3596 %!test
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3597 %! s.a = "ohai";
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3598 %! s.b = "dere";
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3599 %! s.c = 42;
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3600 %! idx1 = substruct (".", "a");
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3601 %! idx2 = substruct (".", "b");
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3602 %! idx3 = substruct (".", "c");
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3603 %! idx4 = struct ("type", {}, "subs", {});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3604 %! assert (subsref (s, idx1), "ohai");
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3605 %! assert (subsref (s, idx2), "dere");
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3606 %! assert (subsref (s, idx3), 42);
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3607 %! assert (subsref (s, idx4), s);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3608 %! s = subsasgn (s, idx1, "Hello");
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3609 %! s = subsasgn (s, idx2, "There");
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3610 %! s = subsasgn (s, idx3, 163);
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3611 %!# s = subsasgn (s, idx4, 163);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3612 %! t.a = "Hello";
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3613 %! t.b = "There";
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3614 %! t.c = 163;
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3615 %! assert (s, t);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3616 */
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3617
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3618 DEFUN (is_sq_string, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3619 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3620 @deftypefn {} {} is_sq_string (@var{x})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3621 Return true if @var{x} is a single-quoted character string.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3622 @seealso{is_dq_string, ischar}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3623 @end deftypefn */)
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3624 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3625 if (args.length () != 1)
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3626 print_usage ();
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3627
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3628 return ovl (args(0).is_sq_string ());
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3629 }
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3630
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3631 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3632 %!assert (is_sq_string ('foo'), true)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3633 %!assert (is_sq_string ("foo"), false)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3634 %!assert (is_sq_string (1.0), false)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3635 %!assert (is_sq_string ({2.0}), false)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3636
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3637 %!error is_sq_string ()
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3638 %!error is_sq_string ('foo', 2)
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3639 */
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3640
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3641 DEFUN (is_dq_string, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3642 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3643 @deftypefn {} {} is_dq_string (@var{x})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3644 Return true if @var{x} is a double-quoted character string.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3645 @seealso{is_sq_string, ischar}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3646 @end deftypefn */)
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3647 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3648 if (args.length () != 1)
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3649 print_usage ();
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3650
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3651 return ovl (args(0).is_dq_string ());
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3652 }
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3653
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3654 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3655 %!assert (is_dq_string ("foo"), true)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3656 %!assert (is_dq_string ('foo'), false)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3657 %!assert (is_dq_string (1.0), false)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3658 %!assert (is_dq_string ({2.0}), false)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3659
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3660 %!error is_dq_string ()
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3661 %!error is_dq_string ("foo", 2)
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3662 */
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3663
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3664 DEFUN (optimize_permutation_matrix, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3665 doc: /* -- texinfo --
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3666 @deftypefn {} {@var{val} =} optimize_permutation_matrix ()
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3667 @deftypefnx {} {@var{old_val} =} optimize_permutation_matrix (@var{new_val})
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3668 @deftypefnx {} {} optimize_permutation_matrix (@var{new_val}, "local")
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3669 Query or set whether a special space-efficient format is used for storing
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3670 permutation matrices.
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3671
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3672 The default value is true. If this option is set to false, Octave will store
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3673 permutation matrices as full matrices.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3674
29929 a3ac00db296b doc: disable_diagonal_matrix, disable_diagonal_matrix, and disable_range (patch #10089). José Luis García Pallero <jgpallero@gmail.com> parents: 29654 diff changeset	3675 When called from inside a function with the @qcode{"local"} option, the setting
a3ac00db296b doc: disable_diagonal_matrix, disable_diagonal_matrix, and disable_range (patch #10089). José Luis García Pallero <jgpallero@gmail.com> parents: 29654 diff changeset	3676 is changed locally for the function and any subroutines it calls. The original
a3ac00db296b doc: disable_diagonal_matrix, disable_diagonal_matrix, and disable_range (patch #10089). José Luis García Pallero <jgpallero@gmail.com> parents: 29654 diff changeset	3677 setting is restored when exiting the function.
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3678 @seealso{optimize_range, optimize_diagonal_matrix}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3679 @end deftypefn */)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3680 {
30001 428cccc75cc9 move most functions in variables.cc to octave namespace John W. Eaton <jwe@octave.org> parents: 29982 diff changeset	3681 return set_internal_variable (Voptimize_permutation_matrix, args, nargout,
428cccc75cc9 move most functions in variables.cc to octave namespace John W. Eaton <jwe@octave.org> parents: 29982 diff changeset	3682 "optimize_permutation_matrix");
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3683 }
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3684
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3685 /*
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3686 %!function p = __test_dpm__ (dpm)
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3687 %! optimize_permutation_matrix (dpm, "local");
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3688 %! [~, ~, p] = lu ([1,2;3,4]);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3689 %!endfunction
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3690
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3691 %!assert (typeinfo (__test_dpm__ (true)), "permutation matrix")
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3692 %!assert (typeinfo (__test_dpm__ (false)), "matrix")
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3693 */
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3694
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3695 DEFUN (optimize_diagonal_matrix, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3696 doc: /* -- texinfo --
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3697 @deftypefn {} {@var{val} =} optimize_diagonal_matrix ()
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3698 @deftypefnx {} {@var{old_val} =} optimize_diagonal_matrix (@var{new_val})
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3699 @deftypefnx {} {} optimize_diagonal_matrix (@var{new_val}, "local")
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3700 Query or set whether a special space-efficient format is used for storing
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3701 diagonal matrices.
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3702
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3703 The default value is true. If this option is set to false, Octave will store
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3704 diagonal matrices as full matrices.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3705
29929 a3ac00db296b doc: disable_diagonal_matrix, disable_diagonal_matrix, and disable_range (patch #10089). José Luis García Pallero <jgpallero@gmail.com> parents: 29654 diff changeset	3706 When called from inside a function with the @qcode{"local"} option, the setting
30354 c980f938fdd8 doc: grammarcheck C++ files in libinterp/ directory ahead of 7.1 release. Rik <rik@octave.org> parents: 30232 diff changeset	3707 is changed locally for the function and any subroutines it calls. The original
29929 a3ac00db296b doc: disable_diagonal_matrix, disable_diagonal_matrix, and disable_range (patch #10089). José Luis García Pallero <jgpallero@gmail.com> parents: 29654 diff changeset	3708 setting is restored when exiting the function.
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3709 @seealso{optimize_range, optimize_permutation_matrix}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3710 @end deftypefn */)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3711 {
30001 428cccc75cc9 move most functions in variables.cc to octave namespace John W. Eaton <jwe@octave.org> parents: 29982 diff changeset	3712 return set_internal_variable (Voptimize_diagonal_matrix, args, nargout,
428cccc75cc9 move most functions in variables.cc to octave namespace John W. Eaton <jwe@octave.org> parents: 29982 diff changeset	3713 "optimize_diagonal_matrix");
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3714 }
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3715
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3716 /*
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3717 %!function [x, xi, fx, fxi] = __test_ddm__ (ddm)
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3718 %! optimize_diagonal_matrix (ddm, "local");
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3719 %! x = eye (2);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3720 %! xi = x*i;
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3721 %! fx = single (x);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3722 %! fxi = single (xi);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3723 %!endfunction
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3724
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3725 %!shared x, xi, fx, fxi
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3726 %! [x, xi, fx, fxi] = __test_ddm__ (true);
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3727 %!assert (typeinfo (x), "diagonal matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3728 %!assert (typeinfo (xi), "complex diagonal matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3729 %!assert (typeinfo (fx), "float diagonal matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3730 %!assert (typeinfo (fxi), "float complex diagonal matrix")
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3731
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3732 %!shared x, xi, fx, fxi
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3733 %! [x, xi, fx, fxi] = __test_ddm__ (false);
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3734 %!assert (typeinfo (x), "matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3735 %!assert (typeinfo (xi), "complex matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3736 %!assert (typeinfo (fx), "float matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3737 %!assert (typeinfo (fxi), "float complex matrix")
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3738 */
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3739
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3740 DEFUN (optimize_range, args, nargout,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3741 doc: /* -- texinfo --
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3742 @deftypefn {} {@var{val} =} optimize_range ()
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3743 @deftypefnx {} {@var{old_val} =} optimize_range (@var{new_val})
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3744 @deftypefnx {} {} optimize_range (@var{new_val}, "local")
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3745 Query or set whether a special space-efficient format is used for storing
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3746 ranges.
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3747
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3748 The default value is true. If this option is set to false, Octave will store
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3749 ranges as full matrices.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3750
29929 a3ac00db296b doc: disable_diagonal_matrix, disable_diagonal_matrix, and disable_range (patch #10089). José Luis García Pallero <jgpallero@gmail.com> parents: 29654 diff changeset	3751 When called from inside a function with the @qcode{"local"} option, the setting
a3ac00db296b doc: disable_diagonal_matrix, disable_diagonal_matrix, and disable_range (patch #10089). José Luis García Pallero <jgpallero@gmail.com> parents: 29654 diff changeset	3752 is changed locally for the function and any subroutines it calls. The original
a3ac00db296b doc: disable_diagonal_matrix, disable_diagonal_matrix, and disable_range (patch #10089). José Luis García Pallero <jgpallero@gmail.com> parents: 29654 diff changeset	3753 setting is restored when exiting the function.
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3754 @seealso{optimize_diagonal_matrix, optimize_permutation_matrix}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3755 @end deftypefn */)
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3756 {
30001 428cccc75cc9 move most functions in variables.cc to octave namespace John W. Eaton <jwe@octave.org> parents: 29982 diff changeset	3757 return set_internal_variable (Voptimize_range, args, nargout,
428cccc75cc9 move most functions in variables.cc to octave namespace John W. Eaton <jwe@octave.org> parents: 29982 diff changeset	3758 "optimize_range");
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3759 }
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3760
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3761 /*
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3762 %!function r = __test_dr__ (dr)
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3763 %! optimize_range (dr, "local");
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3764 %! ## Constant folding will produce range for 1:13.
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3765 %! base = 1;
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3766 %! limit = 13;
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3767 %! r = base:limit;
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3768 %!endfunction
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3769
29982 605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3770 %!assert (typeinfo (__test_dr__ (true)), "range")
605275522c37 Deprecate disable_range, disable_diagonal_matrix, disable_permutation_matrix. Rik <rik@octave.org> parents: 29960 diff changeset	3771 %!assert (typeinfo (__test_dr__ (false)), "matrix")
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3772 */
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29954 diff changeset	3773
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29954 diff changeset	3774 OCTAVE_NAMESPACE_END

Mercurial > octave

annotate libinterp/octave-value/ov.cc @ 30423:e658f400a30e stable