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

annotate libinterp/octave-value/ov-cell.cc @ 27671:3e8faed1b7d8

Remove wrapper template class NoAlias<T> (bug #56752) * liboctave/array/Array.h: remove template definition * libinterp/corefcn/cellfun.cc, libinterp/corefcn/data.cc, libinterp/corefcn/xpow.cc, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-flt-re-mat.cc, liboctave/array/CMatrix.cc, liboctave/array/CRowVector.cc, liboctave/array/CRowVector.cc, liboctave/array/Sparse.cc, liboctave/array/dMatrix.cc, liboctave/array/dRowVector.cc, liboctave/array/fCMatrix.cc, liboctave/array/fCRowVector.cc, liboctave/array/fMatrix.cc, liboctave/array/fRowVector.cc: use xelem method explicitly instead of the NoAlias wrapper.

author	Carlo de Falco <carlo.defalco@polimi.it>
date	Mon, 30 Sep 2019 11:05:42 +0200
parents	3ec072ab1bda
children	b442ec6dda5c

rev	line source
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	1 /*
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	2
26379 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25646 diff changeset	3 Copyright (C) 1999-2019 John W. Eaton
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11474 diff changeset	4 Copyright (C) 2009-2010 VZLU Prague
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	5
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	7
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24474 diff changeset	8 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	9 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24474 diff changeset	10 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	11 (at your option) any later version.
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	12
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	13 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	16 GNU General Public License for more details.
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	17
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	19 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24474 diff changeset	20 <https://www.gnu.org/licenses/>.
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	21
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	22 */
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	23
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	24 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21211 diff changeset	25 # include "config.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	26 #endif
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	27
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	28 #include <istream>
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	29 #include <ostream>
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	30 #include <sstream>
5164 57077d0ddc8e [project @ 2005-02-25 19:55:24 by jwe] jwe parents: 5157 diff changeset	31 #include <vector>
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	32 #include <queue>
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	33
5360 33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5351 diff changeset	34 #include "Array-util.h"
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5351 diff changeset	35 #include "byte-swap.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	36 #include "lo-utils.h"
4153 6b96ce9f5743 [project @ 2002-11-06 20:38:49 by jwe] jwe parents: 4066 diff changeset	37 #include "quit.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8290 diff changeset	38 #include "oct-locbuf.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	39
23454 30b6eccd6708 use builtin-defun-decls.h to ensure declarations of interpreter functions John W. Eaton <jwe@octave.org> parents: 23352 diff changeset	40 #include "builtin-defun-decls.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	41 #include "defun.h"
6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	42 #include "error.h"
15149 62a35ae7d6a2 use forward decls for mxArray in ov.h and ov-base.h John W. Eaton <jwe@octave.org> parents: 15057 diff changeset	43 #include "mxarray.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	44 #include "ov-cell.h"
20940 48b2ad5ee801 maint: Rename oct-obj.[cc\|h] to ovl.[cc\|h] for clarity. Rik <rik@octave.org> parents: 20939 diff changeset	45 #include "ovl.h"
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	46 #include "oct-hdf5.h"
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	47 #include "unwind-prot.h"
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	48 #include "utils.h"
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	49 #include "ov-base-mat.h"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	50 #include "ov-base-mat.cc"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	51 #include "ov-re-mat.h"
e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	52 #include "ov-scalar.h"
5360 33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5351 diff changeset	53 #include "pr-output.h"
33adb987c033 [project @ 2005-05-23 16:19:56 by jwe] jwe parents: 5351 diff changeset	54 #include "ov-scalar.h"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21078 diff changeset	55 #include "errwarn.h"
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	56
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	57 #include "ls-oct-text.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	58 #include "ls-oct-binary.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	59 #include "ls-hdf5.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	60 #include "ls-utils.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	61
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	62 // Cell is able to handle octave_value indexing by itself, so just forward
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	63 // everything.
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	64
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	65 template <>
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	66 octave_value
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	67 octave_base_matrix<Cell>::do_index_op (const octave_value_list& idx,
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	68 bool resize_ok)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	69 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	70 return matrix.index (idx, resize_ok);
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	71 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	72
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	73 template <>
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	74 void
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	75 octave_base_matrix<Cell>::assign (const octave_value_list& idx, const Cell& rhs)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	76 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	77 matrix.assign (idx, rhs);
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	78 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	79
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	80 template <>
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	81 void
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	82 octave_base_matrix<Cell>::assign (const octave_value_list& idx,
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	83 octave_value rhs)
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	84 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	85 // FIXME: Really?
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23575 diff changeset	86 if (rhs.iscell ())
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	87 matrix.assign (idx, rhs.cell_value ());
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	88 else
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	89 matrix.assign (idx, Cell (rhs));
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	90 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	91
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	92 template <>
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	93 void
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	94 octave_base_matrix<Cell>::delete_elements (const octave_value_list& idx)
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	95 {
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	96 matrix.delete_elements (idx);
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	97 }
280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8626 diff changeset	98
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	99 // FIXME: this list of specializations is becoming so long that we should
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	100 // really ask whether octave_cell should inherit from octave_base_matrix at all.
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	101
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	102 template <>
24643 78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	103 std::string
24700 aaf7bcea71dd Silence build warnings about unused parameters. Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 24668 diff changeset	104 octave_base_matrix<Cell>::edit_display (const float_display_format&,
24668 d4dd741b2794 new octave_value functions for formatting output John W. Eaton <jwe@octave.org> parents: 24655 diff changeset	105 octave_idx_type i,
24643 78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	106 octave_idx_type j) const
78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	107 {
78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	108 octave_value val = matrix(i,j);
78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	109
24655 3ceee1910e1a allow single character strings to be edited (bug #51848) John W. Eaton <jwe@octave.org> parents: 24652 diff changeset	110 std::string tname = val.type_name ();
3ceee1910e1a allow single character strings to be edited (bug #51848) John W. Eaton <jwe@octave.org> parents: 24652 diff changeset	111 dim_vector dv = val.dims ();
3ceee1910e1a allow single character strings to be edited (bug #51848) John W. Eaton <jwe@octave.org> parents: 24652 diff changeset	112 std::string dimstr = dv.str ();
3ceee1910e1a allow single character strings to be edited (bug #51848) John W. Eaton <jwe@octave.org> parents: 24652 diff changeset	113 return "[" + dimstr + " " + tname + "]";
24643 78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	114 }
78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	115
78aff6f14227 more variable editor improvements; allow more variable types to be edited John W. Eaton <jwe@octave.org> parents: 24620 diff changeset	116 template <>
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	117 octave_value
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	118 octave_base_matrix<Cell>::fast_elem_extract (octave_idx_type n) const
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	119 {
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	120 if (n < matrix.numel ())
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	121 return Cell (matrix(n));
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	122 else
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	123 return octave_value ();
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	124 }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	125
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	126 template <>
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	127 bool
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	128 octave_base_matrix<Cell>::fast_elem_insert (octave_idx_type n,
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	129 const octave_value& x)
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	130 {
27281 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27063 diff changeset	131 const octave_cell xrep = dynamic_cast<const octave_cell > (&x.get_rep ());
10670 654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	132
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	133 bool retval = xrep && xrep->matrix.numel () == 1 && n < matrix.numel ();
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	134 if (retval)
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	135 matrix(n) = xrep->matrix(0);
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	136
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	137 return retval;
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	138 }
654fbde5dceb make cellfun's fast scalar collection mechanism public Jaroslav Hajek <highegg@gmail.com> parents: 10600 diff changeset	139
3928 e8627dc4bdf2 [project @ 2002-05-03 19:56:01 by jwe] jwe parents: 3538 diff changeset	140 template class octave_base_matrix<Cell>;
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	141
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4610 diff changeset	142 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_cell, "cell", "cell");
3353 6b36317855ff [project @ 1999-11-16 16:13:49 by jwe] jwe parents: diff changeset	143
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	144 octave_value_list
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4243 diff changeset	145 octave_cell::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	146 const std::list<octave_value_list>& idx,
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23468 diff changeset	147 int nargout)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	148 {
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	149 octave_value_list retval;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	150
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	151 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	152 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	153 case '(':
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	154 retval(0) = do_index_op (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	155 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	156
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	157 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	158 {
27063 3140380861ce error for x{} for cell array objects (bug #56167) John W. Eaton <jwe@octave.org> parents: 26401 diff changeset	159 if (idx.front ().empty ())
3140380861ce error for x{} for cell array objects (bug #56167) John W. Eaton <jwe@octave.org> parents: 26401 diff changeset	160 error ("invalid empty index expression");
3140380861ce error for x{} for cell array objects (bug #56167) John W. Eaton <jwe@octave.org> parents: 26401 diff changeset	161
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	162 octave_value tmp = do_index_op (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	163
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	164 Cell tcell = tmp.cell_value ();
4582 db5a24d54915 [project @ 2003-10-31 15:11:45 by jwe] jwe parents: 4563 diff changeset	165
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	166 if (tcell.numel () == 1)
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	167 retval(0) = tcell(0,0);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	168 else
23352 778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23350 diff changeset	169 {
778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23350 diff changeset	170 // Return a comma-separated list.
778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23350 diff changeset	171 retval = octave_value (octave_value_list (tcell));
778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23350 diff changeset	172 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	173 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	174 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	175
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	176 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	177 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	178 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	179 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	180 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	181 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	182
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	183 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	184 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	185 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	186
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	187 // FIXME: perhaps there should be an
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	188 // octave_value_list::next_subsref member function? See also
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	189 // octave_user_function::subsref.
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	190
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	191 if (idx.size () > 1)
23481 73558a835b64 eliminate lvalue list arguments from evaluator functions John W. Eaton <jwe@octave.org> parents: 23468 diff changeset	192 retval = retval(0).next_subsref (nargout, type, idx);
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	193
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	194 return retval;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	195 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	196
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	197 octave_value
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	198 octave_cell::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	199 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	200 bool auto_add)
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	201 {
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	202 octave_value retval;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	203
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	204 switch (type[0])
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	205 {
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	206 case '(':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	207 retval = do_index_op (idx.front (), auto_add);
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	208 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	209
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	210 case '{':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	211 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	212 octave_value tmp = do_index_op (idx.front (), auto_add);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	213
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	214 const Cell tcell = tmp.cell_value ();
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	215
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	216 if (tcell.numel () == 1)
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	217 retval = tcell(0,0);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	218 else
23352 778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23350 diff changeset	219 {
778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23350 diff changeset	220 // Return a comma-separated list.
778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23350 diff changeset	221 retval = octave_value (octave_value_list (tcell));
778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23350 diff changeset	222 }
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	223 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	224 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	225
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	226 case '.':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	227 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	228 std::string nm = type_name ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	229 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	230 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	231 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	232
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	233 default:
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	234 panic_impossible ();
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	235 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	236
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	237 // FIXME: perhaps there should be an
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	238 // octave_value_list::next_subsref member function? See also
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	239 // octave_user_function::subsref.
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	240
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	241 if (idx.size () > 1)
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	242 retval = retval.next_subsref (auto_add, type, idx);
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	243
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	244 return retval;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	245 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	246
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	247 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4243 diff changeset	248 octave_cell::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	249 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	250 const octave_value& rhs)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	251 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	252 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	253
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	254 int n = type.length ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	255
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	256 octave_value t_rhs = rhs;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	257
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	258 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	259
9286 c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9109 diff changeset	260 if (idx.front ().empty ())
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	261 error ("missing index in indexed assignment");
9286 c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9109 diff changeset	262
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	263 if (n > 1)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	264 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	265 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	266 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	267 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	268 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	269 if (isempty () && type[1] == '.')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	270 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	271 // Allow conversion of empty cell array to some other
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	272 // type in cases like
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	273 //
10871 333bf09e3b6e only allow struct assignments to non-struct values for empty arrays Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	274 // x = {}; x(i).f = rhs
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	275
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	276 octave_value tmp = octave_value::empty_conv (type, rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	277
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	278 return tmp.subsasgn (type, idx, rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	279 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	280 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	281 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	282 octave_value tmp = do_index_op (idx.front (), true);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	283
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	284 if (! tmp.is_defined ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	285 tmp = octave_value::empty_conv (type.substr (1), rhs);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	286
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	287 std::list<octave_value_list> next_idx (idx);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	288
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	289 next_idx.erase (next_idx.begin ());
4362 0c69a845ef1a [project @ 2003-03-03 20:11:08 by jwe] jwe parents: 4358 diff changeset	290
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	291 tmp.make_unique ();
6767 a6c8000f113e [project @ 2007-06-28 19:42:42 by jwe] jwe parents: 6686 diff changeset	292
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	293 t_rhs = tmp.subsasgn (type.substr (1), next_idx, rhs);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	294 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	295 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	296 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	297
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	298 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	299 {
9106 1eb5b24186b6 fix nested cell assignment Jaroslav Hajek <highegg@gmail.com> parents: 8920 diff changeset	300 matrix.make_unique ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	301 Cell tmpc = matrix.index (idx.front (), true);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	302
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	303 std::list<octave_value_list> next_idx (idx);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	304
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	305 next_idx.erase (next_idx.begin ());
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	306
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	307 std::string next_type = type.substr (1);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	308
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	309 if (tmpc.numel () != 1)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	310 err_indexed_cs_list ();
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	311
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	312 octave_value tmp = tmpc(0);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	313 tmpc = Cell ();
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	314
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	315 if (! tmp.is_defined () \|\| tmp.is_zero_by_zero ())
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	316 {
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	317 tmp = octave_value::empty_conv (type.substr (1), rhs);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	318 tmp.make_unique (); // probably a no-op.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	319 }
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	320 else
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	321 // optimization: ignore copy still stored inside array.
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	322 tmp.make_unique (1);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	323
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	324 t_rhs = tmp.subsasgn (next_type, next_idx, rhs);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	325 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	326 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	327
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	328 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	329 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	330 if (! isempty ())
10871 333bf09e3b6e only allow struct assignments to non-struct values for empty arrays Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	331 {
333bf09e3b6e only allow struct assignments to non-struct values for empty arrays Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	332 std::string nm = type_name ();
333bf09e3b6e only allow struct assignments to non-struct values for empty arrays Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	333 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
333bf09e3b6e only allow struct assignments to non-struct values for empty arrays Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	334 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	335
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	336 // Do nothing; the next branch will handle it.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	337 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	338 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	339
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	340 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	341 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	342 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	343 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	344
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	345 switch (type[0])
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	346 {
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	347 case '(':
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	348 {
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	349 octave_value_list i = idx.front ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	350
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23575 diff changeset	351 if (t_rhs.iscell ())
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	352 octave_base_matrix<Cell>::assign (i, t_rhs.cell_value ());
23589 63950abd2f81 maint: Deprecate is_null_type and replace with isnull. Rik <rik@octave.org> parents: 23588 diff changeset	353 else if (t_rhs.isnull ())
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	354 octave_base_matrix<Cell>::delete_elements (i);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	355 else
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	356 octave_base_matrix<Cell>::assign (i, Cell (t_rhs));
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	357
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	358 count++;
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	359 retval = octave_value (this);
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	360 }
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	361 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	362
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	363 case '{':
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	364 {
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	365 octave_value_list idxf = idx.front ();
5846 db0598f94c0f [project @ 2006-06-07 18:16:16 by jwe] jwe parents: 5828 diff changeset	366
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	367 if (t_rhs.is_cs_list ())
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	368 {
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	369 Cell tmp_cell = Cell (t_rhs.list_value ());
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	370
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	371 // Inquire the proper shape of the RHS.
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	372
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	373 dim_vector didx = dims ().redim (idxf.length ());
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	374 for (octave_idx_type k = 0; k < idxf.length (); k++)
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	375 if (! idxf(k).is_magic_colon ()) didx(k) = idxf(k).numel ();
7040 1f16da18d85d [project @ 2007-10-19 18:24:19 by jwe] jwe parents: 7017 diff changeset	376
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	377 if (didx.numel () == tmp_cell.numel ())
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	378 tmp_cell = tmp_cell.reshape (didx);
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	379
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	380 octave_base_matrix<Cell>::assign (idxf, tmp_cell);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	381 }
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	382 else if (idxf.all_scalars ()
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	383 \|\| do_index_op (idxf, true).numel () == 1)
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	384 // Regularize a null matrix if stored into a cell.
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	385 octave_base_matrix<Cell>::assign (idxf,
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	386 Cell (t_rhs.storable_value ()));
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	387 else
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21078 diff changeset	388 err_nonbraced_cs_list_assignment ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	389
20741 a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	390 count++;
a5ab31b52ae8 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	391 retval = octave_value (this);
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	392 }
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	393 break;
10871 333bf09e3b6e only allow struct assignments to non-struct values for empty arrays Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	394
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	395 case '.':
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	396 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	397 if (! isempty ())
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	398 {
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	399 std::string nm = type_name ();
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	400 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	401 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	402
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	403 // Allow conversion of empty cell array to some other
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	404 // type in cases like
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	405 //
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	406 // x = {}; x.f = rhs
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	407
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	408 octave_value tmp = octave_value::empty_conv (type, rhs);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	409
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	410 return tmp.subsasgn (type, idx, rhs);
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	411 }
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	412 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	413
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	414 default:
1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	415 panic_impossible ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	416 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	417
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	418 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	419 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	420
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	421 bool
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	422 octave_cell::iscellstr (void) const
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	423 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	424 bool retval;
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	425 if (cellstr_cache.get ())
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	426 retval = true;
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	427 else
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	428 {
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	429 retval = matrix.iscellstr ();
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	430 // Allocate empty cache to mark that this is indeed a cellstr.
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	431 if (retval)
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	432 cellstr_cache.reset (new Array<std::string> ());
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	433 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	434
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	435 return retval;
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	436 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	437
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	438 void
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	439 octave_cell::assign (const octave_value_list& idx, const Cell& rhs)
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	440 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	441 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	442 octave_base_matrix<Cell>::assign (idx, rhs);
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	443 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	444
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	445 void
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	446 octave_cell::assign (const octave_value_list& idx, const octave_value& rhs)
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	447 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	448 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	449 octave_base_matrix<Cell>::assign (idx, rhs);
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	450 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	451
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	452 void
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	453 octave_cell::delete_elements (const octave_value_list& idx)
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	454 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	455 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	456 octave_base_matrix<Cell>::delete_elements (idx);
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	457 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	458
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	459 size_t
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	460 octave_cell::byte_size (void) const
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	461 {
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	462 size_t retval = 0;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	463
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	464 for (octave_idx_type i = 0; i < numel (); i++)
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	465 retval += matrix(i).byte_size ();
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	466
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	467 return retval;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	468 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4764 diff changeset	469
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	470 octave_value
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	471 octave_cell::sort (octave_idx_type dim, sortmode mode) const
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	472 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	473 octave_value retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	474
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	475 if (! iscellstr ())
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	476 error ("sort: only cell arrays of character strings may be sorted");
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	477
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	478 Array<std::string> tmp = cellstr_value ();
8824 76ddf0ab985d auto-set cellstr cache when sorting cells Jaroslav Hajek <highegg@gmail.com> parents: 8823 diff changeset	479
20681 b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	480 tmp = tmp.sort (dim, mode);
b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	481
b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	482 // We already have the cache.
b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	483 retval = new octave_cell (tmp);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	484
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	485 return retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	486 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	487
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	488 octave_value
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	489 octave_cell::sort (Array<octave_idx_type> &sidx, octave_idx_type dim,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	490 sortmode mode) const
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	491 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	492 octave_value retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	493
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	494 if (! iscellstr ())
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	495 error ("sort: only cell arrays of character strings may be sorted");
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	496
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	497 Array<std::string> tmp = cellstr_value ();
8824 76ddf0ab985d auto-set cellstr cache when sorting cells Jaroslav Hajek <highegg@gmail.com> parents: 8823 diff changeset	498
20681 b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	499 tmp = tmp.sort (sidx, dim, mode);
b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	500
b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	501 // We already have the cache.
b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	502 retval = new octave_cell (tmp);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	503
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	504 return retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	505 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	506
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	507 sortmode
23588 0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23577 diff changeset	508 octave_cell::issorted (sortmode mode) const
8823 3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	509 {
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	510 sortmode retval = UNSORTED;
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	511
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	512 if (! iscellstr ())
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	513 error ("issorted: A is not a cell array of strings");
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	514
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	515 Array<std::string> tmp = cellstr_value ();
8823 3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	516
23588 0549061d35b9 maint: Deprecate is_sorted and replace with issorted. Rik <rik@octave.org> parents: 23577 diff changeset	517 retval = tmp.issorted (mode);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	518
8823 3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	519 return retval;
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	520 }
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	521
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	522 Array<octave_idx_type>
8733 3ef774603887 rename all uses of sortrows_idx to sort_rows_idx John W. Eaton <jwe@octave.org> parents: 8732 diff changeset	523 octave_cell::sort_rows_idx (sortmode mode) const
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	524 {
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	525 Array<octave_idx_type> retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	526
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	527 if (! iscellstr ())
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	528 error ("sortrows: only cell arrays of character strings may be sorted");
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	529
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	530 Array<std::string> tmp = cellstr_value ();
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	531
20681 b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	532 retval = tmp.sort_rows_idx (mode);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	533
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	534 return retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	535 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	536
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	537 sortmode
8823 3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	538 octave_cell::is_sorted_rows (sortmode mode) const
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	539 {
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	540 sortmode retval = UNSORTED;
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	541
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	542 if (! iscellstr ())
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	543 error ("issorted: A is not a cell array of strings");
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	544
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	545 Array<std::string> tmp = cellstr_value ();
8823 3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	546
20681 b0b37f0d7e6d new cellstr_value function and elimination of error_state John W. Eaton <jwe@octave.org> parents: 20558 diff changeset	547 retval = tmp.is_sorted_rows (mode);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	548
8823 3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	549 return retval;
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	550 }
3efa512a0957 make issorted work for cells Jaroslav Hajek <highegg@gmail.com> parents: 8815 diff changeset	551
8626 1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	552 bool
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	553 octave_cell::is_true (void) const
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	554 {
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	555 error ("invalid conversion from cell array to logical value");
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	556 }
1dce30ab0e72 don't convert NaN to logical in bool expressions John W. Eaton <jwe@octave.org> parents: 8587 diff changeset	557
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	558 octave_value_list
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	559 octave_cell::list_value (void) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	560 {
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	561 return octave_value_list (matrix);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	562 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	563
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	564 string_vector
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20979 diff changeset	565 octave_cell::string_vector_value (bool pad) const
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	566 {
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	567 string_vector retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	568
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	569 octave_idx_type nel = numel ();
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	570
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	571 int n_elts = 0;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	572
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	573 octave_idx_type max_len = 0;
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	574
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	575 std::queue<string_vector> strvec_queue;
4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	576
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	577 for (octave_idx_type i = 0; i < nel; i++)
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	578 {
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20979 diff changeset	579 string_vector s = matrix(i).string_vector_value ();
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	580
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20218 diff changeset	581 octave_idx_type s_len = s.numel ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	582
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	583 n_elts += s_len ? s_len : 1;
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	584
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	585 octave_idx_type s_max_len = s.max_length ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	586
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	587 if (s_max_len > max_len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	588 max_len = s_max_len;
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	589
4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	590 strvec_queue.push (s);
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	591 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	592
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	593 retval = string_vector (n_elts);
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	594
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	595 octave_idx_type k = 0;
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	596
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	597 for (octave_idx_type i = 0; i < nel; i++)
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	598 {
9370 4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	599 const string_vector s = strvec_queue.front ();
4ff6f8efdda2 fix slow cellstr -> char matrix conversions Jaroslav Hajek <highegg@gmail.com> parents: 9338 diff changeset	600 strvec_queue.pop ();
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	601
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20218 diff changeset	602 octave_idx_type s_len = s.numel ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	603
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	604 if (s_len)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	605 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	606 for (octave_idx_type j = 0; j < s_len; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	607 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	608 std::string t = s[j];
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	609 int t_len = t.length ();
5715 edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe] jwe parents: 5707 diff changeset	610
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	611 if (pad && max_len > t_len)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	612 t += std::string (max_len - t_len, ' ');
5715 edf82d02be75 [project @ 2006-03-24 16:42:43 by jwe] jwe parents: 5707 diff changeset	613
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	614 retval[k++] = t;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	615 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	616 }
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	617 else if (pad)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	618 retval[k++] = std::string (max_len, ' ');
7285 c8d362c69013 [project @ 2007-12-11 01:54:19 by jwe] jwe parents: 7040 diff changeset	619 else
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	620 retval[k++] = "";
4243 7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	621 }
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	622
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	623 return retval;
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	624 }
7e4d5b5520e5 [project @ 2002-12-27 05:30:59 by jwe] jwe parents: 4219 diff changeset	625
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	626 Array<std::string>
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	627 octave_cell::cellstr_value (void) const
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	628 {
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	629 Array<std::string> retval;
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	630
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	631 if (! iscellstr ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	632 error ("invalid conversion from cell array to array of strings");
10065 64a06079cae4 improve cellstr cache implementation Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	633
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	634 if (cellstr_cache->isempty ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	635 *cellstr_cache = matrix.cellstr_value ();
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	636
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	637 return *cellstr_cache;
8732 a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	638
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	639 return retval;
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	640 }
a669df7beb73 [mq]: x John W. Eaton <jwe@octave.org> parents: 8679 diff changeset	641
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	642 bool
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	643 octave_cell::print_as_scalar (void) const
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	644 {
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11450 diff changeset	645 return true;
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	646 }
cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4587 diff changeset	647
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	648 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18409 diff changeset	649 octave_cell::print (std::ostream& os, bool)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	650 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	651 print_raw (os);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	652 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	653
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	654 void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	655 octave_cell::print_raw (std::ostream& os, bool) const
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	656 {
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4582 diff changeset	657 int nd = matrix.ndims ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	658
4587 7b957b442818 [project @ 2003-11-10 15:50:39 by jwe] jwe parents: 4582 diff changeset	659 if (nd == 2)
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	660 {
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	661 octave_idx_type nr = rows ();
23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	662 octave_idx_type nc = columns ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	663
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	664 if (nr > 0 && nc > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	665 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	666 indent (os);
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	667 os << '{';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	668 newline (os);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	669
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	670 increment_indent_level ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	671
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	672 for (octave_idx_type j = 0; j < nc; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	673 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	674 for (octave_idx_type i = 0; i < nr; i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	675 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	676 octave_quit ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	677
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	678 std::ostringstream buf;
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	679 buf << '[' << i+1 << ',' << j+1 << ']';
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	680
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	681 octave_value val = matrix(i,j);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	682
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	683 val.print_with_name (os, buf.str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	684 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	685 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	686
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	687 decrement_indent_level ();
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	688
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	689 indent (os);
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	690 os << '}';
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	691 newline (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	692 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	693 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	694 {
9781 ea88eece12f5 fix printing of empty cells Jaroslav Hajek <highegg@gmail.com> parents: 9370 diff changeset	695 indent (os);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	696 os << "{}";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	697 if (Vprint_empty_dimensions)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	698 os << '(' << nr << 'x' << nc << ')';
9781 ea88eece12f5 fix printing of empty cells Jaroslav Hajek <highegg@gmail.com> parents: 9370 diff changeset	699 newline (os);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	700 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	701 }
508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	702 else
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	703 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	704 indent (os);
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4457 diff changeset	705 dim_vector dv = matrix.dims ();
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	706 os << '{' << dv.str () << " Cell Array}";
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	707 newline (os);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	708 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	709 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3928 diff changeset	710
23350 0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	711 bool
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	712 octave_cell::print_name_tag (std::ostream& os, const std::string& name) const
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	713 {
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	714 bool retval = false;
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	715
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	716 indent (os);
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	717
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	718 if (isempty () \|\| ndims () > 2)
23350 0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	719 os << name << " = ";
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	720 else
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	721 {
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	722 os << name << " =";
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	723 newline (os);
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	724 retval = true;
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	725 }
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	726
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	727 return retval;
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	728 }
0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	729
17870 1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	730 void
1d2e709bbbda rework short_disp methods John W. Eaton <jwe@octave.org> parents: 17866 diff changeset	731 octave_cell::short_disp (std::ostream& os) const
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	732 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	733 os << (matrix.isempty () ? "{}" : "...");
17866 ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	734 }
ea0ecbe2eaf5 display matrix values in GUI workspace viewer (bug #40499) John W. Eaton <jwe@octave.org> parents: 17787 diff changeset	735
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	736 #define CELL_ELT_TAG "<cell-element>"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	737
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	738 bool
6974 9e32bb109980 [project @ 2007-10-08 11:06:47 by jwe] jwe parents: 6833 diff changeset	739 octave_cell::save_ascii (std::ostream& os)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	740 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	741 dim_vector dv = dims ();
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	742 if (dv.ndims () > 2)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	743 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	744 os << "# ndims: " << dv.ndims () << "\n";
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	745
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	746 for (int i = 0; i < dv.ndims (); i++)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	747 os << ' ' << dv(i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	748 os << "\n";
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	749
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	750 Cell tmp = cell_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	751
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	752 for (octave_idx_type i = 0; i < dv.numel (); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	753 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	754 octave_value o_val = tmp.elem (i);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	755
23350 0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	756 // Recurse to save sub-value.
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	757 bool b = save_text_data (os, o_val, CELL_ELT_TAG, false, 0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	758
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	759 if (! b)
18384 bd9d34f28b0f Use std::ostream::fail instead of unsafe implicit bool conversion (bug #41335) Mike Miller <mtmiller@ieee.org> parents: 17874 diff changeset	760 return ! os.fail ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	761 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	762 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	763 else
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	764 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	765 // Keep this case, rather than use generic code above for backward
20449 df4165dfc676 maint: Fix misspelled word compatibility in code comments. Rik <rik@octave.org> parents: 20447 diff changeset	766 // compatibility. Makes load_ascii much more complex!!
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	767 os << "# rows: " << rows () << "\n"
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	768 << "# columns: " << columns () << "\n";
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	769
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	770 Cell tmp = cell_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	771
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	772 for (octave_idx_type j = 0; j < tmp.cols (); j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	773 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	774 for (octave_idx_type i = 0; i < tmp.rows (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	775 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	776 octave_value o_val = tmp.elem (i, j);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	777
23350 0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	778 // Recurse to save sub-value.
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	779 bool b = save_text_data (os, o_val, CELL_ELT_TAG, false, 0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	780
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	781 if (! b)
18384 bd9d34f28b0f Use std::ostream::fail instead of unsafe implicit bool conversion (bug #41335) Mike Miller <mtmiller@ieee.org> parents: 17874 diff changeset	782 return ! os.fail ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	783 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	784
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	785 os << "\n";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	786 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	787 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	788
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	789 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	790 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	791
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	792 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	793 octave_cell::load_ascii (std::istream& is)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	794 {
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	795 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	796
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	797 string_vector keywords(2);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	798
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	799 keywords[0] = "ndims";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	800 keywords[1] = "rows";
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	801
f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	802 std::string kw;
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	803 octave_idx_type val = 0;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	804
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	805 if (! extract_keyword (is, keywords, kw, val, true))
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	806 error ("load: failed to extract number of rows and columns");
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	807
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	808 if (kw == "ndims")
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	809 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	810 int mdims = static_cast<int> (val);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	811
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	812 if (mdims < 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	813 error ("load: failed to extract number of rows and columns");
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	814
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	815 dim_vector dv;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	816 dv.resize (mdims);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	817
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	818 for (int i = 0; i < mdims; i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	819 is >> dv(i);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	820
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	821 Cell tmp(dv);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	822
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	823 for (octave_idx_type i = 0; i < dv.numel (); i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	824 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	825 octave_value t2;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	826 bool dummy;
5099 f7e39f977fe8 [project @ 2004-12-24 19:06:01 by jwe] jwe parents: 5060 diff changeset	827
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	828 // recurse to read cell elements
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	829 std::string nm = read_text_data (is, "",
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	830 dummy, t2, i);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	831
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	832 if (nm != CELL_ELT_TAG)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	833 error ("load: cell array element had unexpected name");
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	834
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	835 if (is)
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	836 tmp.elem (i) = t2;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	837 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	838
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	839 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	840 error ("load: failed to load matrix constant");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	841
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	842 matrix = tmp;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	843 }
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	844 else if (kw == "rows")
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	845 {
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	846 octave_idx_type nr = val;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	847 octave_idx_type nc = 0;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	848
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	849 if (nr < 0 \|\| ! extract_keyword (is, "columns", nc) \|\| nc < 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	850 error ("load: failed to extract number of rows and columns for cell array");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	851
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	852 if (nr > 0 && nc > 0)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	853 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	854 Cell tmp (nr, nc);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	855
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	856 for (octave_idx_type j = 0; j < nc; j++)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	857 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	858 for (octave_idx_type i = 0; i < nr; i++)
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	859 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	860 octave_value t2;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	861 bool dummy;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	862
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	863 // recurse to read cell elements
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	864 std::string nm = read_text_data (is, "",
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	865 dummy, t2, i);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	866
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	867 if (nm != CELL_ELT_TAG)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	868 error ("load: cell array element had unexpected name");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	869
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	870 if (is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	871 tmp.elem (i, j) = t2;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	872 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	873 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	874
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	875 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	876 error ("load: failed to load cell element");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	877
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	878 matrix = tmp;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	879 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	880 else if (nr == 0 \|\| nc == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	881 matrix = Cell (nr, nc);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	882 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	883 panic_impossible ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	884 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	885 else
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20940 diff changeset	886 panic_impossible ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	887
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	888 return true;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	889 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	890
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	891 bool
26401 586413770c7f pass save_as_floats by value in octave_value save_binary functions John W. Eaton <jwe@octave.org> parents: 26379 diff changeset	892 octave_cell::save_binary (std::ostream& os, bool save_as_floats)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	893 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	894 dim_vector dv = dims ();
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	895 if (dv.ndims () < 1)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	896 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	897
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	898 // Use negative value for ndims
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	899 int32_t di = - dv.ndims ();
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	900 os.write (reinterpret_cast<char *> (&di), 4);
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	901 for (int i = 0; i < dv.ndims (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	902 {
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	903 di = dv(i);
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	904 os.write (reinterpret_cast<char *> (&di), 4);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	905 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	906
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	907 Cell tmp = cell_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	908
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	909 for (octave_idx_type i = 0; i < dv.numel (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	910 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	911 octave_value o_val = tmp.elem (i);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	912
23350 0f18524973eb Fix initial newline for disp() of cells (bug #50683). Rik <rik@octave.org> parents: 23344 diff changeset	913 // Recurse to save sub-value.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	914 bool b = save_binary_data (os, o_val, CELL_ELT_TAG, "", 0,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	915 save_as_floats);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	916
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	917 if (! b)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	918 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	919 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	920
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	921 return true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	922 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	923
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	924 bool
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	925 octave_cell::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	926 octave::mach_info::float_format fmt)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	927 {
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	928 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	929
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	930 int32_t mdims;
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	931 if (! is.read (reinterpret_cast<char *> (&mdims), 4))
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	932 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	933 if (swap)
4944 44046bbaa52c [project @ 2004-08-31 05:30:46 by jwe] jwe parents: 4941 diff changeset	934 swap_bytes<4> (&mdims);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	935 if (mdims >= 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	936 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	937
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	938 mdims = -mdims;
5828 22e23bee74c8 [project @ 2006-05-23 06:05:14 by jwe] jwe parents: 5823 diff changeset	939 int32_t di;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	940 dim_vector dv;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	941 dv.resize (mdims);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	942
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	943 for (int i = 0; i < mdims; i++)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	944 {
5760 8d7162924bd3 [project @ 2006-04-14 04:01:37 by jwe] jwe parents: 5759 diff changeset	945 if (! is.read (reinterpret_cast<char *> (&di), 4))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	946 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	947 if (swap)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	948 swap_bytes<4> (&di);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	949 dv(i) = di;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	950 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	951
5157 8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	952 // Convert an array with a single dimension to be a row vector.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	953 // Octave should never write files like this, other software
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	954 // might.
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	955
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	956 if (mdims == 1)
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	957 {
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	958 mdims = 2;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	959 dv.resize (mdims);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	960 dv(1) = dv(0);
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	961 dv(0) = 1;
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	962 }
8ca032643f55 [project @ 2005-02-23 00:18:58 by jwe] jwe parents: 5105 diff changeset	963
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	964 octave_idx_type nel = dv.numel ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	965 Cell tmp(dv);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	966
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	967 for (octave_idx_type i = 0; i < nel; i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	968 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	969 octave_value t2;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	970 bool dummy;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	971 std::string doc;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	972
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	973 // recurse to read cell elements
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	974 std::string nm = read_binary_data (is, swap, fmt, "",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	975 dummy, t2, doc);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	976
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	977 if (nm != CELL_ELT_TAG)
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	978 error ("load: cell array element had unexpected name");
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	979
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	980 if (is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	981 tmp.elem (i) = t2;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	982 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	983
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	984 if (! is)
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	985 error ("load: failed to load matrix constant");
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	986
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	987 matrix = tmp;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	988
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	989 return true;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	990 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	991
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	992 void *
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	993 octave_cell::mex_get_data (void) const
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	994 {
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	995 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	996 return matrix.mex_get_data ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	997 }
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	998
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	999 bool
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1000 octave_cell::save_hdf5 (octave_hdf5_id loc_id, const char *name,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1001 bool save_as_floats)
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1002 {
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1003 #if defined (HAVE_HDF5)
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1004
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1005 dim_vector dv = dims ();
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1006 int empty = save_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1007 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1008 return (empty > 0);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1009
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	1010 hsize_t rank = dv.ndims ();
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17874 diff changeset	1011 hid_t space_hid, data_hid, size_hid;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 17874 diff changeset	1012 space_hid = data_hid = size_hid = -1;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1013
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1014 #if defined (HAVE_HDF5_18)
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1015 data_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1016 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1017 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1018 data_hid = H5Gcreate (loc_id, name, 0);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1019 #endif
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1020
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1021 if (data_hid < 0)
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1022 return false;
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1023
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1024 // Have to save cell array shape, since can't have a
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1025 // dataset of groups....
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1026
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23589 diff changeset	1027 space_hid = H5Screate_simple (1, &rank, nullptr);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1028
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1029 if (space_hid < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1030 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1031 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1032 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1033 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1034
5351 05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman] dbateman parents: 5307 diff changeset	1035 OCTAVE_LOCAL_BUFFER (octave_idx_type, hdims, rank);
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1036
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1037 // Octave uses column-major, while HDF5 uses row-major ordering
4933 cd58733c326b [project @ 2004-08-05 16:08:28 by jwe] jwe parents: 4837 diff changeset	1038 for (hsize_t i = 0; i < rank; i++)
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1039 hdims[i] = dv(rank-i-1);
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1040
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1041 #if defined (HAVE_HDF5_18)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1042 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1043 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1044 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1045 size_hid = H5Dcreate (data_hid, "dims", H5T_NATIVE_IDX, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1046 octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1047 #endif
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1048 if (size_hid < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1049 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1050 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1051 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1052 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1053 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1054
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1055 if (H5Dwrite (size_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1056 octave_H5P_DEFAULT, hdims) < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1057 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1058 H5Dclose (size_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1059 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1060 H5Gclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1061 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1062 }
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1063
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1064 H5Dclose (size_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1065 H5Sclose (space_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1066
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1067 // Recursively add each element of the cell to this group.
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1068
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1069 Cell tmp = cell_value ();
5850 426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1070
426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1071 octave_idx_type nel = dv.numel ();
426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1072
426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1073 for (octave_idx_type i = 0; i < nel; i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1074 {
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	1075 std::ostringstream buf;
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	1076 int digits = static_cast<int> (std::floor (::log10 (static_cast<double>
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1077 (nel)) + 1.0));
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	1078 buf << '_' << std::setw (digits) << std::setfill ('0') << i;
5765 7ba9ad1fec11 [project @ 2006-04-17 05:05:15 by jwe] jwe parents: 5760 diff changeset	1079 std::string s = buf.str ();
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1080
5850 426b94346d70 [project @ 2006-06-09 15:44:35 by jwe] jwe parents: 5846 diff changeset	1081 if (! add_hdf5_data (data_hid, tmp.elem (i), s.c_str (), "", false,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1082 save_as_floats))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1083 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1084 H5Gclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1085 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1086 }
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1087 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1088
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1089 H5Gclose (data_hid);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1090
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1091 return true;
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1092
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1093 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1094 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1095 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1096 octave_unused_parameter (save_as_floats);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1097
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	1098 warn_save ("hdf5");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1099
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1100 return false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1101 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1102 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1103
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1104 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1105 octave_cell::load_hdf5 (octave_hdf5_id loc_id, const char *name)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1106 {
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1107 bool retval = false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1108
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1109 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1110
8815 af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1111 clear_cellstr_cache ();
af907aeedbf4 cache cellstr_value in ov-cell Jaroslav Hajek <highegg@gmail.com> parents: 8733 diff changeset	1112
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1113 dim_vector dv;
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1114 int empty = load_hdf5_empty (loc_id, name, dv);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1115 if (empty > 0)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	1116 matrix.resize (dv);
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1117 if (empty)
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1118 return (empty > 0);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1119
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1120 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1121 hid_t group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1122 #else
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1123 hid_t group_id = H5Gopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1124 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1125
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1126 if (group_id < 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1127 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1128
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1129 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1130 hid_t data_hid = H5Dopen (group_id, "dims", octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1131 #else
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1132 hid_t data_hid = H5Dopen (group_id, "dims");
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1133 #endif
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1134 hid_t space_hid = H5Dget_space (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1135 hsize_t rank = H5Sget_simple_extent_ndims (space_hid);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1136 if (rank != 1)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1137 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1138 H5Dclose (data_hid);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1139 H5Gclose (group_id);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1140 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1141 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1142
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1143 OCTAVE_LOCAL_BUFFER (hsize_t, hdims, rank);
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1144 OCTAVE_LOCAL_BUFFER (hsize_t, maxdims, rank);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1145
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1146 H5Sget_simple_extent_dims (space_hid, hdims, maxdims);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1147
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1148 // Octave uses column-major, while HDF5 uses row-major ordering.
2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1149
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1150 dv.resize (hdims[0]);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1151
5351 05adf9de7657 [project @ 2005-05-16 20:07:36 by dbateman] dbateman parents: 5307 diff changeset	1152 OCTAVE_LOCAL_BUFFER (octave_idx_type, tmp, hdims[0]);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1153
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1154 if (H5Dread (data_hid, H5T_NATIVE_IDX, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1155 octave_H5P_DEFAULT, tmp) < 0)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1156 {
4837 81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1157 H5Dclose (data_hid);
81f78a2ff8a6 [project @ 2004-03-12 19:13:01 by jwe] jwe parents: 4817 diff changeset	1158 H5Gclose (group_id);
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1159 return false;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1160 }
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1161
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1162 H5Dclose (data_hid);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1163 H5Gclose (group_id);
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1164
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1165 for (hsize_t i = 0, j = hdims[0] - 1; i < hdims[0]; i++, j--)
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1166 dv(j) = tmp[i];
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1167
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1168 hdf5_callback_data dsub;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1169
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1170 herr_t retval2 = -1;
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1171
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1172 Cell m (dv);
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1173
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1174 int current_item = 0;
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1175
4696 fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe] jwe parents: 4687 diff changeset	1176 hsize_t num_obj = 0;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1177 #if defined (HAVE_HDF5_18)
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1178 group_id = H5Gopen (loc_id, name, octave_H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1179 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1180 group_id = H5Gopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1181 #endif
5060 34a904ac130d [project @ 2004-11-02 03:08:10 by jwe] jwe parents: 4994 diff changeset	1182 H5Gget_num_objs (group_id, &num_obj);
34a904ac130d [project @ 2004-11-02 03:08:10 by jwe] jwe parents: 4994 diff changeset	1183 H5Gclose (group_id);
4696 fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe] jwe parents: 4687 diff changeset	1184
5275 23b37da9fd5b [project @ 2005-04-08 16:07:35 by jwe] jwe parents: 5164 diff changeset	1185 for (octave_idx_type i = 0; i < dv.numel (); i++)
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1186 {
4696 fcab389ad291 [project @ 2004-01-15 02:11:59 by jwe] jwe parents: 4687 diff changeset	1187
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1188 if (current_item >= static_cast<int> (num_obj))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1189 retval2 = -1;
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1190 else
22028 5c949eecb6dd use int64_t for octave_hdf5_id (bug #47858) Stefan Miereis <stefan.miereis@gmx.de> parents: 22022 diff changeset	1191 retval2 = hdf5_h5g_iterate (loc_id, name, &current_item,&dsub);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1192
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1193 if (retval2 <= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1194 break;
4814 495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1195
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1196 octave_value ov = dsub.tc;
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1197 m.elem (i) = ov;
495e9df75836 [project @ 2004-03-03 23:46:38 by jwe] jwe parents: 4791 diff changeset	1198
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1199 }
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1200
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1201 if (retval2 >= 0)
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1202 {
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1203 matrix = m;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1204 retval = true;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1205 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1206
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1207 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1208 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1209 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1210
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	1211 warn_load ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1212 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1213
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1214 return retval;
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4612 diff changeset	1215 }
4815 2eb844b27953 [project @ 2004-03-04 00:14:44 by jwe] jwe parents: 4814 diff changeset	1216
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1217 DEFUN (iscell, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1218 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1219 @deftypefn {} {} iscell (@var{x})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1220 Return true if @var{x} is a cell array object.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1221 @seealso{ismatrix, isstruct, iscellstr, isa}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1222 @end deftypefn */)
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1223 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1224 if (args.length () != 1)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5805 diff changeset	1225 print_usage ();
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1226
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23575 diff changeset	1227 return ovl (args(0).iscell ());
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1228 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1229
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1230 DEFUN (cell, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1231 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1232 @deftypefn {} {} cell (@var{n})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1233 @deftypefnx {} {} cell (@var{m}, @var{n})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1234 @deftypefnx {} {} cell (@var{m}, @var{n}, @var{k}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1235 @deftypefnx {} {} cell ([@var{m} @var{n} @dots{}])
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1236 Create a new cell array object.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1237
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1238 If invoked with a single scalar integer argument, return a square
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1239 @nospell{NxN} cell array. If invoked with two or more scalar integer
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1240 arguments, or a vector of integer values, return an array with the given
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1241 dimensions.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1242 @seealso{cellstr, mat2cell, num2cell, struct2cell}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1243 @end deftypefn */)
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1244 {
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1245 int nargin = args.length ();
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1246
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1247 dim_vector dims;
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1248
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1249 switch (nargin)
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1250 {
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1251 case 0:
742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1252 dims = dim_vector (0, 0);
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1253 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1254
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1255 case 1:
25646 4d565baa475e move libinterp/utils functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 25438 diff changeset	1256 octave::get_dimensions (args(0), "cell", dims);
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1257 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1258
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1259 default:
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1260 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1261 dims.resize (nargin);
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1262
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10160 diff changeset	1263 for (int i = 0; i < nargin; i++)
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	1264 dims(i) = (args(i).isempty ()
23467 0ada77ed24dd use idx_type for dimensions instead of int (bug #50934) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	1265 ? 0 : args(i).xidx_type_value ("cell: dimension must be a scalar integer"));
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1266 }
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1267 break;
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1268 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1269
20558 1a0a433c8263 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20449 diff changeset	1270 dims.chop_trailing_singletons ();
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1271
25646 4d565baa475e move libinterp/utils functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 25438 diff changeset	1272 octave::check_dimensions (dims, "cell");
4563 742993a501b9 [project @ 2003-10-29 06:25:12 by jwe] jwe parents: 4519 diff changeset	1273
22200 46b67f1569b5 FCell: avoid repeating default value for a newly created Cell. Carnë Draug <carandraug@octave.org> parents: 22197 diff changeset	1274 return ovl (Cell (dims));
3354 87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1275 }
87721841efd7 [project @ 1999-11-17 19:06:11 by jwe] jwe parents: 3353 diff changeset	1276
23467 0ada77ed24dd use idx_type for dimensions instead of int (bug #50934) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	1277 /*
0ada77ed24dd use idx_type for dimensions instead of int (bug #50934) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	1278 ## This might work on some system someday, but for now, who has a system
0ada77ed24dd use idx_type for dimensions instead of int (bug #50934) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	1279 ## where a 16 yottabyte array can be allocated? See bug #50934.
0ada77ed24dd use idx_type for dimensions instead of int (bug #50934) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	1280 %!error <out of memory> cell (1e24, 1);
0ada77ed24dd use idx_type for dimensions instead of int (bug #50934) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	1281 */
0ada77ed24dd use idx_type for dimensions instead of int (bug #50934) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	1282
4610 02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1283 DEFUN (iscellstr, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1284 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1285 @deftypefn {} {} iscellstr (@var{cell})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1286 Return true if every element of the cell array @var{cell} is a character
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1287 string.
24474 0b65949870e3 isstring.m: Add new function for identifying string arrays. Rik <rik@octave.org> parents: 23807 diff changeset	1288 @seealso{ischar, isstring}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1289 @end deftypefn */)
4610 02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1290 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1291 if (args.length () != 1)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5805 diff changeset	1292 print_usage ();
4610 02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1293
23575 e95738a119da maint: Deprecate is_cellstr and replace with iscellstr. Rik <rik@octave.org> parents: 23481 diff changeset	1294 return ovl (args(0).iscellstr ());
4610 02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1295 }
02d2fcf835fc [project @ 2003-11-14 17:08:59 by jwe] jwe parents: 4604 diff changeset	1296
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1297 DEFUN (cellstr, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1298 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1299 @deftypefn {} {@var{cstr} =} cellstr (@var{strmat})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1300 Create a new cell array object from the elements of the string array
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1301 @var{strmat}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1302
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1303 Each row of @var{strmat} becomes an element of @var{cstr}. Any trailing
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1304 spaces in a row are deleted before conversion.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1305
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1306 To convert back from a cellstr to a character array use @code{char}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1307 @seealso{cell, char}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1308 @end deftypefn */)
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1309 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1310 if (args.length () != 1)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1311 print_usage ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1312
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1313 octave_value_list tmp = Fiscellstr (args, 1);
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1314
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1315 if (tmp(0).is_true ())
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1316 return ovl (args(0));
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1317 else
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1318 {
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20979 diff changeset	1319 string_vector s = args(0).xstring_vector_value ("cellstr: argument STRING must be a 2-D character array");
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1320
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	1321 return ovl (s.isempty () ? Cell (octave_value (""))
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25054 diff changeset	1322 : Cell (s, true));
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1323 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1324 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4815 diff changeset	1325
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1326 DEFUN (struct2cell, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1327 doc: /* -- texinfo --
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1328 @deftypefn {} {@var{c} =} struct2cell (@var{s})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1329 Create a new cell array from the objects stored in the struct object.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1330
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1331 If @var{f} is the number of fields in the structure, the resulting cell
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1332 array will have a dimension vector corresponding to
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1333 @code{[@var{f} size(@var{s})]}. For example:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1334
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1335 @example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1336 @group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1337 s = struct ("name", @{"Peter", "Hannah", "Robert"@},
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1338 "age", @{23, 16, 3@});
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1339 c = struct2cell (s)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1340 @result{} c = @{2x1x3 Cell Array@}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1341 c(1,1,:)(:)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1342 @result{}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1343 @{
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1344 [1,1] = Peter
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1345 [2,1] = Hannah
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1346 [3,1] = Robert
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1347 @}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1348 c(2,1,:)(:)
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1349 @result{}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1350 @{
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1351 [1,1] = 23
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1352 [2,1] = 16
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1353 [3,1] = 3
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1354 @}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1355 @end group
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1356 @end example
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1357
27431 3ec072ab1bda namedargs2cell.m: New function (bug #56903). Rik <rik@octave.org> parents: 27281 diff changeset	1358 @seealso{cell2struct, namedargs2cell, fieldnames}
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21942 diff changeset	1359 @end deftypefn */)
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1360 {
20818 cef0448a6ed2 eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20797 diff changeset	1361 if (args.length () != 1)
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5805 diff changeset	1362 print_usage ();
4764 86c748d5f0af [project @ 2004-02-16 05:14:59 by jwe] jwe parents: 4762 diff changeset	1363
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1364 const octave_map m = args(0).xmap_value ("struct2cell: argument S must be a structure");
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1365
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1366 const dim_vector m_dv = m.dims ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1367
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1368 octave_idx_type num_fields = m.nfields ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1369
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1370 // The resulting dim_vector should have dimensions:
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1371 // [numel(fields) size(struct)]
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1372 // except if the struct is a column vector.
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1373
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1374 dim_vector result_dv;
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	1375 if (m_dv(m_dv.ndims () - 1) == 1)
53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	1376 result_dv.resize (m_dv.ndims ());
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1377 else
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	1378 result_dv.resize (m_dv.ndims () + 1); // Add 1 for the fields.
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1379
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1380 result_dv(0) = num_fields;
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1381
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21301 diff changeset	1382 for (int i = 1; i < result_dv.ndims (); i++)
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1383 result_dv(i) = m_dv(i-1);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1384
27671 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 27431 diff changeset	1385 Cell c (result_dv);
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1386
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1387 octave_idx_type n_elts = m.numel ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1388
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1389 // Fill c in one sweep. Note that thanks to octave_map structure,
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1390 // we don't need a key lookup at all.
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1391 for (octave_idx_type j = 0; j < n_elts; j++)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1392 for (octave_idx_type i = 0; i < num_fields; i++)
27671 3e8faed1b7d8 Remove wrapper template class NoAlias<T> (bug #56752) Carlo de Falco <carlo.defalco@polimi.it> parents: 27431 diff changeset	1393 c.xelem (i,j) = m.contents(i)(j);
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20741 diff changeset	1394
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1395 return ovl (c);
4762 bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1396 }
bec345670e56 [project @ 2004-02-16 05:07:23 by jwe] jwe parents: 4722 diff changeset	1397
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1398 /*
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1399 %!test
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1400 %! keys = cellstr (char (floor (rand (11,10)*24+65)))';
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1401 %! vals = cellfun (@(x) mat2cell (rand (19,1), ones (19,1), 1), ...
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1402 %! mat2cell ([1:11]', ones (11,1), 1), "uniformoutput", false)';
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1403 %! s = struct ([keys; vals]{:});
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1404 %! t = cell2struct ([vals{:}], keys, 2);
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1405 %! assert (s, t);
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1406 %! assert (struct2cell (s), [vals{:}]');
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1407 %! assert (fieldnames (s), keys');
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1408 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10065 diff changeset	1409
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1410 mxArray *
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1411 octave_cell::as_mxArray (void) const
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1412 {
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1413 mxArray *retval = new mxArray (dims ());
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1414
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1415 mxArray elts = static_cast<mxArray > (retval->get_data ());
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1416
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 6276 diff changeset	1417 mwSize nel = numel ();
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1418
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1419 const octave_value *p = matrix.data ();
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1420
6686 2aad75fcc93a [project @ 2007-06-03 20:58:28 by dbateman] dbateman parents: 6276 diff changeset	1421 for (mwIndex i = 0; i < nel; i++)
5900 c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1422 elts[i] = new mxArray (p[i]);
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1423
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1424 return retval;
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1425 }
c20eb7330d13 [project @ 2006-07-22 08:31:16 by jwe] jwe parents: 5850 diff changeset	1426
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1427 octave_value
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1428 octave_cell::map (unary_mapper_t umap) const
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1429 {
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1430 switch (umap)
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1431 {
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1432 #define FORWARD_MAPPER(UMAP) \
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1433 case umap_ ## UMAP: \
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22323 diff changeset	1434 return matrix.UMAP ()
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 22028 diff changeset	1435
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1436 FORWARD_MAPPER (xisalnum);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1437 FORWARD_MAPPER (xisalpha);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1438 FORWARD_MAPPER (xisascii);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1439 FORWARD_MAPPER (xiscntrl);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1440 FORWARD_MAPPER (xisdigit);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1441 FORWARD_MAPPER (xisgraph);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1442 FORWARD_MAPPER (xislower);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1443 FORWARD_MAPPER (xisprint);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1444 FORWARD_MAPPER (xispunct);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1445 FORWARD_MAPPER (xisspace);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1446 FORWARD_MAPPER (xisupper);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1447 FORWARD_MAPPER (xisxdigit);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1448 FORWARD_MAPPER (xtolower);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1449 FORWARD_MAPPER (xtoupper);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1450
9813 8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1451 default:
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1452 return octave_base_value::map (umap);
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1453 }
8fa32b527d9a improve & partially revert previous change Jaroslav Hajek <highegg@gmail.com> parents: 9781 diff changeset	1454 }

Mercurial > jwe > octave

annotate libinterp/octave-value/ov-cell.cc @ 27671:3e8faed1b7d8