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

annotate libinterp/octave-value/ov.cc @ 21317:a4faec57f4c8

maint: remove semicolon after %!assert tests to follow Octave conventions. * testfun.txi: Remove semicolons from examples in manual and update remaider of text to reflect changes. * bsxfun.cc, cellfun.cc, data.cc, hash.cc, lu.cc, nproc.cc, rcond.cc, regexp.cc, sparse-xpow.cc, strfns.cc, symtab.cc, time.cc, variables.cc, ov-class.cc, ov-cx-diag.cc, ov-struct.cc, ov.cc, oct-parse.in.yy, pt-mat.cc, CMatrix.cc, oct-inttypes.cc, md5sum.m, blkdiag.m, cell2mat.m, interp1.m, interp2.m, interpft.m, num2str.m, repmat.m, ntsc2rgb.m, expm.m, inputname.m, polyvalm.m, blackman.m, hamming.m, hanning.m, eigs.m, median.m, binopdf.m, strsplit.m, strtok.m, assert.m, example.m, datevec.m, bug-38565.tst, build-sparse-tests.sh, classdef.tst, classes.tst, diag-perm.tst, index.tst, io.tst, logical-index.tst, nest.tst, parser.tst, prefer.tst, struct.tst: maint: remove semicolon after %!assert tests to follow Octave conventions.

author	Rik <rik@octave.org>
date	Sun, 21 Feb 2016 08:10:36 -0800
parents	40de9f8f23a6
children	06d15e4e611a

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

Mercurial > octave

annotate libinterp/octave-value/ov.cc @ 21317:a4faec57f4c8