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

annotate libinterp/octave-value/ov.cc @ 29477:34d06c73b48d stable

hold references to closure frames in anon functions if needed (bug #60237) If an anonymous function is created in a scope where there are nested functions it may need to have access to the stack frames that are active when the anonymous function is created (the same as for handles to nested functions) in addition to any captured variables from the immediate stack frame. Similar to the previous change for breaking circular reference cycles for handles to nested functions, we now perform a similar action for anonymous function handles. * ov-fcn-handle.h, ov-fcn-handle.cc (base_anonymous_fcn_handle): New base class for anonymous functions. (anonymous_fcn_handle, weak_anonymous_handle): New classes to represent anonymous function handles. Currently all handles to anonymous functions begin as anonymous_fcn_handle objects but are convert to weak_anonymous_handle objects when the functions where they are created return. * pt-fcn-handle.cc (tree_anon_fcn_handle::evaluate): If handle is created in context containing nested functions, pass current stack frame context to function handle object. * call-stack.h, call-stack.cc (call_stack::push): In overload for anonymous functions that includes local_vars as an argument, also accept closure frames. * pt-eval.h, pt-eval.cc (tree_evaluator::push_stack_frame): Likewise. * stack-frame.h, stack-frame.cc (stack_frame::user_fcn_stack_frame): In constructor for anonymous functions that includes local_vars as an argument, also accept closure frames (access_link) and handle it the same way as for frames created for calls to nested fucntions. * ov.cc (octave_value::break_closure_cycles): Also check for anonymous function handles. * test/bug-60237/bug-60237.tst, test/bug-60237/bug_60237.m, test/bug-60237/module.mk: New files for test. * test/module.mk: Update.

author	John W. Eaton <jwe@octave.org>
date	Tue, 30 Mar 2021 01:08:00 -0400
parents	c74ff452e2bb
children	e88444be8468 d13d090cb03a

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

Mercurial > octave

annotate libinterp/octave-value/ov.cc @ 29477:34d06c73b48d stable