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

annotate libinterp/octave-value/ov.cc @ 22283:564203123065

move single and double type conversion functions to ov.cc * ov.h, ov.cc (octave_value::as_double, octave_value::as_double): New functions. (Fdouble): Move here from ov-re-mat.cc. (Fsingle): Move here from ov-flt-re-mat.cc. * ov-type-conv.h (octave_type_conv): New template function, replaces OCTAVE_TYPE_CONV_BODY3 macro. Change all uses. (OCTAVE_TYPE_CONV_BODY): Simplify.

author	John W. Eaton <jwe@octave.org>
date	Sat, 13 Aug 2016 17:49:18 -0400
parents	e43d83253e28
children	8b18f46f6427

rev	line source
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1 /*
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19598 diff changeset	3 Copyright (C) 1996-2015 John W. Eaton
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10871 diff changeset	4 Copyright (C) 2009-2010 VZLU Prague
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	5
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	7
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6867 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6867 diff changeset	11 option) any later version.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	12
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	16 for more details.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	17
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6867 diff changeset	19 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6867 diff changeset	20 <http://www.gnu.org/licenses/>.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	21
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	22 */
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21295 diff changeset	25 # include "config.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	26 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	27
4970 25c2664861bc [project @ 2004-09-08 05:02:32 by jwe] jwe parents: 4966 diff changeset	28 #include "data-conv.h"
25c2664861bc [project @ 2004-09-08 05:02:32 by jwe] jwe parents: 4966 diff changeset	29 #include "quit.h"
2942 026f342c2019 [project @ 1997-05-08 02:20:57 by jwe] jwe parents: 2909 diff changeset	30 #include "str-vec.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	31
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	32 #include "ovl.h"
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	33 #include "oct-stream.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	34 #include "ov.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	35 #include "ov-base.h"
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	36 #include "ov-bool.h"
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	37 #include "ov-bool-mat.h"
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3340 diff changeset	38 #include "ov-cell.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	39 #include "ov-scalar.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	40 #include "ov-float.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	41 #include "ov-re-mat.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	42 #include "ov-flt-re-mat.h"
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	43 #include "ov-re-diag.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	44 #include "ov-flt-re-diag.h"
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	45 #include "ov-perm.h"
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	46 #include "ov-bool-sparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	47 #include "ov-cx-sparse.h"
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	48 #include "ov-re-sparse.h"
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	49 #include "ov-int8.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	50 #include "ov-int16.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	51 #include "ov-int32.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	52 #include "ov-int64.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	53 #include "ov-uint8.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	54 #include "ov-uint16.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	55 #include "ov-uint32.h"
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	56 #include "ov-uint64.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	57 #include "ov-complex.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	58 #include "ov-flt-complex.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	59 #include "ov-cx-mat.h"
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	60 #include "ov-flt-cx-mat.h"
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	61 #include "ov-cx-diag.h"
8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	62 #include "ov-flt-cx-diag.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	63 #include "ov-ch-mat.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	64 #include "ov-str-mat.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	65 #include "ov-range.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	66 #include "ov-struct.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	67 #include "ov-class.h"
15037 56b8eb7c9c04 improvements in parsing classdef John W. Eaton <jwe@octave.org> parents: 14861 diff changeset	68 #include "ov-classdef.h"
14015 77adde2e79ac fix include file name John W. Eaton <jwe@octave.org> parents: 14013 diff changeset	69 #include "ov-oncleanup.h"
3977 95663a3a2682 [project @ 2002-07-05 17:43:37 by jwe] jwe parents: 3961 diff changeset	70 #include "ov-cs-list.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	71 #include "ov-colon.h"
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	72 #include "ov-builtin.h"
4649 f7ce581b27fb [project @ 2003-11-23 21:46:44 by jwe] jwe parents: 4645 diff changeset	73 #include "ov-dld-fcn.h"
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	74 #include "ov-usr-fcn.h"
4342 813effe14ee1 [project @ 2003-02-20 08:35:55 by jwe] jwe parents: 4276 diff changeset	75 #include "ov-fcn-handle.h"
4966 91b61d27b9b4 [project @ 2004-09-07 02:01:22 by jwe] jwe parents: 4965 diff changeset	76 #include "ov-fcn-inline.h"
22283 564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	77 #include "ov-type-conv.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	78 #include "ov-typeinfo.h"
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	79 #include "ov-null-mat.h"
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	80 #include "ov-lazy-idx.h"
15754 bf77f7f66bdf register octave_java type at Octave startup John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	81 #include "ov-java.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	82
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	83 #include "defun.h"
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	84 #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	85 #include "errwarn.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	86 #include "pager.h"
4005 fc000ebb19df [project @ 2002-07-25 21:01:16 by jwe] jwe parents: 3977 diff changeset	87 #include "parse.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	88 #include "pr-output.h"
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	89 #include "symtab.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	90 #include "utils.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	91 #include "variables.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	92
2477 3d905d3820a4 [project @ 1996-11-07 16:46:11 by jwe] jwe parents: 2475 diff changeset	93 // 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	94 // make the grow_size large.
3d905d3820a4 [project @ 1996-11-07 16:46:11 by jwe] jwe parents: 2475 diff changeset	95
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	96 // If TRUE, don't create special diagonal matrix objects.
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	97
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	98 static bool Vdisable_diagonal_matrix = false;
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	99
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	100 // If TRUE, don't create special permutation matrix objects.
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	101
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	102 static bool Vdisable_permutation_matrix = false;
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	103
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	104 // If TRUE, don't create special range objects.
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	105
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	106 static bool Vdisable_range = false;
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	107
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5759 diff changeset	108 // FIXME
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	109
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	110 // Octave's value type.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	111
21573 f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	112 octave_base_value *
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	113 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	114 {
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	115 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	116 return &nr;
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	117 }
f3f8e1d3e399 avoid mulitple definitions of static function-scope vars (bug #47372) John W. Eaton <jwe@octave.org> parents: 20163 diff changeset	118
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	119 std::string
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	120 octave_value::unary_op_as_string (unary_op op)
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	121 {
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	122 switch (op)
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	123 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	124 case op_not:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	125 return "!";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	126
4965 c0d8e8afa82f [project @ 2004-09-06 20:19:57 by jwe] jwe parents: 4944 diff changeset	127 case op_uplus:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	128 return "+";
4965 c0d8e8afa82f [project @ 2004-09-06 20:19:57 by jwe] jwe parents: 4944 diff changeset	129
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	130 case op_uminus:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	131 return "-";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	132
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	133 case op_transpose:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	134 return ".'";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	135
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	136 case op_hermitian:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	137 return "'";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	138
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	139 case op_incr:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	140 return "++";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	141
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	142 case op_decr:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	143 return "--";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	144
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	145 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	146 return "<unknown>";
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	147 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	148 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	149
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	150 std::string
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	151 octave_value::unary_op_fcn_name (unary_op op)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	152 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	153 switch (op)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	154 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	155 case op_not:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	156 return "not";
7336 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 case op_uplus:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	159 return "uplus";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	160
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	161 case op_uminus:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	162 return "uminus";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	163
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	164 case op_transpose:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	165 return "transpose";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	166
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	167 case op_hermitian:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	168 return "ctranspose";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	169
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	170 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	171 return "<unknown>";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	172 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	173 }
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 std::string
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	176 octave_value::binary_op_as_string (binary_op op)
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	177 {
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	178 switch (op)
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	179 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	180 case op_add:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	181 return "+";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	182
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	183 case op_sub:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	184 return "-";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	185
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	186 case op_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	187 return "*";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	188
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	189 case op_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	190 return "/";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	191
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	192 case op_pow:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	193 return "^";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	194
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	195 case op_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	196 return "\\";
2903 facd9d10e5c1 [project @ 1997-04-30 03:53:07 by jwe] jwe parents: 2891 diff changeset	197
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	198 case op_lt:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	199 return "<";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	200
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	201 case op_le:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	202 return "<=";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	203
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	204 case op_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	205 return "==";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	206
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	207 case op_ge:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	208 return ">=";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	209
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	210 case op_gt:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	211 return ">";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	212
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	213 case op_ne:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	214 return "!=";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	215
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	216 case op_el_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	217 return ".*";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	218
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	219 case op_el_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	220 return "./";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	221
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	222 case op_el_pow:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	223 return ".^";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	224
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	225 case op_el_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	226 return ".\\";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	227
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	228 case op_el_and:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	229 return "&";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	230
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	231 case op_el_or:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	232 return "\|";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	233
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	234 case op_struct_ref:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	235 return ".";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	236
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	237 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	238 return "<unknown>";
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	239 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	240 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	241
3536 e8fbc8c3d6d9 [project @ 2000-02-02 12:01:00 by jwe] jwe parents: 3534 diff changeset	242 std::string
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	243 octave_value::binary_op_fcn_name (binary_op op)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	244 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	245 switch (op)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	246 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	247 case op_add:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	248 return "plus";
7336 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 case op_sub:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	251 return "minus";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	252
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	253 case op_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	254 return "mtimes";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	255
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	256 case op_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	257 return "mrdivide";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	258
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	259 case op_pow:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	260 return "mpower";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	261
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	262 case op_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	263 return "mldivide";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	264
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	265 case op_lt:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	266 return "lt";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	267
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	268 case op_le:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	269 return "le";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	270
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	271 case op_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	272 return "eq";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	273
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	274 case op_ge:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	275 return "ge";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	276
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	277 case op_gt:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	278 return "gt";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	279
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	280 case op_ne:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	281 return "ne";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	282
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	283 case op_el_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	284 return "times";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	285
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	286 case op_el_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	287 return "rdivide";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	288
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	289 case op_el_pow:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	290 return "power";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	291
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	292 case op_el_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	293 return "ldivide";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	294
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	295 case op_el_and:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	296 return "and";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	297
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	298 case op_el_or:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	299 return "or";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	300
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	301 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	302 return "<unknown>";
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	303 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	304 }
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 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	307 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	308 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	309 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	310 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	311 case op_trans_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	312 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	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 case op_mul_trans:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	315 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	316
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	317 case op_herm_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	318 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	319
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	320 case op_mul_herm:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	321 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	322
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	323 case op_trans_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	324 return "transldiv";
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	325
afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	326 case op_herm_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	327 return "hermldiv";
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	328
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	329 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	330 return "andnot";
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	331
dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	332 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	333 return "ornot";
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	334
dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	335 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	336 return "notand";
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	337
dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	338 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	339 return "notor";
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	340
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	341 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	342 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	343 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	344 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	345
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 std::string
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	347 octave_value::assign_op_as_string (assign_op op)
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	348 {
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	349 switch (op)
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	350 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	351 case op_asn_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	352 return "=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	353
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	354 case op_add_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	355 return "+=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	356
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	357 case op_sub_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	358 return "-=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	359
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	360 case op_mul_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	361 return "*=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	362
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	363 case op_div_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	364 return "/=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	365
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	366 case op_ldiv_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	367 return "\\=";
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	368
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	369 case op_pow_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	370 return "^=";
2903 facd9d10e5c1 [project @ 1997-04-30 03:53:07 by jwe] jwe parents: 2891 diff changeset	371
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	372 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	373 return ".*=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	374
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	375 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	376 return "./=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	377
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	378 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	379 return ".\\=";
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	380
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	381 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	382 return ".^=";
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	383
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	384 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	385 return "&=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	386
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	387 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	388 return "\|=";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	389
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	390 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	391 return "<unknown>";
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	392 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	393 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	394
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	395 octave_value::binary_op
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	396 octave_value::assign_op_to_binary_op (assign_op op)
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	397 {
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	398 switch (op)
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	399 {
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	400 case op_add_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	401 return op_add;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	402
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	403 case op_sub_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	404 return op_sub;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	405
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	406 case op_mul_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	407 return op_mul;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	408
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	409 case op_div_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	410 return op_div;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	411
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	412 case op_ldiv_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	413 return op_ldiv;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	414
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	415 case op_pow_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	416 return op_pow;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	417
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	418 case op_el_mul_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	419 return op_el_mul;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	420
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	421 case op_el_div_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	422 return op_el_div;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	423
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	424 case op_el_ldiv_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	425 return op_el_ldiv;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	426
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	427 case op_el_pow_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	428 return op_el_pow;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	429
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	430 case op_el_and_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	431 return op_el_and;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	432
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	433 case op_el_or_eq:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	434 return op_el_or;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	435
15140 6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	436 default:
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	437 return unknown_binary_op;
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	438 }
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	439 }
6ea86e1d0f5f Support +=, -=, =, ect. in JIT Max Brister <max@2bass.com>* parents: 15057 diff changeset	440
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	441 octave_value::assign_op
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	442 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	443 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	444 switch (op)
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	445 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	446 case op_add:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	447 return op_add_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	448
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	449 case op_sub:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	450 return op_sub_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	451
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	452 case op_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	453 return op_mul_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	454
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	455 case op_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	456 return op_div_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	457
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	458 case op_el_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	459 return op_el_mul_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	460
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	461 case op_el_div:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	462 return op_el_div_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	463
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	464 case op_el_and:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	465 return op_el_and_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	466
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	467 case op_el_or:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	468 return op_el_or_eq;
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	469
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	470 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	471 return unknown_assign_op;
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	472 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	473 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	474
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	475 octave_value::octave_value (short int i)
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	476 : rep (new octave_scalar (i))
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	477 {
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	478 }
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	479
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	480 octave_value::octave_value (unsigned short int i)
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	481 : rep (new octave_scalar (i))
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	482 {
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
4233 ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	485 octave_value::octave_value (int i)
ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	486 : rep (new octave_scalar (i))
ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	487 {
ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	488 }
ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	489
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	490 octave_value::octave_value (unsigned int i)
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	491 : rep (new octave_scalar (i))
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	492 {
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	493 }
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	494
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	495 octave_value::octave_value (long int i)
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	496 : rep (new octave_scalar (i))
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	497 {
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	498 }
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)
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	501 : rep (new octave_scalar (i))
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	502 {
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	503 }
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	504
21354 06d15e4e611a move public data type macros to octave-config.h John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	505 #if defined (OCTAVE_HAVE_LONG_LONG_INT)
4353 ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	506 octave_value::octave_value (long long int i)
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	507 : rep (new octave_scalar (i))
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	508 {
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	509 }
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	510 #endif
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	511
21354 06d15e4e611a move public data type macros to octave-config.h John W. Eaton <jwe@octave.org> parents: 21317 diff changeset	512 #if defined (OCTAVE_HAVE_UNSIGNED_LONG_LONG_INT)
4353 ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	513 octave_value::octave_value (unsigned long long int i)
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	514 : rep (new octave_scalar (i))
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	515 {
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	516 }
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	517 #endif
ea4b8c35ac9d [project @ 2003-02-21 21:04:41 by jwe] jwe parents: 4346 diff changeset	518
21730 30c53770f47e use namespace for system time classes John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	519 octave_value::octave_value (octave::sys::time t)
7065 97db94ae2cf0 [project @ 2007-10-25 05:50:55 by jwe] jwe parents: 7064 diff changeset	520 : rep (new octave_scalar (t.double_value ()))
4254 df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	521 {
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	522 }
df5f2e433a11 [project @ 2002-12-31 19:43:07 by jwe] jwe parents: 4247 diff changeset	523
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	524 octave_value::octave_value (double d)
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	525 : rep (new octave_scalar (d))
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	526 {
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	527 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	528
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	529 octave_value::octave_value (float d)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	530 : rep (new octave_float_scalar (d))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	531 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	532 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	533
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4584 diff changeset	534 octave_value::octave_value (const Cell& c, bool is_csl)
5477 9e59c91ddc99 [project @ 2005-09-30 05:26:38 by jwe] jwe parents: 5354 diff changeset	535 : rep (is_csl
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	536 ? dynamic_cast<octave_base_value *> (new octave_cs_list (c))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	537 : dynamic_cast<octave_base_value *> (new octave_cell (c)))
3351 8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3340 diff changeset	538 {
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3340 diff changeset	539 }
8623649c967c [project @ 1999-11-15 16:17:01 by jwe] jwe parents: 3340 diff changeset	540
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	541 octave_value::octave_value (const Array<octave_value>& a, bool is_csl)
5477 9e59c91ddc99 [project @ 2005-09-30 05:26:38 by jwe] jwe parents: 5354 diff changeset	542 : rep (is_csl
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	543 ? dynamic_cast<octave_base_value *> (new octave_cs_list (Cell (a)))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	544 : dynamic_cast<octave_base_value *> (new octave_cell (Cell (a))))
5147 47e4c91e5799 [project @ 2005-02-16 21:06:19 by jwe] jwe parents: 5146 diff changeset	545 {
47e4c91e5799 [project @ 2005-02-16 21:06:19 by jwe] jwe parents: 5146 diff changeset	546 }
47e4c91e5799 [project @ 2005-02-16 21:06:19 by jwe] jwe parents: 5146 diff changeset	547
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	548 octave_value::octave_value (const Matrix& m, const MatrixType& t)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	549 : rep (new octave_matrix (m, t))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	550 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	551 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	552 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	553
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	554 octave_value::octave_value (const FloatMatrix& m, const MatrixType& t)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	555 : rep (new octave_float_matrix (m, t))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	556 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	557 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	558 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	559
4507 65f47f8a92a2 [project @ 2003-09-10 15:48:02 by jwe] jwe parents: 4505 diff changeset	560 octave_value::octave_value (const NDArray& a)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	561 : rep (new octave_matrix (a))
4478 7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	562 {
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	563 maybe_mutate ();
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	564 }
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	565
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	566 octave_value::octave_value (const FloatNDArray& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	567 : rep (new octave_float_matrix (a))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	568 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	569 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	570 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	571
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	572 octave_value::octave_value (const Array<double>& a)
4911 14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	573 : rep (new octave_matrix (a))
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	574 {
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	575 maybe_mutate ();
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	576 }
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	577
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	578 octave_value::octave_value (const Array<float>& a)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	579 : rep (new octave_float_matrix (a))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	580 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	581 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	582 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	583
15428 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<double>& d)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	585 : rep (Vdisable_diagonal_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	586 ? dynamic_cast<octave_base_value *> (new octave_matrix (Matrix (d)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	587 : dynamic_cast<octave_base_value *> (new octave_diag_matrix (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<float>& d)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	593 : rep (Vdisable_diagonal_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	594 ? dynamic_cast<octave_base_value *> (new octave_float_matrix (FloatMatrix (d)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	595 : dynamic_cast<octave_base_value *> (new octave_float_diag_matrix (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<Complex>& d)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	601 : rep (Vdisable_diagonal_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	602 ? dynamic_cast<octave_base_value *> (new octave_complex_matrix (ComplexMatrix (d)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	603 : dynamic_cast<octave_base_value *> (new octave_complex_diag_matrix (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
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	608 octave_value::octave_value (const DiagArray2<FloatComplex>& d)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	609 : rep (Vdisable_diagonal_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	610 ? dynamic_cast<octave_base_value *> (new octave_float_complex_matrix (FloatComplexMatrix (d)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	611 : dynamic_cast<octave_base_value *> (new octave_float_complex_diag_matrix (d)))
15428 fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	612 {
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	613 maybe_mutate ();
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	614 }
fd5c0159b588 Fix diag handling of diagvectors (bug #37411) Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 14138 diff changeset	615
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	616 octave_value::octave_value (const DiagMatrix& d)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	617 : rep (Vdisable_diagonal_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	618 ? dynamic_cast<octave_base_value *> (new octave_matrix (Matrix (d)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	619 : dynamic_cast<octave_base_value *> (new octave_diag_matrix (d)))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	620 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	621 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	622 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	623
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	624 octave_value::octave_value (const FloatDiagMatrix& d)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	625 : rep (Vdisable_diagonal_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	626 ? dynamic_cast<octave_base_value *> (new octave_float_matrix (FloatMatrix (d)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	627 : dynamic_cast<octave_base_value *> (new octave_float_diag_matrix (d)))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	628 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	629 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	630 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	631
3418 ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	632 octave_value::octave_value (const RowVector& v)
ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	633 : rep (new octave_matrix (v))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	634 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	635 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	636 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	637
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	638 octave_value::octave_value (const FloatRowVector& v)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	639 : rep (new octave_float_matrix (v))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	640 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	641 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	642 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	643
3418 ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	644 octave_value::octave_value (const ColumnVector& v)
ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	645 : rep (new octave_matrix (v))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	646 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	647 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	648 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	649
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	650 octave_value::octave_value (const FloatColumnVector& v)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	651 : rep (new octave_float_matrix (v))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	652 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	653 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	654 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	655
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	656 octave_value::octave_value (const Complex& C)
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	657 : rep (new octave_complex (C))
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	658 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	659 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	660 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	661
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	662 octave_value::octave_value (const FloatComplex& C)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	663 : rep (new octave_float_complex (C))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	664 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	665 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	666 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	667
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	668 octave_value::octave_value (const ComplexMatrix& m, const MatrixType& t)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	669 : rep (new octave_complex_matrix (m, t))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	670 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	671 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	672 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	673
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	674 octave_value::octave_value (const FloatComplexMatrix& m, const MatrixType& t)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	675 : rep (new octave_float_complex_matrix (m, t))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	676 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	677 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	678 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	679
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	680 octave_value::octave_value (const ComplexNDArray& a)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	681 : rep (new octave_complex_matrix (a))
4478 7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	682 {
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	683 maybe_mutate ();
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	684 }
7afd4bf05aa8 [project @ 2003-07-30 19:15:31 by jwe] jwe parents: 4461 diff changeset	685
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	686 octave_value::octave_value (const FloatComplexNDArray& a)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	687 : rep (new octave_float_complex_matrix (a))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	688 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	689 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	690 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	691
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	692 octave_value::octave_value (const Array<Complex>& a)
4911 14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	693 : rep (new octave_complex_matrix (a))
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	694 {
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	695 maybe_mutate ();
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	696 }
14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4901 diff changeset	697
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	698 octave_value::octave_value (const Array<FloatComplex>& a)
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	699 : rep (new octave_float_complex_matrix (a))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	700 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	701 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	702 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	703
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	704 octave_value::octave_value (const ComplexDiagMatrix& d)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	705 : rep (Vdisable_diagonal_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	706 ? dynamic_cast<octave_base_value *> (new octave_complex_matrix (ComplexMatrix (d)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	707 : dynamic_cast<octave_base_value *> (new octave_complex_diag_matrix (d)))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	708 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	709 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	710 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	711
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	712 octave_value::octave_value (const FloatComplexDiagMatrix& d)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	713 : rep (Vdisable_diagonal_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	714 ? dynamic_cast<octave_base_value *> (new octave_float_complex_matrix (FloatComplexMatrix (d)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	715 : dynamic_cast<octave_base_value *> (new octave_float_complex_diag_matrix (d)))
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	716 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	717 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	718 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	719
3418 ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	720 octave_value::octave_value (const ComplexRowVector& v)
ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	721 : rep (new octave_complex_matrix (v))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	722 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	723 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	724 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	725
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	726 octave_value::octave_value (const FloatComplexRowVector& v)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	727 : rep (new octave_float_complex_matrix (v))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	728 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	729 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	730 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	731
3418 ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	732 octave_value::octave_value (const ComplexColumnVector& v)
ca92c9d3f882 [project @ 2000-01-12 03:07:47 by jwe] jwe parents: 3373 diff changeset	733 : rep (new octave_complex_matrix (v))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	734 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	735 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	736 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	737
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	738 octave_value::octave_value (const FloatComplexColumnVector& v)
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	739 : rep (new octave_float_complex_matrix (v))
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	740 {
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	741 maybe_mutate ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	742 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	743
8960 93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	744 octave_value::octave_value (const PermMatrix& p)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	745 : rep (Vdisable_permutation_matrix
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	746 ? dynamic_cast<octave_base_value *> (new octave_matrix (Matrix (p)))
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	747 : dynamic_cast<octave_base_value *> (new octave_perm_matrix (p)))
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	748 {
8960 93f18f166aba remove float perm matrices Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	749 maybe_mutate ();
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	750 }
445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	751
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	752 octave_value::octave_value (bool b)
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	753 : rep (new octave_bool (b))
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	754 {
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	755 }
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	756
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	757 octave_value::octave_value (const boolMatrix& bm, const MatrixType& t)
6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	758 : rep (new octave_bool_matrix (bm, t))
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	759 {
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	760 maybe_mutate ();
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	761 }
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	762
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	763 octave_value::octave_value (const boolNDArray& bnda)
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	764 : rep (new octave_bool_matrix (bnda))
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	765 {
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	766 maybe_mutate ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	767 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	768
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	769 octave_value::octave_value (const Array<bool>& bnda)
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	770 : rep (new octave_bool_matrix (bnda))
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	771 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	772 maybe_mutate ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	773 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	774
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	775 octave_value::octave_value (char c, char type)
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	776 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	777 ? new octave_char_matrix_dq_str (c)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	778 : new octave_char_matrix_sq_str (c))
3189 bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3018 diff changeset	779 {
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3018 diff changeset	780 maybe_mutate ();
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3018 diff changeset	781 }
bef7b73c0724 [project @ 1998-10-16 18:05:26 by jwe] jwe parents: 3018 diff changeset	782
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	783 octave_value::octave_value (const char *s, char type)
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	784 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	785 ? new octave_char_matrix_dq_str (s)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	786 : new octave_char_matrix_sq_str (s))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	787 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	788 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	789 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	790
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	791 octave_value::octave_value (const std::string& s, char type)
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	792 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	793 ? new octave_char_matrix_dq_str (s)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	794 : new octave_char_matrix_sq_str (s))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	795 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	796 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	797 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	798
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	799 octave_value::octave_value (const string_vector& s, char type)
bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	800 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	801 ? new octave_char_matrix_dq_str (s)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	802 : new octave_char_matrix_sq_str (s))
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	803 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	804 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	805 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	806
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	807 octave_value::octave_value (const charMatrix& chm, char type)
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	808 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	809 ? new octave_char_matrix_dq_str (chm)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	810 : 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	811 {
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	812 maybe_mutate ();
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	813 }
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	814
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	815 octave_value::octave_value (const charNDArray& chm, char type)
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	816 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	817 ? new octave_char_matrix_dq_str (chm)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	818 : new octave_char_matrix_sq_str (chm))
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	819 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	820 maybe_mutate ();
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	821 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	822
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	823 octave_value::octave_value (const Array<char>& chm, char type)
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	824 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	825 ? new octave_char_matrix_dq_str (chm)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	826 : new octave_char_matrix_sq_str (chm))
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4507 diff changeset	827 {
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	828 maybe_mutate ();
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	829 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	830
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	831 octave_value::octave_value (const charMatrix& chm, bool, char type)
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	832 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	833 ? new octave_char_matrix_dq_str (chm)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	834 : 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	835 {
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	836 maybe_mutate ();
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	837 }
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	838
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	839 octave_value::octave_value (const charNDArray& chm, bool, char type)
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	840 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	841 ? new octave_char_matrix_dq_str (chm)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	842 : 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	843 {
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	844 maybe_mutate ();
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	845 }
34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	846
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	847 octave_value::octave_value (const Array<char>& chm, bool, char type)
9689 34d6f005db4b eliminate is_string argument from octave_value character array constructors John W. Eaton <jwe@octave.org> parents: 9661 diff changeset	848 : rep (type == '"'
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	849 ? new octave_char_matrix_dq_str (chm)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	850 : new octave_char_matrix_sq_str (chm))
4997 d117a9fb83be [project @ 2004-09-15 20:49:21 by jwe] jwe parents: 4994 diff changeset	851 {
d117a9fb83be [project @ 2004-09-15 20:49:21 by jwe] jwe parents: 4994 diff changeset	852 maybe_mutate ();
d117a9fb83be [project @ 2004-09-15 20:49:21 by jwe] jwe parents: 4994 diff changeset	853 }
d117a9fb83be [project @ 2004-09-15 20:49:21 by jwe] jwe parents: 4994 diff changeset	854
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	855 octave_value::octave_value (const SparseMatrix& m, const MatrixType &t)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	856 : rep (new octave_sparse_matrix (m, t))
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	857 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	858 maybe_mutate ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	859 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	860
6863 3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	861 octave_value::octave_value (const Sparse<double>& m, const MatrixType &t)
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	862 : rep (new octave_sparse_matrix (m, t))
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	863 {
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	864 maybe_mutate ();
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	865 }
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	866
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	867 octave_value::octave_value (const SparseComplexMatrix& m, const MatrixType &t)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	868 : rep (new octave_sparse_complex_matrix (m, t))
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	869 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	870 maybe_mutate ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	871 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	872
6863 3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	873 octave_value::octave_value (const Sparse<Complex>& m, const MatrixType &t)
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	874 : rep (new octave_sparse_complex_matrix (m, t))
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	875 {
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	876 maybe_mutate ();
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	877 }
3c64128e621c [project @ 2007-09-05 07:52:48 by dbateman] dbateman parents: 6639 diff changeset	878
5785 6b9cec830d72 [project @ 2006-05-03 19:32:46 by dbateman] dbateman parents: 5781 diff changeset	879 octave_value::octave_value (const SparseBoolMatrix& bm, const MatrixType &t)
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	880 : rep (new octave_sparse_bool_matrix (bm, t))
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	881 {
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	882 maybe_mutate ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	883 }
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	884
7433 402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	885 octave_value::octave_value (const Sparse<bool>& bm, const MatrixType &t)
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	886 : rep (new octave_sparse_bool_matrix (bm, t))
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	887 {
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	888 maybe_mutate ();
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	889 }
402168152bb9 [project @ 2008-01-31 18:59:09 by dbateman] dbateman parents: 7336 diff changeset	890
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	891 octave_value::octave_value (const octave_int8& i)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	892 : rep (new octave_int8_scalar (i))
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 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	895 }
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 octave_value::octave_value (const octave_uint8& i)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	898 : rep (new octave_uint8_scalar (i))
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 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	901 }
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 octave_value::octave_value (const octave_int16& i)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	904 : rep (new octave_int16_scalar (i))
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 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	907 }
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 octave_value::octave_value (const octave_uint16& i)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	910 : rep (new octave_uint16_scalar (i))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	911 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	912 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	913 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	914
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	915 octave_value::octave_value (const octave_int32& i)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	916 : rep (new octave_int32_scalar (i))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	917 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	918 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	919 }
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 octave_value::octave_value (const octave_uint32& i)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	922 : rep (new octave_uint32_scalar (i))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	923 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	924 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	925 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	926
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	927 octave_value::octave_value (const octave_int64& i)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	928 : rep (new octave_int64_scalar (i))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	929 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	930 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	931 }
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 octave_value::octave_value (const octave_uint64& i)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	934 : rep (new octave_uint64_scalar (i))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	935 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	936 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	937 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	938
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	939 octave_value::octave_value (const int8NDArray& inda)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	940 : rep (new octave_int8_matrix (inda))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	941 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	942 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	943 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	944
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	945 octave_value::octave_value (const Array<octave_int8>& inda)
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	946 : rep (new octave_int8_matrix (inda))
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	947 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	948 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	949 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	950
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	951 octave_value::octave_value (const uint8NDArray& inda)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	952 : rep (new octave_uint8_matrix (inda))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	953 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	954 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	955 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	956
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	957 octave_value::octave_value (const Array<octave_uint8>& inda)
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	958 : rep (new octave_uint8_matrix (inda))
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	959 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	960 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	961 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	962
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	963 octave_value::octave_value (const int16NDArray& inda)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	964 : rep (new octave_int16_matrix (inda))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	965 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	966 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	967 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	968
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	969 octave_value::octave_value (const Array<octave_int16>& inda)
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	970 : rep (new octave_int16_matrix (inda))
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	971 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	972 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	973 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	974
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	975 octave_value::octave_value (const uint16NDArray& inda)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	976 : rep (new octave_uint16_matrix (inda))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	977 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	978 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	979 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	980
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	981 octave_value::octave_value (const Array<octave_uint16>& inda)
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	982 : rep (new octave_uint16_matrix (inda))
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	983 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	984 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	985 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	986
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	987 octave_value::octave_value (const int32NDArray& inda)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	988 : rep (new octave_int32_matrix (inda))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	989 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	990 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	991 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	992
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	993 octave_value::octave_value (const Array<octave_int32>& inda)
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	994 : rep (new octave_int32_matrix (inda))
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	995 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	996 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	997 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	998
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	999 octave_value::octave_value (const uint32NDArray& inda)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1000 : rep (new octave_uint32_matrix (inda))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1001 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1002 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1003 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1004
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	1005 octave_value::octave_value (const Array<octave_uint32>& inda)
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1006 : rep (new octave_uint32_matrix (inda))
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1007 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1008 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1009 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1010
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1011 octave_value::octave_value (const int64NDArray& inda)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1012 : rep (new octave_int64_matrix (inda))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1013 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1014 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1015 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1016
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	1017 octave_value::octave_value (const Array<octave_int64>& inda)
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1018 : rep (new octave_int64_matrix (inda))
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1019 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1020 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1021 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1022
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1023 octave_value::octave_value (const uint64NDArray& inda)
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1024 : rep (new octave_uint64_matrix (inda))
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1025 {
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1026 maybe_mutate ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1027 }
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	1028
9732 b4fdfee405b5 remove ArrayN<T> + fix nonhom. diag-scalar ops Jaroslav Hajek <highegg@gmail.com> parents: 9728 diff changeset	1029 octave_value::octave_value (const Array<octave_uint64>& inda)
7064 faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1030 : rep (new octave_uint64_matrix (inda))
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1031 {
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1032 maybe_mutate ();
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1033 }
faff87ff9d5a [project @ 2007-10-24 21:09:43 by dbateman] dbateman parents: 7017 diff changeset	1034
9351 e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1035 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	1036 bool cache_index)
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1037 : rep (new octave_matrix (inda, zero_based, cache_index))
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1038 {
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1039 maybe_mutate ();
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1040 }
e2344f4af0cb autocache indices returned from find et al. Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	1041
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1042 octave_value::octave_value (const idx_vector& idx, bool lazy)
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1043 : rep ()
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1044 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1045 double scalar;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1046 Range range;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1047 NDArray array;
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1048 boolNDArray mask;
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1049 idx_vector::idx_class_type idx_class;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1050
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1051 if (lazy)
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1052 {
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1053 // Only make lazy indices out of ranges and index vectors.
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1054 switch (idx.idx_class ())
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1055 {
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1056 case idx_vector::class_range:
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1057 case idx_vector::class_vector:
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1058 rep = new octave_lazy_index (idx);
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1059 maybe_mutate ();
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1060 return;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1061
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1062 default:
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1063 break;
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1064 }
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1065 }
8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1066
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1067 idx.unconvert (idx_class, scalar, range, array, mask);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1068
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1069 switch (idx_class)
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1070 {
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1071 case idx_vector::class_colon:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1072 rep = new octave_magic_colon ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1073 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1074
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1075 case idx_vector::class_range:
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1076 rep = new octave_range (range, idx);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1077 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1078
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1079 case idx_vector::class_scalar:
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1080 rep = new octave_scalar (scalar);
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1081 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1082
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1083 case idx_vector::class_vector:
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1084 rep = new octave_matrix (array, idx);
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1085 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1086
9894 83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1087 case idx_vector::class_mask:
83bd7f34f9da improve idx_vector->octave_value conversion Jaroslav Hajek <highegg@gmail.com> parents: 9879 diff changeset	1088 rep = new octave_bool_matrix (mask, idx);
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1089 break;
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1090
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1091 default:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	1092 panic_impossible ();
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1093 break;
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1094 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1095
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1096 // FIXME: needed?
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1097 maybe_mutate ();
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1098 }
d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1099
9725 aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1100 octave_value::octave_value (const Array<std::string>& cellstr)
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1101 : rep (new octave_cell (cellstr))
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1102 {
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1103 maybe_mutate ();
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1104 }
aea3a3a950e1 implement nth_element Jaroslav Hajek <highegg@gmail.com> parents: 9693 diff changeset	1105
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1106 octave_value::octave_value (double base, double limit, double inc)
2423 de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1107 : rep (new octave_range (base, limit, inc))
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1108 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1109 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1110 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1111
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	1112 octave_value::octave_value (const Range& r, bool force_range)
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	1113 : rep (force_range \|\| ! Vdisable_range
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	1114 ? dynamic_cast<octave_base_value *> (new octave_range (r))
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	1115 : 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	1116 {
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1117 maybe_mutate ();
de430cdd9234 [project @ 1996-10-18 20:39:41 by jwe] jwe parents: 2413 diff changeset	1118 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1119
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1120 octave_value::octave_value (const octave_map& m)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1121 : rep (new octave_struct (m))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1122 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1123 maybe_mutate ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1124 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1125
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1126 octave_value::octave_value (const octave_scalar_map& m)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1127 : rep (new octave_scalar_struct (m))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1128 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1129 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1130
18402 4c064d3d2750 Remove Octave_map class deprecated in 3.8. Rik <rik@octave.org> parents: 18306 diff changeset	1131 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	1132 const std::list<std::string>& plist)
4c064d3d2750 Remove Octave_map class deprecated in 3.8. Rik <rik@octave.org> parents: 18306 diff changeset	1133 : rep (new octave_class (m, id, plist))
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1134 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1135 maybe_mutate ();
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1136 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1137
18402 4c064d3d2750 Remove Octave_map class deprecated in 3.8. Rik <rik@octave.org> parents: 18306 diff changeset	1138 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	1139 const std::list<std::string>& plist)
7dce7e110511 make concatenation of class objects work John W. Eaton <jwe@octave.org> parents: 13101 diff changeset	1140 : rep (new octave_class (m, id, plist))
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1141 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1142 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1143
10232 0efd486813fe remove deprecated list datatype Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1144 octave_value::octave_value (const octave_value_list& l, bool)
0efd486813fe remove deprecated list datatype Jaroslav Hajek <highegg@gmail.com> parents: 10160 diff changeset	1145 : rep (new octave_cs_list (l))
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1146 {
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1147 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1148
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1149 octave_value::octave_value (octave_value::magic_colon)
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1150 : rep (new octave_magic_colon ())
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1151 {
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1152 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1153
9728 70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	1154 octave_value::octave_value (octave_base_value *new_rep, bool borrow)
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1155 : rep (new_rep)
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1156 {
9728 70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	1157 if (borrow)
70925b11ba46 again allow the obsolete syntax for cellfun Jaroslav Hajek <highegg@gmail.com> parents: 9725 diff changeset	1158 rep->count++;
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	1159 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1160
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1161 octave_value::octave_value (octave_base_value *new_rep, int xcount)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1162 : rep (new_rep)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1163 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1164 rep->count = xcount;
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1165 }
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	1166
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	1167 octave_base_value *
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1168 octave_value::clone (void) const
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1169 {
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	1170 return rep->clone ();
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1171 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1172
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1173 void
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1174 octave_value::maybe_mutate (void)
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1175 {
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	1176 octave_base_value *tmp = rep->try_narrowing_conversion ();
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1177
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1178 if (tmp && tmp != rep)
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1179 {
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1180 if (--rep->count == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1181 delete rep;
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1182
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1183 rep = tmp;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1184 }
2409 47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1185 }
47e5f57fb4bd [project @ 1996-10-15 16:44:26 by jwe] jwe parents: 2376 diff changeset	1186
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1187 octave_value
22283 564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1188 octave_value::as_double (void) const
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1189 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1190 if (is_perm_matrix ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1191 return octave_type_conv<octave_perm_matrix, octave_scalar> (*this, "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1192 else if (is_diag_matrix ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1193 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1194 if (is_complex_type ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1195 return octave_type_conv<octave_complex_diag_matrix, octave_complex> (*this, "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1196 else
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1197 return octave_type_conv<octave_diag_matrix, octave_scalar> (*this, "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1198 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1199 else if (is_sparse_type ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1200 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1201 if (is_complex_type ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1202 return octave_type_conv<octave_sparse_complex_matrix, octave_complex> (*this, "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1203 else
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1204 return octave_type_conv<octave_sparse_matrix, octave_scalar> (*this, "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1205 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1206 else if (is_complex_type ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1207 return octave_type_conv<octave_complex_matrix, octave_complex> (*this, "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1208 else
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1209 return octave_type_conv<octave_matrix, octave_scalar> (*this, "double");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1210
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1211 return ovl ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1212 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1213
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1214 DEFUN (double, args, ,
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1215 doc: /* -- texinfo --
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1216 @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	1217 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	1218 @seealso{single}
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1219 @end deftypefn */)
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1220 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1221 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	1222 print_usage ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1223
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1224 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	1225 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1226
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1227 /*
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1228 %!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	1229 %!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	1230 %!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	1231 %!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	1232 %!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	1233 %!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	1234 %!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	1235 %!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	1236 %!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	1237 %!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	1238 %!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	1239 %!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	1240 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1241 %! 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	1242 %! y = double (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1243 %! 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	1244 %! 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	1245 %! assert (issparse (y));
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1246 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1247 %! 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	1248 %! y = double (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1249 %! 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	1250 %! 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	1251 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1252 %! 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	1253 %! y = double (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1254 %! 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	1255 %! 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	1256 */
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1257
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1258 octave_value
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1259 octave_value::as_single (void) const
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1260 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1261 if (is_diag_matrix ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1262 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1263 if (is_complex_type ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1264 return octave_type_conv<octave_float_complex_diag_matrix, octave_float_complex> (*this, "single");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1265 else
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1266 return octave_type_conv<octave_float_diag_matrix, octave_float_scalar> (*this, "single");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1267 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1268 else if (is_sparse_type ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1269 error ("single: sparse type does not support single precision");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1270 else if (is_complex_type ())
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1271 return octave_type_conv<octave_float_complex_matrix, octave_float_complex> (*this, "single");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1272 else
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1273 return octave_type_conv<octave_float_matrix, octave_float_scalar> (*this, "single");
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1274
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1275 return octave_value ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1276 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1277
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1278 DEFUN (single, args, ,
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1279 doc: /* -- texinfo --
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1280 @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	1281 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	1282 @seealso{double}
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1283 @end deftypefn */)
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1284 {
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1285 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	1286 print_usage ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1287
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1288 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	1289
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1290 return ovl ();
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1291 }
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1292
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1293 /*
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1294 %!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	1295 %!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	1296 %!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	1297 %!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	1298 %!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	1299 %!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	1300 %!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	1301 %!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	1302 %!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	1303 %!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	1304 %!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	1305 %!assert (class (single ("A")), "single")
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1306 %!error (single (sparse (1)))
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1307 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1308 %! 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	1309 %! y = single (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1310 %! 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	1311 %! 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	1312 %!test
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1313 %! 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	1314 %! y = single (x);
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1315 %! 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	1316 %! 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	1317 */
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1318
564203123065 move single and double type conversion functions to ov.cc John W. Eaton <jwe@octave.org> parents: 22197 diff changeset	1319 octave_value
4271 be631c1720ea [project @ 2003-01-03 19:36:04 by jwe] jwe parents: 4257 diff changeset	1320 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	1321 const octave_value_list& idx)
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1322 {
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1323 std::list<octave_value_list> i;
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1324
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1325 i.push_back (idx);
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1326
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1327 return rep->subsref (type, i);
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1328 }
fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1329
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	1330 octave_value_list
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1331 octave_value::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1332 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	1333 {
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7503 diff changeset	1334 if (nargout == 1)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1335 return rep->subsref (type, idx);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1336 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1337 return rep->subsref (type, idx, nargout);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1338 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1339
10832 1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1340 octave_value_list
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1341 octave_value::subsref (const std::string& type,
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1342 const std::list<octave_value_list>& idx, int nargout,
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1343 const std::list<octave_lvalue> *lvalue_list)
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1344 {
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1345 if (lvalue_list)
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1346 return rep->subsref (type, idx, nargout, lvalue_list);
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1347 else
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1348 return subsref (type, idx, nargout);
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1349 }
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1350
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1351 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1352 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	1353 const std::list<octave_value_list>& idx,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1354 size_t skip)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1355 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1356 if (idx.size () > skip)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1357 {
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4192 diff changeset	1358 std::list<octave_value_list> new_idx (idx);
4233 ccfdb55c8156 [project @ 2002-12-20 22:43:54 by jwe] jwe parents: 4219 diff changeset	1359 for (size_t i = 0; i < skip; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1360 new_idx.erase (new_idx.begin ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1361 return subsref (type.substr (skip), new_idx);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1362 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1363 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1364 return *this;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1365 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1366
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1367 octave_value_list
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1368 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	1369 const std::list<octave_value_list>& idx,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1370 size_t skip)
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1371 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1372 if (idx.size () > skip)
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1373 {
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1374 std::list<octave_value_list> new_idx (idx);
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1375 for (size_t i = 0; i < skip; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1376 new_idx.erase (new_idx.begin ());
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1377 return subsref (type.substr (skip), new_idx, nargout);
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1378 }
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1379 else
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1380 return *this;
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1381 }
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1382
16091 1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1383 octave_value_list
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1384 octave_value::next_subsref (int nargout, const std::string& type,
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1385 const std::list<octave_value_list>& idx,
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1386 const std::list<octave_lvalue> *lvalue_list,
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1387 size_t skip)
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1388 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1389 if (idx.size () > skip)
16091 1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1390 {
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1391 std::list<octave_value_list> new_idx (idx);
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1392 for (size_t i = 0; i < skip; i++)
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1393 new_idx.erase (new_idx.begin ());
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1394 return subsref (type.substr (skip), new_idx, nargout, lvalue_list);
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1395 }
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1396 else
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1397 return *this;
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1398 }
1785493171ac pass lvalue_list to more subsref calls (bug #38374) John W. Eaton <jwe@octave.org> parents: 15767 diff changeset	1399
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1400 octave_value
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1401 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	1402 const std::list<octave_value_list>& idx,
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1403 size_t skip)
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1404 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1405 if (idx.size () > skip)
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1406 {
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1407 std::list<octave_value_list> new_idx (idx);
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1408 for (size_t i = 0; i < skip; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1409 new_idx.erase (new_idx.begin ());
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1410 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	1411 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1412 else
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1413 return *this;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1414 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8531 diff changeset	1415
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4970 diff changeset	1416 octave_value_list
3544 71bd2d124119 [project @ 2000-02-02 21:02:31 by jwe] jwe parents: 3536 diff changeset	1417 octave_value::do_multi_index_op (int nargout, const octave_value_list& idx)
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	1418 {
3544 71bd2d124119 [project @ 2000-02-02 21:02:31 by jwe] jwe parents: 3536 diff changeset	1419 return rep->do_multi_index_op (nargout, idx);
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	1420 }
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	1421
10832 1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1422 octave_value_list
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1423 octave_value::do_multi_index_op (int nargout, const octave_value_list& idx,
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1424 const std::list<octave_lvalue> *lvalue_list)
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1425 {
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1426 return rep->do_multi_index_op (nargout, idx, lvalue_list);
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1427 }
1b2fcd122c6a allow user detect ignored outputs in m-functions Jaroslav Hajek <highegg@gmail.com> parents: 10768 diff changeset	1428
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1429 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1430 octave_value::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1431 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1432 const octave_value& rhs)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1433 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1434 return rep->subsasgn (type, idx, rhs);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1435 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1436
12171 d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1437 octave_value
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1438 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	1439 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	1440 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	1441 {
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1442 return rep->undef_subsasgn (type, idx, rhs);
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1443 }
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1444
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1445 octave_value&
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	1446 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	1447 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1448 const octave_value& rhs)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1449 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1450 make_unique ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1451
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1452 octave_value t_rhs = rhs;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1453
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1454 if (op != op_asn_eq)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1455 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1456 if (! is_defined ())
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1457 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	1458
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1459 octave_value t = subsref (type, idx);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1460
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1461 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	1462
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1463 t_rhs = do_binary_op (binop, t, rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1464 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1465
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	1466 *this = subsasgn (type, idx, t_rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1467
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1468 return *this;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1469 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1470
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1471 octave_value&
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	1472 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	1473 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	1474 if (op == op_asn_eq)
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	1475 // 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	1476 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	1477 else if (is_defined ())
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	1478 {
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1479 octave_value_typeinfo::assign_op_fcn f = 0;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1480
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1481 // Only attempt to operate in-place if this variable is unshared.
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1482 if (rep->count == 1)
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1483 {
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1484 int tthis = this->type_id ();
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1485 int trhs = rhs.type_id ();
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1486
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1487 f = octave_value_typeinfo::lookup_assign_op (op, tthis, trhs);
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1488 }
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1489
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1490 if (f)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1491 {
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	1492 f (rep, octave_value_list (), rhs.rep);
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	1493 // 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	1494 maybe_mutate ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1495 }
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1496 else
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1497 {
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1498
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1499 binary_op binop = op_eq_to_binary_op (op);
1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1500
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1501 octave_value t = do_binary_op (binop, *this, rhs);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1502
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1503 operator = (t);
9546 1beb23d2b892 optimize op= in common cases Jaroslav Hajek <highegg@gmail.com> parents: 9479 diff changeset	1504 }
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	1505 }
10544 9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1506 else
9961fc022d9d fix assignment to non-existing variables and octave_value::assign Jaroslav Hajek <highegg@gmail.com> parents: 10521 diff changeset	1507 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	1508
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	1509 return *this;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1510 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1511
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	1512 octave_idx_type
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1513 octave_value::length (void) const
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1514 {
10654 984b8b6bee02 simplify octave_value::length Jaroslav Hajek <highegg@gmail.com> parents: 10614 diff changeset	1515 octave_idx_type retval = 0;
984b8b6bee02 simplify octave_value::length Jaroslav Hajek <highegg@gmail.com> parents: 10614 diff changeset	1516
984b8b6bee02 simplify octave_value::length Jaroslav Hajek <highegg@gmail.com> parents: 10614 diff changeset	1517 const dim_vector dv = dims ();
4584 f7697d703481 [project @ 2003-10-31 19:47:35 by jwe] jwe parents: 4582 diff changeset	1518
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	1519 for (int i = 0; i < dv.ndims (); i++)
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1520 {
4584 f7697d703481 [project @ 2003-10-31 19:47:35 by jwe] jwe parents: 4582 diff changeset	1521 if (dv(i) == 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1522 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1523 retval = 0;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1524 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1525 }
4584 f7697d703481 [project @ 2003-10-31 19:47:35 by jwe] jwe parents: 4582 diff changeset	1526
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1527 if (dv(i) > retval)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1528 retval = dv(i);
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1529 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1530
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1531 return retval;
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1532 }
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4532 diff changeset	1533
8346 8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1534 bool
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1535 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	1536 {
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1537 bool retval = false;
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1538
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1539 // 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	1540
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1541 if (rows () == test.rows () && columns () == test.columns ())
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1542 {
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1543 octave_value tmp = do_binary_op (octave_value::op_eq, *this, test);
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1544
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1545 // 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	1546 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	1547 {
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	1548 if (tmp.is_empty ())
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	1549 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	1550 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	1551 {
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	1552 // 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	1553 // 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	1554 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	1555 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	1556 }
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	1557 }
8346 8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1558 }
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1559
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1560 return retval;
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1561 }
8302788f09db fix empty matrix handling in switch statement Jaroslav Hajek <highegg@gmail.com> parents: 8345 diff changeset	1562
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	1563 // 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	1564 // 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	1565
260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1566 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	1567 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	1568 {
21229 a83e7a384ee0 create and install a subset of config.h in octave-config.h John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1569 #if defined (OCTAVE_ENABLE_64)
16323 e769440b39db provide int64 extractors for octave_value class John W. Eaton <jwe@octave.org> parents: 16091 diff changeset	1570 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	1571 #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	1572 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	1573 #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	1574 }
260294a5520f octave_value::idx_type_value: move definition to ov.cc from ov.h John W. Eaton <jwe@octave.org> parents: 8011 diff changeset	1575
20703 85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1576 Cell
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1577 octave_value::cell_value (void) const
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1578 {
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1579 return rep->cell_value ();
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1580 }
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1581
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1582 octave_map
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1583 octave_value::map_value (void) const
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1584 {
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1585 return rep->map_value ();
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1586 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1587
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1588 octave_scalar_map
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1589 octave_value::scalar_map_value (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1590 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1591 return rep->scalar_map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1592 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10687 diff changeset	1593
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	1594 octave_function *
7761 5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1595 octave_value::function_value (bool silent) const
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1596 {
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1597 return rep->function_value (silent);
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1598 }
5adeea5de26c symbol table reporting functions John W. Eaton <jwe@octave.org> parents: 7719 diff changeset	1599
4700 ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1600 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	1601 octave_value::user_function_value (bool silent) const
4700 ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1602 {
ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1603 return rep->user_function_value (silent);
ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1604 }
ca3a1d687bba [project @ 2004-01-21 03:28:31 by jwe] jwe parents: 4661 diff changeset	1605
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	1606 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	1607 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	1608 {
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	1609 return rep->user_script_value (silent);
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	1610 }
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	1611
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	1612 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	1613 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	1614 {
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	1615 return rep->user_code_value (silent);
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	1616 }
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	1617
4346 d39de791ef9c [project @ 2003-02-20 21:38:39 by jwe] jwe parents: 4343 diff changeset	1618 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	1619 octave_value::fcn_handle_value (bool silent) const
4343 db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: 4342 diff changeset	1620 {
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: 4342 diff changeset	1621 return rep->fcn_handle_value (silent);
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: 4342 diff changeset	1622 }
db5e0814277a [project @ 2003-02-20 16:44:16 by jwe] jwe parents: 4342 diff changeset	1623
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1624 octave_fcn_inline *
10075 84b0725f4b09 return class types by reference in const Array element access functions Jaroslav Hajek <highegg@gmail.com> parents: 10033 diff changeset	1625 octave_value::fcn_inline_value (bool silent) const
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1626 {
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1627 return rep->fcn_inline_value (silent);
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1628 }
cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4930 diff changeset	1629
2880 0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1630 octave_value_list
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1631 octave_value::list_value (void) const
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1632 {
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1633 return rep->list_value ();
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1634 }
0a076230ca87 [project @ 1997-04-24 09:47:41 by jwe] jwe parents: 2847 diff changeset	1635
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1636 static dim_vector
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1637 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	1638 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	1639 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1640 dim_vector retval (dv);
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1641 retval.chop_trailing_singletons ();
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1642 octave_idx_type nel = dv.numel ();
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1643
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21574 diff changeset	1644 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	1645 {
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20940 diff changeset	1646 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	1647 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	1648 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	1649 retval = dim_vector (nel, 1);
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1650 }
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1651
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1652 return retval;
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1653 }
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1654
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1655 ColumnVector
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1656 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	1657 bool frc_vec_conv) const
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1658 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1659 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	1660 frc_vec_conv));
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1661 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1662
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1663 ComplexColumnVector
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1664 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	1665 bool frc_vec_conv) const
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1666 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1667 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	1668 frc_vec_conv));
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1669 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1670
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1671 RowVector
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1672 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	1673 bool frc_vec_conv) const
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1674 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1675 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	1676 frc_vec_conv));
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1677 }
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1678
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1679 ComplexRowVector
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1680 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	1681 bool frc_vec_conv) const
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1682 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1683 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	1684 frc_vec_conv));
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1685 }
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1686
e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1687 Array<double>
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1688 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	1689 bool force_vector_conversion) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1690 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1691 Array<double> retval = array_value (force_string_conv);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1692
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1693 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	1694 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1695 type_name (), "real vector"));
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1696 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1697
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	1698 template <typename T>
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1699 static Array<int>
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1700 convert_to_int_array (const Array<octave_int<T> >& A)
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1701 {
7999 f7f2d867c523 style fixes John W. Eaton <jwe@octave.org> parents: 7997 diff changeset	1702 Array<int> retval (A.dims ());
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1703 octave_idx_type n = A.numel ();
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1704
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1705 for (octave_idx_type i = 0; i < n; i++)
7999 f7f2d867c523 style fixes John W. Eaton <jwe@octave.org> parents: 7997 diff changeset	1706 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	1707
7999 f7f2d867c523 style fixes John W. Eaton <jwe@octave.org> parents: 7997 diff changeset	1708 return retval;
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1709 }
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1710
4044 9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1711 Array<int>
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1712 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	1713 bool force_vector_conversion) const
4044 9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1714 {
9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1715 Array<int> retval;
9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1716
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1717 if (is_integer_type ())
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1718 {
7997 2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1719 if (is_int32_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1720 retval = convert_to_int_array (int32_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1721 else if (is_int64_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1722 retval = convert_to_int_array (int64_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1723 else if (is_int16_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1724 retval = convert_to_int_array (int16_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1725 else if (is_int8_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1726 retval = convert_to_int_array (int8_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1727 else if (is_uint32_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1728 retval = convert_to_int_array (uint32_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1729 else if (is_uint64_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1730 retval = convert_to_int_array (uint64_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1731 else if (is_uint16_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1732 retval = convert_to_int_array (uint16_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1733 else if (is_uint8_type ())
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1734 retval = convert_to_int_array (uint8_array_value ());
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1735 else
2b8952e133c9 implement checked conversions between integers Jaroslav Hajek <highegg@gmail.com> parents: 7892 diff changeset	1736 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	1737 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1738 else
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1739 {
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1740 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	1741
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1742 if (require_int)
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1743 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1744 retval.resize (a.dims ());
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1745 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	1746 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1747 double ai = a.elem (i);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1748 int v = static_cast<int> (ai);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1749 if (ai == v)
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1750 retval.xelem (i) = v;
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1751 else
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1752 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1753 error_with_cfn ("conversion to integer value failed");
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1754 break;
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1755 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1756 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1757 }
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1758 else
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1759 retval = Array<int> (a);
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1760 }
7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1761
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1762 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	1763 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1764 type_name (), "integer vector"));
4044 9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1765 }
9678c5526190 [project @ 2002-08-15 16:54:55 by jwe] jwe parents: 4038 diff changeset	1766
21139 538b57866b90 consistently use "typename" intead of "class" in template declarations John W. Eaton <jwe@octave.org> parents: 21129 diff changeset	1767 template <typename T>
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1768 static Array<octave_idx_type>
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1769 convert_to_octave_idx_type_array (const Array<octave_int<T> >& A)
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1770 {
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1771 Array<octave_idx_type> retval (A.dims ());
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1772 octave_idx_type n = A.numel ();
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1773
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1774 for (octave_idx_type i = 0; i < n; i++)
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1775 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	1776
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1777 return retval;
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1778 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1779
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1780 Array<octave_idx_type>
9479 d9716e3ee0dd supply optimized compiled sub2ind & ind2sub Jaroslav Hajek <highegg@gmail.com> parents: 9368 diff changeset	1781 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	1782 bool force_string_conv,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	1783 bool force_vector_conversion) const
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1784 {
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1785 Array<octave_idx_type> retval;
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1786
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1787 if (is_integer_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1788 {
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1789 if (is_int32_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1790 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	1791 else if (is_int64_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1792 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	1793 else if (is_int16_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1794 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	1795 else if (is_int8_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1796 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	1797 else if (is_uint32_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1798 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	1799 else if (is_uint64_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1800 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	1801 else if (is_uint16_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1802 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	1803 else if (is_uint8_type ())
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1804 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	1805 else
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1806 retval = array_value (force_string_conv);
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1807 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1808 else
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1809 {
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1810 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	1811
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1812 if (require_int)
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1813 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1814 retval.resize (a.dims ());
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1815 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	1816 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1817 double ai = a.elem (i);
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1818 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	1819 if (ai == v)
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1820 retval.xelem (i) = v;
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1821 else
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1822 {
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1823 error_with_cfn ("conversion to integer value failed");
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1824 break;
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1825 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1826 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1827 }
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1828 else
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1829 retval = Array<octave_idx_type> (a);
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1830 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1831
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1832 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	1833 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1834 type_name (), "integer vector"));
8811 20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1835 }
20dfb885f877 int -> octave_idx fixes John W. Eaton <jwe@octave.org> parents: 8551 diff changeset	1836
3419 e71b3d1dd327 [project @ 2000-01-12 05:23:34 by jwe] jwe parents: 3418 diff changeset	1837 Array<Complex>
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1838 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	1839 bool force_vector_conversion) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1840 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1841 Array<Complex> retval = complex_array_value (force_string_conv);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1842
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1843 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	1844 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1845 type_name (), "complex vector"));
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1846 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1847
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1848 FloatColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1849 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	1850 bool frc_vec_conv) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1851 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1852 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	1853 frc_vec_conv));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1854 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1855
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1856 FloatComplexColumnVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1857 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	1858 bool frc_vec_conv) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1859 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1860 return
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1861 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	1862 frc_vec_conv));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1863 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1864
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1865 FloatRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1866 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	1867 bool frc_vec_conv) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1868 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1869 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	1870 frc_vec_conv));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1871 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1872
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1873 FloatComplexRowVector
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1874 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	1875 bool frc_vec_conv) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1876 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1877 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	1878 frc_vec_conv));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1879 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1880
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1881 Array<float>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1882 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	1883 bool force_vector_conversion) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1884 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1885 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	1886
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1887 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	1888 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1889 type_name (), "real vector"));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1890 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1891
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1892 Array<FloatComplex>
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1893 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	1894 bool force_vector_conversion) const
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1895 {
7892 7ca2735d74c2 simplify & cleanup octave_value::XXX_vector_value functions Jaroslav Hajek <highegg@gmail.com> parents: 7885 diff changeset	1896 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	1897
20560 56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1898 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	1899 force_vector_conversion,
56fee8f84fe7 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1900 type_name (), "complex vector"));
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1901 }
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	1902
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	1903 // 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	1904 // 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	1905 // 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	1906
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1907 #define XVALUE_EXTRACTOR(TYPE, NAME, FCN) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1908 TYPE \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1909 octave_value::NAME (const char *fmt, ...) const \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1910 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1911 TYPE retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1912 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1913 try \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1914 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1915 retval = FCN (); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1916 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1917 catch (octave_execution_exception& e) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1918 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1919 if (fmt) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1920 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1921 va_list args; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1922 va_start (args, fmt); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1923 verror (e, fmt, args); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1924 va_end (args); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1925 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1926 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1927 throw e; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1928 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1929 \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21990 diff changeset	1930 return retval; \
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	1931 }
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	1932
20703 85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1933 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	1934
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1935 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	1936
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1937 XVALUE_EXTRACTOR (int, xint_value, int_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1938
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1939 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	1940
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1941 XVALUE_EXTRACTOR (int, xnint_value, nint_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1942
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1943 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	1944
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1945 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	1946
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1947 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	1948
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1949 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	1950
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1951 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	1952
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1953 XVALUE_EXTRACTOR (double, xdouble_value, double_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1954 XVALUE_EXTRACTOR (float, xfloat_value, float_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1955
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1956 XVALUE_EXTRACTOR (double, xscalar_value, scalar_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1957 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	1958
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1959 XVALUE_EXTRACTOR (Matrix, xmatrix_value, matrix_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1960 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	1961
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1962 XVALUE_EXTRACTOR (NDArray, xarray_value, array_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1963 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	1964
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1965 XVALUE_EXTRACTOR (Complex, xcomplex_value, complex_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1966 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	1967
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1968 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	1969 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	1970
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1971 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	1972 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	1973
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1974 XVALUE_EXTRACTOR (bool, xbool_value, bool_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1975 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	1976 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	1977
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1978 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	1979 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	1980
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1981 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	1982 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	1983 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	1984
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1985 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	1986 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	1987 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	1988 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	1989
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1990 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	1991
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1992 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	1993 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	1994 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	1995 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	1996
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	1997 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	1998 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	1999 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	2000 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	2001
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2002 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	2003 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	2004 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	2005 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	2006
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2007 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	2008 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	2009 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	2010 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	2011
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2012 XVALUE_EXTRACTOR (std::string, xstring_value, rep->xstring_value)
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20978 diff changeset	2013 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	2014
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2015 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	2016 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	2017
20703 85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2018 XVALUE_EXTRACTOR (Range, xrange_value, range_value)
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2019
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2020 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	2021 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	2022
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2023 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	2024 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	2025
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2026 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	2027 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	2028
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2029 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	2030 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	2031
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2032 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	2033 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	2034
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2035 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	2036 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	2037
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2038 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	2039 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	2040
85e5efae848a eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20700 diff changeset	2041 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	2042 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	2043
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2044 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	2045 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	2046 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	2047 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	2048 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	2049 XVALUE_EXTRACTOR (octave_fcn_inline *, xfcn_inline_value, fcn_inline_value)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2050
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2051 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	2052
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2053 #undef XVALUE_EXTRACTOR
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20687 diff changeset	2054
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2055 octave_value
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2056 octave_value::storable_value (void) const
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2057 {
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2058 octave_value retval = *this;
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2059 if (is_null_value ())
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2060 retval = octave_value (rep->empty_clone ());
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2061 else
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2062 retval.maybe_economize ();
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2063
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2064 return retval;
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2065 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2066
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2067 void
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2068 octave_value::make_storable_value (void)
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2069 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2070 if (is_null_value ())
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2071 {
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2072 octave_base_value *rc = rep->empty_clone ();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2073 if (--rep->count == 0)
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2074 delete rep;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2075 rep = rc;
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2076 }
8523 ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2077 else
ad3afaaa19c1 implement non-copying contiguous range indexing Jaroslav Hajek <highegg@gmail.com> parents: 8367 diff changeset	2078 maybe_economize ();
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2079 }
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2080
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2081 int
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2082 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	2083 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	2084 octave::mach_info::float_format flt_fmt) const
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2085 {
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2086 return rep->write (os, block_size, output_type, skip, flt_fmt);
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2087 }
44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4933 diff changeset	2088
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2089 OCTAVE_NORETURN static void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2090 err_binary_op (const std::string& on, const std::string& tn1,
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2091 const std::string& tn2)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2092 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15428 diff changeset	2093 error ("binary operator '%s' not implemented for '%s' by '%s' operations",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2094 on.c_str (), tn1.c_str (), tn2.c_str ());
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2095 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2096
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2097 OCTAVE_NORETURN static void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2098 err_binary_op_conv (const std::string& on)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2099 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15428 diff changeset	2100 error ("type conversion failed for binary operator '%s'", on.c_str ());
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2101 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2102
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2103 octave_value
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2104 do_binary_op (octave_value::binary_op op,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2105 const octave_value& v1, const octave_value& v2)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2106 {
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2107 octave_value retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2108
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2109 int t1 = v1.type_id ();
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2110 int t2 = v2.type_id ();
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2111
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2112 if (t1 == octave_class::static_type_id ()
18306 122239398a03 Partial support for operator overload in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	2113 \|\| t2 == octave_class::static_type_id ()
122239398a03 Partial support for operator overload in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	2114 \|\| t1 == octave_classdef::static_type_id ()
122239398a03 Partial support for operator overload in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	2115 \|\| t2 == octave_classdef::static_type_id ())
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2116 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2117 octave_value_typeinfo::binary_class_op_fcn f
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2118 = octave_value_typeinfo::lookup_binary_class_op (op);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2119
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2120 if (! f)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2121 err_binary_op (octave_value::binary_op_as_string (op),
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2122 v1.class_name (), v2.class_name ());
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2123
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2124 retval = f (v1, v2);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2125 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2126 else
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2127 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2128 // FIXME: we need to handle overloading operators for built-in
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2129 // classes (double, char, int8, etc.)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2130
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2131 octave_value_typeinfo::binary_op_fcn f
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2132 = octave_value_typeinfo::lookup_binary_op (op, t1, t2);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2133
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2134 if (f)
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	2135 retval = f (v1.rep, v2.rep);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2136 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2137 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2138 octave_value tv1;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2139 octave_base_value::type_conv_info cf1 =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2140 v1.numeric_conversion_function ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2141
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2142 octave_value tv2;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2143 octave_base_value::type_conv_info cf2 =
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2144 v2.numeric_conversion_function ();
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2145
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2146 // Try biased (one-sided) conversions first.
19864 17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	2147 if (cf2.type_id () >= 0
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	2148 && octave_value_typeinfo::lookup_binary_op (op, t1,
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	2149 cf2.type_id ()))
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2150 cf1 = 0;
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2151 else if (cf1.type_id () >= 0
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2152 && octave_value_typeinfo::lookup_binary_op (op,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2153 cf1.type_id (),
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2154 t2))
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2155 cf2 = 0;
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2156
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2157 if (cf1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2158 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2159 octave_base_value tmp = cf1 (v1.rep);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2160
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2161 if (! tmp)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2162 err_binary_op_conv (octave_value::binary_op_as_string (op));
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2163
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2164 tv1 = octave_value (tmp);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2165 t1 = tv1.type_id ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2166 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2167 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2168 tv1 = v1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2169
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2170 if (cf2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2171 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2172 octave_base_value tmp = cf2 (v2.rep);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2173
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2174 if (! tmp)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2175 err_binary_op_conv (octave_value::binary_op_as_string (op));
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2176
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2177 tv2 = octave_value (tmp);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2178 t2 = tv2.type_id ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2179 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2180 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2181 tv2 = v2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2182
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2183 if (cf1 \|\| cf2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2184 {
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2185 retval = do_binary_op (op, tv1, tv2);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2186 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2187 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2188 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2189 //demote double -> single and try again
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2190 cf1 = tv1.numeric_demotion_function ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2191
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2192 cf2 = tv2.numeric_demotion_function ();
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2193
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2194 // Try biased (one-sided) conversions first.
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2195 if (cf2.type_id () >= 0
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2196 && octave_value_typeinfo::lookup_binary_op (op, t1,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2197 cf2.type_id ()))
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2198 cf1 = 0;
19864 17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	2199 else if (cf1.type_id () >= 0
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	2200 && octave_value_typeinfo::lookup_binary_op (op,
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	2201 cf1.type_id (),
17d647821d61 maint: More cleanup of C++ code to follow Octave coding conventions. John W. Eaton <jwe@octave.org> parents: 19861 diff changeset	2202 t2))
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2203 cf2 = 0;
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2204
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2205 if (cf1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2206 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2207 octave_base_value tmp = cf1 (tv1.rep);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2208
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2209 if (! tmp)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2210 err_binary_op_conv (octave_value::binary_op_as_string (op));
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2211
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2212 tv1 = octave_value (tmp);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2213 t1 = tv1.type_id ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2214 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2215
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2216 if (cf2)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2217 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2218 octave_base_value tmp = cf2 (tv2.rep);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2219
21129 228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21121 diff changeset	2220 if (! tmp)
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21121 diff changeset	2221 err_binary_op_conv (octave_value::binary_op_as_string (op));
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21121 diff changeset	2222
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21121 diff changeset	2223 tv2 = octave_value (tmp);
228b65504557 maint: Eliminate useless statements after err_XXX. Rik <rik@octave.org> parents: 21121 diff changeset	2224 t2 = tv2.type_id ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2225 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2226
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2227 if (! cf1 && ! cf2)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2228 err_binary_op (octave_value::binary_op_as_string (op),
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2229 v1.type_name (), v2.type_name ());
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2230
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2231 f = octave_value_typeinfo::lookup_binary_op (op, t1, t2);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2232
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2233 if (! f)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2234 err_binary_op (octave_value::binary_op_as_string (op),
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2235 v1.type_name (), v2.type_name ());
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2236
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2237 retval = f (tv1.rep, tv2.rep);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2238 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2239 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2240 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2241
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2242 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2243 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2244
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	2245 static octave_value
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2246 decompose_binary_op (octave_value::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	2247 const octave_value& v1, const octave_value& v2)
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2248 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2249 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	2250 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2251 case octave_value::op_trans_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2252 return do_binary_op (octave_value::op_mul,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2253 do_unary_op (octave_value::op_transpose, v1), v2);
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2254
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	2255 case octave_value::op_mul_trans:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2256 return do_binary_op (octave_value::op_mul,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2257 v1, do_unary_op (octave_value::op_transpose, v2));
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2258
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	2259 case octave_value::op_herm_mul:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2260 return do_binary_op (octave_value::op_mul,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2261 do_unary_op (octave_value::op_hermitian, v1), v2);
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2262
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	2263 case octave_value::op_mul_herm:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2264 return do_binary_op (octave_value::op_mul,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2265 v1, do_unary_op (octave_value::op_hermitian, v2));
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2266
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	2267 case octave_value::op_trans_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2268 return do_binary_op (octave_value::op_ldiv,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2269 do_unary_op (octave_value::op_transpose, v1), v2);
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2270
9661 afcf852256d2 optimize / and '\ for triangular matrices Jaroslav Hajek <highegg@gmail.com> parents: 9608 diff changeset	2271 case octave_value::op_herm_ldiv:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2272 return do_binary_op (octave_value::op_ldiv,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2273 do_unary_op (octave_value::op_hermitian, v1), v2);
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2274
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	2275 case octave_value::op_el_not_and:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2276 return do_binary_op (octave_value::op_el_and,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2277 do_unary_op (octave_value::op_not, v1), v2);
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2278
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	2279 case octave_value::op_el_not_or:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2280 return do_binary_op (octave_value::op_el_or,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2281 do_unary_op (octave_value::op_not, v1), v2);
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2282
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	2283 case octave_value::op_el_and_not:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2284 return do_binary_op (octave_value::op_el_and,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2285 v1, do_unary_op (octave_value::op_not, v2));
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2286
8982 dc6bda6f9994 implement compound logical ops Jaroslav Hajek <highegg@gmail.com> parents: 8960 diff changeset	2287 case octave_value::op_el_or_not:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2288 return do_binary_op (octave_value::op_el_or,
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2289 v1, do_unary_op (octave_value::op_not, v2));
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2290
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	2291 default:
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2292 error ("invalid compound operator");
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2293 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2294 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2295
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2296 octave_value
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2297 do_binary_op (octave_value::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	2298 const octave_value& v1, const octave_value& v2)
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2299 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2300 octave_value retval;
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2301
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2302 int t1 = v1.type_id ();
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2303 int t2 = v2.type_id ();
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2304
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2305 if (t1 == octave_class::static_type_id ()
18306 122239398a03 Partial support for operator overload in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	2306 \|\| t2 == octave_class::static_type_id ()
122239398a03 Partial support for operator overload in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	2307 \|\| t1 == octave_classdef::static_type_id ()
122239398a03 Partial support for operator overload in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	2308 \|\| t2 == octave_classdef::static_type_id ())
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	2309 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2310 octave_value_typeinfo::binary_class_op_fcn f
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2311 = octave_value_typeinfo::lookup_binary_class_op (op);
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	2312
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2313 if (f)
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	2314 retval = f (v1, v2);
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	2315 else
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2316 retval = decompose_binary_op (op, v1, v2);
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2317 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2318 else
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2319 {
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2320 octave_value_typeinfo::binary_op_fcn f
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2321 = octave_value_typeinfo::lookup_binary_op (op, t1, t2);
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	2322
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2323 if (f)
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	2324 retval = f (v1.rep, v2.rep);
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	2325 else
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2326 retval = decompose_binary_op (op, v1, v2);
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2327 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2328
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2329 return retval;
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2330 }
5861b95e9879 support for compound operators, implement trans_mul, mul_trans, herm_mul and mul_herm Jaroslav Hajek <highegg@gmail.com> parents: 7789 diff changeset	2331
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2332 OCTAVE_NORETURN static void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2333 err_cat_op (const std::string& tn1, const std::string& tn2)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2334 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15428 diff changeset	2335 error ("concatenation operator not implemented for '%s' by '%s' operations",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2336 tn1.c_str (), tn2.c_str ());
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2337 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2338
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2339 OCTAVE_NORETURN static void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2340 err_cat_op_conv (void)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2341 {
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2342 error ("type conversion failed for concatenation operator");
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2343 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2344
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2345 octave_value
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2346 do_cat_op (const octave_value& v1, const octave_value& v2,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2347 const Array<octave_idx_type>& ra_idx)
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2348 {
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2349 octave_value retval;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2350
7814 87865ed7405f Second set of single precision test code and fix of resulting bugs David Bateman <dbateman@free.fr> parents: 7800 diff changeset	2351 // Can't rapid return for concatenation with an empty object here as
87865ed7405f Second set of single precision test code and fix of resulting bugs David Bateman <dbateman@free.fr> parents: 7800 diff changeset	2352 // something like cat(1,[],single([]) must return the correct type.
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	2353
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2354 int t1 = v1.type_id ();
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2355 int t2 = v2.type_id ();
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2356
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	2357 octave_value_typeinfo::cat_op_fcn f
ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5758 diff changeset	2358 = octave_value_typeinfo::lookup_cat_op (t1, t2);
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2359
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2360 if (f)
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	2361 retval = f (v1.rep, v2.rep, ra_idx);
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2362 else
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2363 {
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2364 octave_value tv1;
8345 c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2365 octave_base_value::type_conv_info cf1 = v1.numeric_conversion_function ();
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2366
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2367 octave_value tv2;
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2368 octave_base_value::type_conv_info cf2 = v2.numeric_conversion_function ();
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2369
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2370 // Try biased (one-sided) conversions first.
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2371 if (cf2.type_id () >= 0
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2372 && octave_value_typeinfo::lookup_cat_op (t1, cf2.type_id ()))
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2373 cf1 = 0;
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2374 else if (cf1.type_id () >= 0
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2375 && octave_value_typeinfo::lookup_cat_op (cf1.type_id (), t2))
c777f3ce02d8 smarter conversion lookup Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	2376 cf2 = 0;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2377
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2378 if (cf1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2379 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2380 octave_base_value tmp = cf1 (v1.rep);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2381
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2382 if (! tmp)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2383 err_cat_op_conv ();
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2384
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2385 tv1 = octave_value (tmp);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2386 t1 = tv1.type_id ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2387 }
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2388 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2389 tv1 = v1;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2390
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2391 if (cf2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2392 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2393 octave_base_value tmp = cf2 (v2.rep);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2394
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2395 if (! tmp)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2396 err_cat_op_conv ();
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2397
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2398 tv2 = octave_value (tmp);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2399 t2 = tv2.type_id ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2400 }
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2401 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2402 tv2 = v2;
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2403
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2404 if (! cf1 && ! cf2)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2405 err_cat_op (v1.type_name (), v2.type_name ());
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2406
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2407 retval = do_cat_op (tv1, tv2, ra_idx);
4915 c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2408 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2409
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2410 return retval;
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2411 }
c638c144d4da [project @ 2004-07-23 19:01:22 by jwe] jwe parents: 4911 diff changeset	2412
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2413 octave_value
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2414 do_colon_op (const octave_value& base, const octave_value& increment,
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2415 const octave_value& limit, bool is_for_cmd_expr)
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2416 {
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2417 octave_value retval;
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2418
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2419 if (base.is_object () \|\| increment.is_object () \|\| limit.is_object ())
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2420 {
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2421 std::string dispatch_type;
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2422
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2423 if (base.is_object ())
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2424 dispatch_type = base.class_name ();
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2425 else if (increment.is_defined () && increment.is_object ())
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2426 dispatch_type = increment.class_name ();
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2427 else
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2428 dispatch_type = limit.class_name ();
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2429
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19749 diff changeset	2430 octave_value meth = symbol_table::find_method ("colon", dispatch_type);
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19749 diff changeset	2431
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2432 if (! meth.is_defined ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2433 error ("colon method not defined for %s class", dispatch_type.c_str ());
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2434
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2435 octave_value_list args;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2436
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2437 if (increment.is_defined ())
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19749 diff changeset	2438 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2439 args(2) = limit;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2440 args(1) = increment;
19861 19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19749 diff changeset	2441 }
19755f4fc851 maint: Cleanup C++ code to follow Octave coding conventions. Rik <rik@octave.org> parents: 19749 diff changeset	2442 else
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2443 args(1) = limit;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2444
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2445 args(0) = base;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2446
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2447 octave_value_list tmp = feval (meth.function_value (), args, 1);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2448
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2449 if (tmp.length () > 0)
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	2450 retval = tmp(0);
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2451 }
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2452 else
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2453 {
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2454 bool result_is_str = (base.is_string () && limit.is_string ());
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2455 bool dq_str = (base.is_dq_string () \|\| limit.is_dq_string ());
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2456
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2457 Matrix m_base, m_limit, m_increment;
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2458
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2459 try
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2460 {
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2461 m_base = base.matrix_value (true);
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2462 }
20785 b6f2909e7f94 always throw exception after debugging with debug_on_error John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	2463 catch (octave_execution_exception& e)
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2464 {
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	2465 error (e, "invalid base value in colon expression");
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2466 }
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2467
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2468 try
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2469 {
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2470 m_limit = limit.matrix_value (true);
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2471 }
20785 b6f2909e7f94 always throw exception after debugging with debug_on_error John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	2472 catch (octave_execution_exception& e)
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2473 {
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	2474 error (e, "invalid limit value in colon expression");
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2475 }
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2476
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2477 try
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2478 {
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2479 m_increment = (increment.is_defined ()
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2480 ? increment.matrix_value (true)
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2481 : Matrix (1, 1, 1.0));
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20704 diff changeset	2482 }
20785 b6f2909e7f94 always throw exception after debugging with debug_on_error John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	2483 catch (octave_execution_exception& e)
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2484 {
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20743 diff changeset	2485 error (e, "invalid increment value in colon expression");
19749 c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2486 }
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2487
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2488 bool base_empty = m_base.is_empty ();
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2489 bool limit_empty = m_limit.is_empty ();
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2490 bool increment_empty = m_increment.is_empty ();
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2491
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2492 if (base_empty \|\| limit_empty \|\| increment_empty)
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2493 retval = Range ();
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2494 else
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2495 {
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2496 Range r (m_base(0), m_limit(0), m_increment(0));
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2497
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2498 // For compatibility with Matlab, don't allow the range used in
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2499 // a FOR loop expression to be converted to a Matrix.
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2500
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2501 retval = octave_value (r, is_for_cmd_expr);
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2502
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2503 if (result_is_str)
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2504 retval = retval.convert_to_str (false, true, dq_str ? '"' : '\'');
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2505 }
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2506 }
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2507
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2508 return retval;
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2509 }
c913247c85a8 make colon function work (bug #44290) John W. Eaton <jwe@octave.org> parents: 19697 diff changeset	2510
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2511 void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2512 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	2513 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2514 os << prefix << "type_name: " << type_name () << "\n"
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2515 << prefix << "count: " << get_count () << "\n"
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2516 << prefix << "rep info: ";
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2517
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2518 rep->print_info (os, prefix + " ");
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2519 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2520
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2521 OCTAVE_NORETURN static void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2522 err_unary_op (const std::string& on, const std::string& tn)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2523 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15428 diff changeset	2524 error ("unary operator '%s' not implemented for '%s' operands",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2525 on.c_str (), tn.c_str ());
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2526 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2527
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2528 OCTAVE_NORETURN static void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2529 err_unary_op_conv (const std::string& on)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2530 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15428 diff changeset	2531 error ("type conversion failed for unary operator '%s'", on.c_str ());
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2532 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2533
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2534 octave_value
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2535 do_unary_op (octave_value::unary_op op, const octave_value& v)
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2536 {
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2537 octave_value retval;
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2538
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2539 int t = v.type_id ();
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2540
18306 122239398a03 Partial support for operator overload in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	2541 if (t == octave_class::static_type_id ()
122239398a03 Partial support for operator overload in classdef. Michael Goffioul <michael.goffioul@gmail.com> parents: 17856 diff changeset	2542 \|\| t == octave_classdef::static_type_id ())
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2543 {
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2544 octave_value_typeinfo::unary_class_op_fcn f
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2545 = octave_value_typeinfo::lookup_unary_class_op (op);
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2546
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2547 if (! f)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2548 err_unary_op (octave_value::unary_op_as_string (op), v.class_name ());
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2549
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2550 retval = f (v);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2551 }
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2552 else
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2553 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2554 // FIXME: we need to handle overloading operators for built-in
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2555 // classes (double, char, int8, etc.)
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2556
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2557 octave_value_typeinfo::unary_op_fcn f
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2558 = octave_value_typeinfo::lookup_unary_op (op, t);
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2559
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2560 if (f)
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	2561 retval = f (*v.rep);
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2562 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2563 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2564 octave_value tv;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2565 octave_base_value::type_conv_fcn cf
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2566 = v.numeric_conversion_function ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2567
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2568 if (! cf)
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2569 err_unary_op (octave_value::unary_op_as_string (op),
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2570 v.type_name ());
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2571
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2572 octave_base_value tmp = cf (v.rep);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2573
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2574 if (! tmp)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2575 err_unary_op_conv (octave_value::unary_op_as_string (op));
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2576
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2577 tv = octave_value (tmp);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2578 retval = do_unary_op (op, tv);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2579 }
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2580 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2581
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2582 return retval;
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2583 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2584
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2585 OCTAVE_NORETURN static void
dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2586 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	2587 const std::string& tn)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2588 {
15466 d174210ce1ec use ' instead of ` in error messages, warnings and most comments John W. Eaton <jwe@octave.org> parents: 15428 diff changeset	2589 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	2590 op.c_str (), tn.c_str ());
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2591 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2592
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2593 octave_value&
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2594 octave_value::do_non_const_unary_op (unary_op op)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2595 {
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2596 if (op == op_incr \|\| op == op_decr)
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2597 {
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	2598 // 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	2599 // 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	2600 // be confusing.
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2601 if (is_undefined ())
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2602 {
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2603 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	2604 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	2605 op_str.c_str (), op_str.c_str ());
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2606 return *this;
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2607 }
d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2608
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2609 // Genuine.
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2610 int t = type_id ();
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2611
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2612 octave_value_typeinfo::non_const_unary_op_fcn f
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2613 = octave_value_typeinfo::lookup_non_const_unary_op (op, t);
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2614
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2615 if (f)
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2616 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2617 make_unique ();
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2618
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	2619 f (*rep);
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2620 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2621 else
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2622 {
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2623 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	2624
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2625 if (! cf)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2626 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	2627
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2628 octave_base_value tmp = cf (rep);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2629
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2630 if (! tmp)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2631 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	2632 (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	2633
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2634 octave_base_value *old_rep = rep;
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2635 rep = tmp;
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2636
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2637 t = type_id ();
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2638
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2639 f = octave_value_typeinfo::lookup_non_const_unary_op (op, t);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2640
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2641 if (f)
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2642 {
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2643 f (*rep);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2644
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2645 if (old_rep && --old_rep->count == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2646 delete old_rep;
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2647 }
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2648 else
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2649 {
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2650 if (old_rep)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2651 {
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2652 if (--rep->count == 0)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2653 delete rep;
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2654
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2655 rep = old_rep;
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2656 }
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2657
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2658 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	2659 type_name ());
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	2660 }
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2661 }
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2662 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2663 else
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2664 {
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2665 // Non-genuine.
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2666 int t = type_id ();
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2667
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2668 octave_value_typeinfo::non_const_unary_op_fcn f = 0;
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2669
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2670 // Only attempt to operate in-place if this variable is unshared.
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2671 if (rep->count == 1)
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2672 f = octave_value_typeinfo::lookup_non_const_unary_op (op, t);
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2673
1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2674 if (f)
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20232 diff changeset	2675 f (*rep);
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2676 else
9607 1be3c73ed7b5 reuse temporary arrays in nested expressions Jaroslav Hajek <highegg@gmail.com> parents: 9546 diff changeset	2677 this = do_unary_op (op, this);
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2678 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2679
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2680 return *this;
3203 bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2681 }
bc61b0e8d60e [project @ 1998-10-30 20:26:27 by jwe] jwe parents: 3196 diff changeset	2682
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2683 octave_value&
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4233 diff changeset	2684 octave_value::do_non_const_unary_op (unary_op op, const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2685 const std::list<octave_value_list>& idx)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2686 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2687 if (idx.empty ())
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2688 do_non_const_unary_op (op);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2689 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2690 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2691 // 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	2692 // 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	2693 // types we have.
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2694
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2695 assign_op assop = unary_op_to_assign_op (op);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2696
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2697 assign (assop, type, idx, 1.0);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2698 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2699
10614 d1194069e58c optimize code handling ++,-- Jaroslav Hajek <highegg@gmail.com> parents: 10544 diff changeset	2700 return *this;
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2701 }
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2702
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2703 octave_value::assign_op
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2704 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	2705 {
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2706 switch (op)
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2707 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2708 case op_incr:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2709 return op_add_eq;
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2710
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2711 case op_decr:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2712 return op_sub_eq;
3205 549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2713
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2714 default:
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2715 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2716 std::string on = unary_op_as_string (op);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2717 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	2718 }
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2719 }
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2720 }
549691faa638 [project @ 1998-10-31 04:20:15 by jwe] jwe parents: 3204 diff changeset	2721
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	2722 octave_value::binary_op
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2723 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	2724 {
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2725 switch (op)
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2726 {
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2727 case op_add_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2728 return op_add;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2729
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2730 case op_sub_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2731 return op_sub;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2732
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2733 case op_mul_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2734 return op_mul;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2735
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2736 case op_div_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2737 return op_div;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2738
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2739 case op_ldiv_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2740 return op_ldiv;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2741
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	2742 case op_pow_eq:
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2743 return op_pow;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2744
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2745 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	2746 return op_el_mul;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2747
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2748 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	2749 return op_el_div;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2750
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2751 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	2752 return op_el_ldiv;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2753
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	2754 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	2755 return op_el_pow;
4018 a8621d87fbf5 [project @ 2002-08-05 03:17:25 by jwe] jwe parents: 4005 diff changeset	2756
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2757 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	2758 return op_el_and;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2759
3533 a99cf9fc22fe [project @ 2000-02-02 11:45:24 by jwe] jwe parents: 3531 diff changeset	2760 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	2761 return op_el_or;
3204 81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2762
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2763 default:
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2764 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2765 std::string on = assign_op_as_string (op);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2766 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	2767 }
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2768 }
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2769 }
81738e630f57 [project @ 1998-10-30 23:28:29 by jwe] jwe parents: 3203 diff changeset	2770
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2771 octave_value
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2772 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	2773 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2774 if (type.length () > 0)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2775 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2776 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2777 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2778 case '(':
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2779 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	2780 return octave_map ();
350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2781 else
21295 29a0e9e70879 * ov.h: Fix typo in previous change. John W. Eaton <jwe@octave.org> parents: 21294 diff changeset	2782 return octave_value (rhs.empty_clone ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2783
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2784 case '{':
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2785 return Cell ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2786
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2787 case '.':
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2788 return octave_scalar_map ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2789
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2790 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2791 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10232 diff changeset	2792 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2793 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2794 else
21293 350caa6afadf * ov.cc: Use consistent style for switch statements. John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	2795 return octave_value (rhs.empty_clone ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2796 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	2797
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2798 void
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2799 install_types (void)
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2800 {
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2801 octave_base_value::register_type ();
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3546 diff changeset	2802 octave_cell::register_type ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2803 octave_scalar::register_type ();
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2804 octave_complex::register_type ();
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2805 octave_matrix::register_type ();
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	2806 octave_diag_matrix::register_type ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2807 octave_complex_matrix::register_type ();
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	2808 octave_complex_diag_matrix::register_type ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2809 octave_range::register_type ();
2825 60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	2810 octave_bool::register_type ();
60ae49e1284f [project @ 1997-03-25 23:17:36 by jwe] jwe parents: 2800 diff changeset	2811 octave_bool_matrix::register_type ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2812 octave_char_matrix_str::register_type ();
5279 bd32f770c09a [project @ 2005-04-12 21:55:31 by jwe] jwe parents: 5275 diff changeset	2813 octave_char_matrix_sq_str::register_type ();
4901 35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2814 octave_int8_scalar::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2815 octave_int16_scalar::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2816 octave_int32_scalar::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2817 octave_int64_scalar::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2818 octave_uint8_scalar::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2819 octave_uint16_scalar::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2820 octave_uint32_scalar::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2821 octave_uint64_scalar::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2822 octave_int8_matrix::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2823 octave_int16_matrix::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2824 octave_int32_matrix::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2825 octave_int64_matrix::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2826 octave_uint8_matrix::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2827 octave_uint16_matrix::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2828 octave_uint32_matrix::register_type ();
35bfb4e0b96b [project @ 2004-06-14 18:33:02 by jwe] jwe parents: 4894 diff changeset	2829 octave_uint64_matrix::register_type ();
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	2830 octave_sparse_bool_matrix::register_type ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	2831 octave_sparse_matrix::register_type ();
57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5147 diff changeset	2832 octave_sparse_complex_matrix::register_type ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2833 octave_struct::register_type ();
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	2834 octave_scalar_struct::register_type ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7065 diff changeset	2835 octave_class::register_type ();
3977 95663a3a2682 [project @ 2002-07-05 17:43:37 by jwe] jwe parents: 3961 diff changeset	2836 octave_cs_list::register_type ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2837 octave_magic_colon::register_type ();
2974 ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	2838 octave_builtin::register_type ();
ebbc34ff7f66 [project @ 1997-05-15 19:36:16 by jwe] jwe parents: 2963 diff changeset	2839 octave_user_function::register_type ();
4649 f7ce581b27fb [project @ 2003-11-23 21:46:44 by jwe] jwe parents: 4645 diff changeset	2840 octave_dld_function::register_type ();
4643 ef3a14fb6847 [project @ 2003-11-22 12:25:44 by jwe] jwe parents: 4591 diff changeset	2841 octave_fcn_handle::register_type ();
4966 91b61d27b9b4 [project @ 2004-09-07 02:01:22 by jwe] jwe parents: 4965 diff changeset	2842 octave_fcn_inline::register_type ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2843 octave_float_scalar::register_type ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2844 octave_float_complex::register_type ();
82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2845 octave_float_matrix::register_type ();
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	2846 octave_float_diag_matrix::register_type ();
7789 82be108cc558 First attempt at single precision tyeps David Bateman <dbateman@free.fr> parents: 7761 diff changeset	2847 octave_float_complex_matrix::register_type ();
8366 8b1a2555c4e2 implement diagonal matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8346 diff changeset	2848 octave_float_complex_diag_matrix::register_type ();
8367 445d27d79f4e support permutation matrix objects Jaroslav Hajek <highegg@gmail.com> parents: 8366 diff changeset	2849 octave_perm_matrix::register_type ();
8150 283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2850 octave_null_matrix::register_type ();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2851 octave_null_str::register_type ();
283989f2da9b make null assignment matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 8039 diff changeset	2852 octave_null_sq_str::register_type ();
10325 8b3cfc1288e2 implement lazy index conversions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	2853 octave_lazy_index::register_type ();
14013 1734ebe27134 move onCleanup function and class to liboctinterp John W. Eaton <jwe@octave.org> parents: 13932 diff changeset	2854 octave_oncleanup::register_type ();
15754 bf77f7f66bdf register octave_java type at Octave startup John W. Eaton <jwe@octave.org> parents: 15467 diff changeset	2855 octave_java::register_type ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2856 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2857
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	2858 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	2859 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	2860 @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	2861 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	2862 @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	2863 @end deftypefn */)
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	2864 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2865 if (args.length () != 1)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5785 diff changeset	2866 print_usage ();
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	2867
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2868 return ovl (args(0).byte_size ());
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	2869 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4700 diff changeset	2870
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	2871 /*
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	2872 %!assert (sizeof (uint64 (ones (3))), 72)
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	2873 %!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	2874 %!assert (sizeof ({"foo", "bar", "baaz"}), 10)
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	2875 */
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	2876
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	2877 static void
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	2878 decode_subscripts (const char* name, const octave_value& arg,
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	2879 std::string& type_string,
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	2880 std::list<octave_value_list>& idx)
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	2881 {
20704 571508c1ed06 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20703 diff changeset	2882 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	2883
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2884 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	2885 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	2886 name);
20978 a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2887
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2888 octave_idx_type nel = m.numel ();
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2889
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2890 type_string = std::string (nel, '\0');
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2891 idx = std::list<octave_value_list> ();
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2892
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2893 if (nel == 0)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2894 return;
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2895
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2896 const Cell type = m.contents ("type");
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2897 const Cell subs = m.contents ("subs");
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2898
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2899 for (int k = 0; k < nel; k++)
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2900 {
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2901 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	2902
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2903 if (item == "{}")
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2904 type_string[k] = '{';
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2905 else if (item == "()")
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2906 type_string[k] = '(';
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2907 else if (item == ".")
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2908 type_string[k] = '.';
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2909 else
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2910 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	2911
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2912 octave_value_list idx_item;
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2913
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2914 if (subs(k).is_string ())
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2915 idx_item(0) = subs(k);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2916 else if (subs(k).is_cell ())
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2917 {
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2918 Cell subs_cell = subs(k).cell_value ();
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2919
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2920 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	2921 {
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2922 if (subs_cell(n).is_string ()
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2923 && subs_cell(n).string_value () == ":")
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2924 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	2925 else
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2926 idx_item(n) = subs_cell(n);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2927 }
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2928 }
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2929 else
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2930 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	2931
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2932 idx.push_back (idx_item);
a5b500efca9f maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	2933 }
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	2934 }
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	2935
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	2936 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	2937 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	2938 @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	2939 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	2940 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	2941
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2942 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	2943 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	2944 @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	2945 @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	2946
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2947 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	2948
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2949 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2950 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2951 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	2952 @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	2953 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	2954 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	2955 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	2956 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	2957 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	2958 @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	2959 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	2960 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	2961 @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	2962 @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	2963
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2964 @noindent
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2965 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	2966
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2967 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	2968 @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	2969 @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	2970 @end deftypefn */)
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	2971 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2972 if (args.length () != 2)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2973 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2974
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2975 std::string type;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2976 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	2977
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2978 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	2979
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2980 octave_value arg0 = args(0);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2981
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	2982 if (type.empty ())
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2983 return ovl (arg0);
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	2984 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	2985 return arg0.subsref (type, idx, nargout);
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	2986 }
e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	2987
e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	2988 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	2989 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	2990 @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	2991 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	2992 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	2993
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2994 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	2995 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	2996 @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	2997 @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	2998
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	2999 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	3000 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	3001
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3002 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3003 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3004 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	3005 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	3006 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	3007 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	3008 @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	3009 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	3010 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	3011 @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	3012 @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	3013
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3014 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	3015
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3016 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	3017 @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	3018 @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	3019 @end deftypefn */)
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3020 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3021 if (args.length () != 3)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3022 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3023
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3024 std::string type;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3025 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	3026
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3027 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	3028
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3029 if (type.empty ())
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3030 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3031 // 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	3032 return ovl (args(2).storable_value ());
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3033 }
e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3034 else
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3035 {
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3036 octave_value arg0 = args(0);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3037
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3038 arg0.make_unique ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3039
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3040 return ovl (arg0.subsasgn (type, idx, args(2)));
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3041 }
6153 e60688a1ea07 [project @ 2006-11-13 17:30:54 by jwe] jwe parents: 5851 diff changeset	3042 }
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3043
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3044 /*
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3045 %!test
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3046 %! a = reshape ([1:25], 5,5);
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3047 %! idx1 = substruct ("()", {3, 3});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3048 %! 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	3049 %! idx3 = substruct ("()", {":", [1,5]});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3050 %! idx4 = struct ("type", {}, "subs", {});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3051 %! assert (subsref (a, idx1), 13);
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3052 %! 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	3053 %! 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	3054 %! assert (subsref (a, idx4), a);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3055 %! a = subsasgn (a, idx1, 0);
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3056 %! a = subsasgn (a, idx2, 0);
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3057 %! a = subsasgn (a, idx3, 0);
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3058 %!# a = subsasgn (a, idx4, 0);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3059 %! b = [0 6 11 16 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3060 %! 0 0 12 0 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3061 %! 0 8 0 18 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3062 %! 0 0 14 0 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3063 %! 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	3064 %! assert (a, b);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3065
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3066 %!test
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3067 %! 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	3068 %! idx1 = substruct ("{}", {3, 3});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3069 %! 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	3070 %! idx3 = substruct ("()", {":", [1,5]});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3071 %! 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	3072 %! idx3p = substruct ("{}", {":", [1,5]});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3073 %! idx4 = struct ("type", {}, "subs", {});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3074 %! assert ({ subsref(c, idx1) }, {13});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3075 %! 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	3076 %! 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	3077 %! assert (subsref (c, idx4), c);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3078 %! c = subsasgn (c, idx1, 0);
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3079 %! c = subsasgn (c, idx2, 0);
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3080 %! c = subsasgn (c, idx3, 0);
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3081 %!# c = subsasgn (c, idx4, 0);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3082 %! d = {0 6 11 16 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3083 %! 0 0 12 0 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3084 %! 0 8 0 18 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3085 %! 0 0 14 0 0
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3086 %! 0 10 15 20 0};
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3087 %! assert (c, d);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3088
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3089 %!test
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3090 %! s.a = "ohai";
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3091 %! s.b = "dere";
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3092 %! s.c = 42;
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3093 %! idx1 = substruct (".", "a");
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3094 %! idx2 = substruct (".", "b");
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3095 %! idx3 = substruct (".", "c");
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3096 %! idx4 = struct ("type", {}, "subs", {});
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3097 %! assert (subsref (s, idx1), "ohai");
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3098 %! assert (subsref (s, idx2), "dere");
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3099 %! assert (subsref (s, idx3), 42);
6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3100 %! assert (subsref (s, idx4), s);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3101 %! s = subsasgn (s, idx1, "Hello");
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3102 %! s = subsasgn (s, idx2, "There");
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3103 %! s = subsasgn (s, idx3, 163);
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3104 %!# s = subsasgn (s, idx4, 163);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3105 %! t.a = "Hello";
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3106 %! t.b = "There";
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3107 %! t.c = 163;
13932 6ead4dc1ca55 subsref, subsasgn: allow empty subscript structs John W. Eaton <jwe@octave.org> parents: 13793 diff changeset	3108 %! assert (s, t);
13100 06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3109 */
06bf445ee778 Add 6 tests for ov.cc Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12642 diff changeset	3110
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3111 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	3112 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	3113 @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	3114 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	3115 @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	3116 @end deftypefn */)
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3117 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3118 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	3119 print_usage ();
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3120
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3121 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	3122 }
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3123
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3124 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3125 %!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	3126 %!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	3127 %!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	3128 %!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	3129
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3130 %!error is_sq_string ()
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3131 %!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	3132 */
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3133
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3134 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	3135 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	3136 @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	3137 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	3138 @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	3139 @end deftypefn */)
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3140 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20785 diff changeset	3141 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	3142 print_usage ();
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3143
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20893 diff changeset	3144 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	3145 }
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3146
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3147 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	3148 %!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	3149 %!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	3150 %!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	3151 %!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	3152
13712 f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3153 %!error is_dq_string ()
f80473f24553 new functions is_sq_string and is_dq_string John W. Eaton <jwe@octave.org> parents: 13294 diff changeset	3154 %!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	3155 */
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3156
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3157 DEFUN (disable_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	3158 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	3159 @deftypefn {} {@var{val} =} disable_permutation_matrix ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3160 @deftypefnx {} {@var{old_val} =} disable_permutation_matrix (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3161 @deftypefnx {} {} disable_permutation_matrix (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3162 Query or set the internal variable that controls whether permutation
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3163 matrices are stored in a special space-efficient format.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3164
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3165 The default value is true. If this option is disabled Octave will store
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3166 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	3167
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3168 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3169 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3170 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3171 @seealso{disable_range, disable_diagonal_matrix}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3172 @end deftypefn */)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3173 {
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3174 return SET_INTERNAL_VARIABLE (disable_permutation_matrix);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3175 }
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3176
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3177 /*
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3178 %!function p = __test_dpm__ (dpm)
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3179 %! disable_permutation_matrix (dpm, "local");
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3180 %! [~, ~, p] = lu ([1,2;3,4]);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3181 %!endfunction
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3182
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3183 %!assert (typeinfo (__test_dpm__ (false)), "permutation matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3184 %!assert (typeinfo (__test_dpm__ (true)), "matrix")
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3185 */
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3186
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3187 DEFUN (disable_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	3188 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	3189 @deftypefn {} {@var{val} =} disable_diagonal_matrix ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3190 @deftypefnx {} {@var{old_val} =} disable_diagonal_matrix (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3191 @deftypefnx {} {} disable_diagonal_matrix (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3192 Query or set the internal variable that controls whether diagonal
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3193 matrices are stored in a special space-efficient format.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3194
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3195 The default value is true. If this option is disabled Octave will store
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3196 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	3197
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3198 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3199 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3200 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3201 @seealso{disable_range, disable_permutation_matrix}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3202 @end deftypefn */)
19391 385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3203 {
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3204 return SET_INTERNAL_VARIABLE (disable_diagonal_matrix);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3205 }
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3206
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3207 /*
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3208 %!function [x, xi, fx, fxi] = __test_ddm__ (ddm)
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3209 %! disable_diagonal_matrix (ddm, "local");
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3210 %! x = eye (2);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3211 %! xi = x*i;
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3212 %! fx = single (x);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3213 %! fxi = single (xi);
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3214 %!endfunction
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3215
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3216 %!shared x, xi, fx, fxi
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3217 %! [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	3218 %!assert (typeinfo (x), "diagonal matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3219 %!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	3220 %!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	3221 %!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	3222
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3223 %!shared x, xi, fx, fxi
385499581a5e allow disabling of permutation and diagonal matrices John W. Eaton <jwe@octave.org> parents: 18537 diff changeset	3224 %! [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	3225 %!assert (typeinfo (x), "matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3226 %!assert (typeinfo (xi), "complex matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3227 %!assert (typeinfo (fx), "float matrix")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3228 %!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	3229 */
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3230
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3231 DEFUN (disable_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	3232 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	3233 @deftypefn {} {@var{val} =} disable_range ()
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3234 @deftypefnx {} {@var{old_val} =} disable_range (@var{new_val})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3235 @deftypefnx {} {} disable_range (@var{new_val}, "local")
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3236 Query or set the internal variable that controls whether ranges are stored
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3237 in a special space-efficient format.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3238
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3239 The default value is true. If this option is disabled Octave will store
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3240 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	3241
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3242 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3243 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3244 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3245 @seealso{disable_diagonal_matrix, disable_permutation_matrix}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	3246 @end deftypefn */)
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3247 {
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3248 return SET_INTERNAL_VARIABLE (disable_range);
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3249 }
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3250
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3251 /*
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3252 %!function r = __test_dr__ (dr)
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3253 %! disable_range (dr, "local");
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3254 %! ## Constant folding will produce range for 1:13.
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3255 %! base = 1;
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3256 %! limit = 13;
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3257 %! r = base:limit;
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3258 %!endfunction
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3259
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3260 %!assert (typeinfo (__test_dr__ (false)), "range")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	3261 %!assert (typeinfo (__test_dr__ (true)), "matrix")
19394 b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3262 */
b39cbe9f3bb0 allow ranges to be disabled John W. Eaton <jwe@octave.org> parents: 19391 diff changeset	3263

Mercurial > octave

annotate libinterp/octave-value/ov.cc @ 22283:564203123065